summaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorMark Spencer <markster@digium.com>2004-12-11 22:46:10 +0000
committerMark Spencer <markster@digium.com>2004-12-11 22:46:10 +0000
commitbbbd682ed66fdef65a9187fbdfd39e4625682a87 (patch)
treeabdb0399db71ce59ccd3c4b9f831e4390becdb16 /config.c
parent30bc3eec6e1d59a447a4787f1f44838839e6919e (diff)
Revert earlier patch (bug #2825)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4430 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'config.c')
-rwxr-xr-xconfig.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/config.c b/config.c
index 4081165b8..4eaf9e4aa 100755
--- a/config.c
+++ b/config.c
@@ -303,7 +303,8 @@ static int cfg_process(struct ast_config *tmp, struct ast_category **_tmpc, stru
if(arg && cur) {
ast_log(LOG_WARNING, "Including files with explicit config engine no longer permitted. Please use extconfig.conf to specify all mappings\n");
} else {
- __ast_load(cur, tmp, _tmpc, _last, includelevel + 1);
+ if (!__ast_load(cur, tmp, _tmpc, _last, includelevel + 1))
+ return -1;
}
} else
ast_log(LOG_WARNING, "Maximum Include level (%d) exceeded\n", includelevel);