Merged revisions 63254 via svnmerge from
authorOlle Johansson <oej@edvina.net>
Mon, 7 May 2007 20:07:38 +0000 (20:07 +0000)
committerOlle Johansson <oej@edvina.net>
Mon, 7 May 2007 20:07:38 +0000 (20:07 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r63254 | oej | 2007-05-07 22:05:15 +0200 (Mon, 07 May 2007) | 2 lines

Don't remove configuration from memory just because one section failed.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@63255 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/config.c

index d9d303c..50979b4 100644 (file)
@@ -631,7 +631,6 @@ static int process_text_line(struct ast_config *cfg, struct ast_category **cat,
                                } else if (!strcasecmp(cur, "+")) {
                                        *cat = category_get(cfg, catname, 1);
                                        if (!(*cat)) {
                                } else if (!strcasecmp(cur, "+")) {
                                        *cat = category_get(cfg, catname, 1);
                                        if (!(*cat)) {
-                                               ast_config_destroy(cfg);
                                                if (newcat)
                                                        ast_category_destroy(newcat);
                                                ast_log(LOG_WARNING, "Category addition requested, but category '%s' does not exist, line %d of %s\n", catname, lineno, configfile);
                                                if (newcat)
                                                        ast_category_destroy(newcat);
                                                ast_log(LOG_WARNING, "Category addition requested, but category '%s' does not exist, line %d of %s\n", catname, lineno, configfile);