Restore ignoring missing include files (bug #2825)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4428 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
bc92c225fb
commit
442e1403a8
3
config.c
3
config.c
|
@ -303,8 +303,7 @@ static int cfg_process(struct ast_config *tmp, struct ast_category **_tmpc, stru
|
||||||
if(arg && cur) {
|
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");
|
ast_log(LOG_WARNING, "Including files with explicit config engine no longer permitted. Please use extconfig.conf to specify all mappings\n");
|
||||||
} else {
|
} else {
|
||||||
if (!__ast_load(cur, tmp, _tmpc, _last, includelevel + 1))
|
__ast_load(cur, tmp, _tmpc, _last, includelevel + 1);
|
||||||
return -1;
|
|
||||||
}
|
}
|
||||||
} else
|
} else
|
||||||
ast_log(LOG_WARNING, "Maximum Include level (%d) exceeded\n", includelevel);
|
ast_log(LOG_WARNING, "Maximum Include level (%d) exceeded\n", includelevel);
|
||||||
|
|
Loading…
Reference in New Issue