diff options
| author | lmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-05-17 12:54:13 +0000 |
|---|---|---|
| committer | lmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-05-17 12:54:13 +0000 |
| commit | ca25543e2f1f96e265c302905c564195d1362e4d (patch) | |
| tree | 1d6829df9bd466c3ae4f5827f8569c7814f7722d /apps | |
| parent | 571ab4acb264a65cf815cdd19c71f9f062d642d7 (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@319368 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_voicemail.c | 3 |
1 files changed, 3 insertions, 0 deletions
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))) { |