[svn-commits] mjordan: branch 11 r414881 - in /branches/11: ./ main/config.c

SVN commits to the Digium repositories svn-commits at lists.digium.com
Fri May 30 06:59:05 CDT 2014


Author: mjordan
Date: Fri May 30 06:59:02 2014
New Revision: 414881

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=414881
Log:
main/config.c: AMI action UpdateConfig EmptyCat clears all categories

When invoking UpdateConfig AMI action with Action set to EmptyCat, Asterisk
will make all categories empty in the config but the one requested with a
Cat variable. This is due to a bug in ast_category_empty (main/config.c)
that makes an incorrect comparison for a category name.

This patch corrects the comparison such that only the requested category
is cleared.

Review: https://reviewboard.asterisk.org/r/3573/

ASTERISK-23803 #close
Reported by: zvision
patches:
  manager.c.diff uploaded by zvision (License 5755)
........

Merged revisions 414880 from http://svn.asterisk.org/svn/asterisk/branches/1.8

Modified:
    branches/11/   (props changed)
    branches/11/main/config.c

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

Modified: branches/11/main/config.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/main/config.c?view=diff&rev=414881&r1=414880&r2=414881
==============================================================================
--- branches/11/main/config.c (original)
+++ branches/11/main/config.c Fri May 30 06:59:02 2014
@@ -1114,7 +1114,7 @@
 	struct ast_category *cat;
 
 	for (cat = cfg->root; cat; cat = cat->next) {
-		if (!strcasecmp(cat->name, category))
+		if (strcasecmp(cat->name, category))
 			continue;
 		ast_variables_destroy(cat->root);
 		cat->root = NULL;




More information about the svn-commits mailing list