From bbbd682ed66fdef65a9187fbdfd39e4625682a87 Mon Sep 17 00:00:00 2001
From: Mark Spencer <markster@digium.com>
Date: Sat, 11 Dec 2004 22:46:10 +0000
Subject: [PATCH] Revert earlier patch (bug #2825)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4430 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
config.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/config.c b/config.c
index 4081165b8b..4eaf9e4aa5 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);
--
GitLab