Revert earlier patch (bug #2825)
authorMark Spencer <markster@digium.com>
Sat, 11 Dec 2004 22:46:10 +0000 (22:46 +0000)
committerMark Spencer <markster@digium.com>
Sat, 11 Dec 2004 22:46:10 +0000 (22:46 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4430 65c4cc65-6c06-0410-ace0-fbb531ad65f3

config.c

index 4081165..4eaf9e4 100755 (executable)
--- 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);