From 380e0e3e2db352ba1009433dd131c686bfc44fca Mon Sep 17 00:00:00 2001 From: Leif Madsen Date: Tue, 17 May 2011 12:54:13 +0000 Subject: Merged revisions 319367 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r319367 | lmadsen | 2011-05-17 07:53:50 -0500 (Tue, 17 May 2011) | 10 lines Don't create [general] voicemail context when using users.conf Prior to this patch, app_voicemail would create a [general] context when parsing users.conf. (closes issue #18891) Reported by: pdugas Patches: app_voicemail-ignore-general.patch uploaded by pdugas (license 1222) app_voicemail-ignore-general-style-guidelines.patch uploaded by seanbright (license 71) Tested by: pdugas ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@319368 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_voicemail.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index a61673802..231863a2b 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -12129,6 +12129,9 @@ static int load_config(int reload) if (ucfg) { for (cat = ast_category_browse(ucfg, NULL); cat ; cat = ast_category_browse(ucfg, cat)) { + if (!strcasecmp(cat, "general")) { + continue; + } if (!ast_true(ast_config_option(ucfg, cat, "hasvoicemail"))) continue; if ((current = find_or_create(userscontext, cat))) { -- cgit v1.2.3