kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-02 20:08:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 162355 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r162355 | tilghman | 2008-12-09 15:57:09 -0600 (Tue, 09 Dec 2008) | 11 lines
  
  Merged revisions 162348 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r162348 | tilghman | 2008-12-09 15:53:25 -0600 (Tue, 09 Dec 2008) | 4 lines
    
    We appear to have documented tz= in the [general] section of voicemail.conf,
    without actually having implemented it.  Oops.
    (Reported by Olivier on the -users list)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@162372 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-12-09 22:02:40 +00:00
parent 3c6b748bab
commit fb46352fcb
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/app_voicemail.c
View File

@@ -577,6 +577,7 @@ static char *app4 = "VMAuthenticate";
static AST_LIST_HEAD_STATIC(users, ast_vm_user);
static AST_LIST_HEAD_STATIC(zones, vm_zone);
static char zonetag[80];
static int maxsilence;
static int maxmsg;
static int maxdeletedmsg;
@@ -734,6 +735,7 @@ static void populate_defaults(struct ast_vm_user *vmu)
ast_copy_string(vmu->callback, callcontext, sizeof(vmu->callback));
ast_copy_string(vmu->dialout, dialcontext, sizeof(vmu->dialout));
ast_copy_string(vmu->exit, exitcontext, sizeof(vmu->exit));
ast_copy_string(vmu->zonetag, zonetag, sizeof(vmu->zonetag));
if (vmmaxsecs)
vmu->maxsecs = vmmaxsecs;
if (maxmsg)
@@ -10727,6 +10729,9 @@ static int load_config(int reload)
adsiver = atoi(val);
}
}
if ((val = ast_variable_retrieve(cfg, "general", "zonetag"))) {
ast_copy_string(zonetag, val, sizeof(zonetag));
}
if ((val = ast_variable_retrieve(cfg, "general", "emailsubject"))) {
emailsubject = ast_strdup(val);
}