[asterisk-commits] lmadsen: trunk r319368 - in /trunk: ./ apps/app_voicemail.c

[SVN commits to the Asterisk project]

Author: lmadsen
Date: Tue May 17 07:54:13 2011
New Revision: 319368

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=319368
Log:
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
........

Modified:
    trunk/   (props changed)
    trunk/apps/app_voicemail.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_voicemail.c?view=diff&rev=319368&r1=319367&r2=319368
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Tue May 17 07:54:13 2011
@@ -12129,6 +12129,9 @@
 
 		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))) {