diff options
| author | George Joseph <george.joseph@fairview5.com> | 2014-11-04 20:49:14 +0000 |
|---|---|---|
| committer | George Joseph <george.joseph@fairview5.com> | 2014-11-04 20:49:14 +0000 |
| commit | bd42a09d7fcaa228d15d8bda74129232cdac4081 (patch) | |
| tree | 5ff3248df91128e3c788678f074236fb2a0a4aa6 /main/config.c | |
| parent | 97e1c7f3a9223981ee910bb820bb4c5fe70d18e9 (diff) | |
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
Diffstat (limited to 'main/config.c')
| -rw-r--r-- | main/config.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |