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 ........ 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
This commit is contained in:
parent
97e1c7f3a9
commit
bd42a09d7f
|
@ -1678,7 +1678,7 @@ static int process_text_line(struct ast_config *cfg, struct ast_category **cat,
|
||||||
} else {
|
} else {
|
||||||
struct ast_category *base;
|
struct ast_category *base;
|
||||||
|
|
||||||
base = ast_category_get(cfg, cur, "TEMPLATES=restrict");
|
base = ast_category_get(cfg, cur, "TEMPLATES=include");
|
||||||
if (!base) {
|
if (!base) {
|
||||||
ast_log(LOG_WARNING, "Inheritance requested, but category '%s' does not exist, line %d of %s\n", cur, lineno, configfile);
|
ast_log(LOG_WARNING, "Inheritance requested, but category '%s' does not exist, line %d of %s\n", cur, lineno, configfile);
|
||||||
return -1;
|
return -1;
|
||||||
|
|
Loading…
Reference in New Issue