kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 301090 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r301090 | qwell | 2011-01-07 14:53:02 -0600 (Fri, 07 Jan 2011) | 15 lines
  
  Merged revisions 301089 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r301089 | qwell | 2011-01-07 14:52:00 -0600 (Fri, 07 Jan 2011) | 8 lines
    
    Initialize useropts/adminopts in case there is no column in the realtime DB.
    
    (closes issue #18182)
    Reported by: dimas
    Patches: 
          v1-18182.patch uploaded by dimas (license 88)
    Tested by: dimas
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@301091 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker
2011-01-07 20:53:45 +00:00
parent ac11bca7c0
commit 74e0a87776
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/app_meetme.c
View File

@@ -3839,8 +3839,8 @@ static struct ast_conference *find_conf_realtime(struct ast_channel *chan, char
char eatime[32] = "";
char bookid[51] = "";
char recordingtmp[AST_MAX_EXTENSION] = "";
char useropts[OPTIONS_LEN + 1]; /* Used for RealTime conferences */
char adminopts[OPTIONS_LEN + 1];
char useropts[OPTIONS_LEN + 1] = ""; /* Used for RealTime conferences */
char adminopts[OPTIONS_LEN + 1] = "";
struct ast_tm tm, etm;
struct timeval endtime = { .tv_sec = 0 };
const char *var2;