diff options
author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-12-11 22:46:10 +0000 |
---|---|---|
committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-12-11 22:46:10 +0000 |
commit | 1085da6bcf50ca4b6a199eab2080276200c39e3d (patch) | |
tree | abdb0399db71ce59ccd3c4b9f831e4390becdb16 /config.c | |
parent | 780ddd6c3266ca87fd804fb6d98b989a5052904f (diff) |
Revert earlier patch (bug #2825)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@4430 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'config.c')
-rwxr-xr-x | config.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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); |