[asterisk-commits] gtjoseph: trunk r427229 - in /trunk: ./ main/config.c

[SVN commits to the Asterisk project]

Author: gtjoseph
Date: Tue Nov  4 14:49:14 2014
New Revision: 427229

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=427229
Log:
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

Modified:
    trunk/   (props changed)
    trunk/main/config.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-13-merged' - no diff available.

Modified: trunk/main/config.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/config.c?view=diff&rev=427229&r1=427228&r2=427229
==============================================================================
--- trunk/main/config.c (original)
+++ trunk/main/config.c Tue Nov  4 14:49:14 2014
@@ -1678,7 +1678,7 @@
 				} 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;