[asterisk-commits] mjordan: trunk r414883 - in /trunk: ./ main/config.c

[SVN commits to the Asterisk project]

Author: mjordan
Date: Fri May 30 07:05:33 2014
New Revision: 414883

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

Merged revisions 414881 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 414882 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/main/config.c

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

Modified: trunk/main/config.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/config.c?view=diff&rev=414883&r1=414882&r2=414883
==============================================================================
--- trunk/main/config.c (original)
+++ trunk/main/config.c Fri May 30 07:05:33 2014
@@ -1168,7 +1168,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;