From: George Joseph <george.joseph@fairview5.com>
Date: Tue, 4 Nov 2014 20:47:30 +0000 (+0000)
Subject: config: BUG: Restore ability for non-templ to be used as base objs in config.
X-Git-Tag: 12.8.0-rc1~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c84324aeea94cb2d4f258975f92ebb24b5494660;p=thirdparty%2Fasterisk.git

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/



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

diff --git a/main/config.c b/main/config.c
index 83be41d95a..8a4a3e7841 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;