[asterisk-commits] russell: branch 11 r406644 - in /branches/11: ./ main/config.c

[SVN commits to the Asterisk project]

Author: russell
Date: Mon Jan 27 14:35:25 2014
New Revision: 406644

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=406644
Log:
Allow nested #includes in extconfig.conf

extconfig.conf was hard-coded to not allow nested includes for some reason.
The code has been this way since a patch was merged for ASTERISK-3333 (revision
4889), which was a significant update to this code ("Merge config updates").

I can't figure out any good reason why this should be limited.  This patch just
removes the limit and uses the default nesting depth limit.

Closes issue ASTERISK-17837

Review: https://reviewboard.asterisk.org/r/3159/
........

Merged revisions 406643 from http://svn.asterisk.org/svn/asterisk/branches/1.8

Modified:
    branches/11/   (props changed)
    branches/11/main/config.c

Propchange: branches/11/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/11/main/config.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/main/config.c?view=diff&rev=406644&r1=406643&r2=406644
==============================================================================
--- branches/11/main/config.c (original)
+++ branches/11/main/config.c Mon Jan 27 14:35:25 2014
@@ -2287,7 +2287,6 @@
 		ast_log(LOG_ERROR, "Unable to allocate memory for new config\n");
 		return -1;
 	}
-	configtmp->max_include_level = 1;
 	config = ast_config_internal_load(extconfig_conf, configtmp, flags, "", "extconfig");
 	if (config == CONFIG_STATUS_FILEINVALID) {
 		return -1;