config: BUG: Restore ability for non-templ to be used as base objs in config.
authorGeorge Joseph <george.joseph@fairview5.com>
Tue, 4 Nov 2014 20:49:14 +0000 (20:49 +0000)
committerGeorge Joseph <george.joseph@fairview5.com>
Tue, 4 Nov 2014 20:49:14 +0000 (20:49 +0000)
My recent refactor of config.c accidentally removed the capability for an
object to inherit from a non-template object.

This patch restores the capability to inherit from both template and
non-template objects.

Tested-by: George Joseph
Reported-by: Scott Griepentrog
ASTERISK-24487 #close

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

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

Merged revisions 427228 from http://svn.asterisk.org/svn/asterisk/branches/13

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

main/config.c

index 87000f3..23de2c8 100644 (file)
@@ -1678,7 +1678,7 @@ static int process_text_line(struct ast_config *cfg, struct ast_category **cat,
                                } else {
                                        struct ast_category *base;
 
-                                       base = ast_category_get(cfg, cur, "TEMPLATES=restrict");
+                                       base = ast_category_get(cfg, cur, "TEMPLATES=include");
                                        if (!base) {
                                                ast_log(LOG_WARNING, "Inheritance requested, but category '%s' does not exist, line %d of %s\n", cur, lineno, configfile);
                                                return -1;