Merged revisions 162355 via svnmerge from

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.0@162363 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 05e1cd7a6eec8d00d0bc140c3198a8a361216119..968e436aa9981190c0fb33460453ec25b916f2f9 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -561,6 +561,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;
@@ -694,6 +695,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)
@@ -9532,6 +9534,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);
                }