From: Leif Madsen <leif@leifmadsen.com>
Date: Tue, 17 May 2011 12:53:50 +0000 (+0000)
Subject: Don't create [general] voicemail context when using users.conf
X-Git-Tag: 1.8.5-rc1~11^2~107
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c23377d8f25a96e4bd104b98a4f0ef9498b56470;p=thirdparty%2Fasterisk.git

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/branches/1.8@319367 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index d6d3c16c55..474aaf3fc4 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -12140,6 +12140,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))) {