[svn-commits] russell: branch 1.8 r406643 - /branches/1.8/main/config.c

[SVN commits to the Digium repositories]

Author: russell
Date: Mon Jan 27 14:34:31 2014
New Revision: 406643

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

Modified:
    branches/1.8/main/config.c

Modified: branches/1.8/main/config.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/config.c?view=diff&rev=406643&r1=406642&r2=406643
==============================================================================
--- branches/1.8/main/config.c (original)
+++ branches/1.8/main/config.c Mon Jan 27 14:34:31 2014
@@ -2149,7 +2149,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;