mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-09 19:38:22 +00:00
check for CONFIG_STATUS_FILE_INVALID when loading the res_fax config file
Patch by: tzafrir Reported by: tzafrir (closes issue ASTERISK-18161) git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@329991 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -2613,6 +2613,12 @@ static int set_config(const char *config_file)
|
|||||||
ast_log(LOG_NOTICE, "Configuration file '%s' not found, using default options.\n", config_file);
|
ast_log(LOG_NOTICE, "Configuration file '%s' not found, using default options.\n", config_file);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (cfg == CONFIG_STATUS_FILEINVALID) {
|
||||||
|
ast_log(LOG_NOTICE, "Configuration file '%s' is invalid, using default options.\n", config_file);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
if (cfg == CONFIG_STATUS_FILEUNCHANGED) {
|
if (cfg == CONFIG_STATUS_FILEUNCHANGED) {
|
||||||
ast_clear_flag(&config_flags, CONFIG_FLAG_FILEUNCHANGED);
|
ast_clear_flag(&config_flags, CONFIG_FLAG_FILEUNCHANGED);
|
||||||
cfg = ast_config_load2(config_file, "res_fax", config_flags);
|
cfg = ast_config_load2(config_file, "res_fax", config_flags);
|
||||||
|
|||||||
Reference in New Issue
Block a user