From e1fb43d32a545c6deaa3afccb3e53cc7799ded58 Mon Sep 17 00:00:00 2001 From: Jason Parker Date: Mon, 25 Feb 2008 20:49:42 +0000 Subject: [PATCH] Allow the use of #include and #exec in situations where the max include depth was only 1. Specifically, this fixes using #include and #exec in extconfig.conf. This was basically caused because the config file itself raises the include level to 1. I opted not to raise the include limit, because recursion here could cause very bizarre behavior. Pointed out, and tested by jmls (closes issue #12064) git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@104092 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/config.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/main/config.c b/main/config.c index 7e0bd57d78..2740640a55 100644 --- a/main/config.c +++ b/main/config.c @@ -1330,7 +1330,8 @@ struct ast_config *ast_config_internal_load(const char *filename, struct ast_con struct ast_config_engine *loader = &text_file_engine; struct ast_config *result; - if (cfg->include_level == cfg->max_include_level) { + /* The config file itself bumps include_level by 1 */ + if (cfg->max_include_level > 0 && cfg->include_level == cfg->max_include_level + 1) { ast_log(LOG_WARNING, "Maximum Include level (%d) exceeded\n", cfg->max_include_level); return NULL; }