From: Matthew Jordan Date: Fri, 30 May 2014 11:59:02 +0000 (+0000) Subject: main/config.c: AMI action UpdateConfig EmptyCat clears all categories X-Git-Tag: 11.11.0-rc1~44 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0494ad9c9437a0514e9fb11def7bca666555372;p=thirdparty%2Fasterisk.git 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 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@414881 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/main/config.c b/main/config.c index ca7d566884..1f4294e95d 100644 --- a/main/config.c +++ b/main/config.c @@ -1114,7 +1114,7 @@ int ast_category_empty(struct ast_config *cfg, const char *category) 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;