From e5e29897fa5e5a4d468790e37077e66bc4704376 Mon Sep 17 00:00:00 2001 From: George Joseph Date: Tue, 4 Nov 2014 20:48:18 +0000 Subject: config: BUG: Restore ability for non-templ to be used as base objs in config. 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 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@427228 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main/config.c') diff --git a/main/config.c b/main/config.c index 87000f3e3..23de2c8ba 100644 --- a/main/config.c +++ b/main/config.c @@ -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; -- cgit v1.2.3