diff options
| author | Russell Bryant <russell@russellbryant.com> | 2014-01-27 20:38:03 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2014-01-27 20:38:03 +0000 |
| commit | 8a762efb35763460845aa19bc93ad985866f9548 (patch) | |
| tree | 537d87d2d7d7f17f6df27f95fcae03118f2a1056 /main/config.c | |
| parent | cc42229f26c66864913302572f034f19d571d71a (diff) | |
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
........
Merged revisions 406644 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 406645 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@406646 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/config.c')
| -rw-r--r-- | main/config.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/main/config.c b/main/config.c index c6458caaf..d10d6763c 100644 --- a/main/config.c +++ b/main/config.c @@ -2323,7 +2323,6 @@ int read_config_maps(void) 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; |