diff options
| author | Matthew Nicholson <mnicholson@digium.com> | 2011-07-28 15:30:30 +0000 |
|---|---|---|
| committer | Matthew Nicholson <mnicholson@digium.com> | 2011-07-28 15:30:30 +0000 |
| commit | b05b37dc535f8ffe2872428dfc36fe81057a2ef9 (patch) | |
| tree | 7352c6ea202a1f07f6e855dec1a3ea60ffff44ca /res | |
| parent | f90bb00e29ebd8ca2267254b1812e3881cc28077 (diff) | |
Merged revisions 329992 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10
................
r329992 | mnicholson | 2011-07-28 10:28:21 -0500 (Thu, 28 Jul 2011) | 13 lines
Merged revisions 329991 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r329991 | mnicholson | 2011-07-28 10:26:56 -0500 (Thu, 28 Jul 2011) | 6 lines
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/trunk@329993 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_fax.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/res/res_fax.c b/res/res_fax.c index 8073f2d6e..50be862a4 100644 --- a/res/res_fax.c +++ b/res/res_fax.c @@ -3353,6 +3353,12 @@ static int set_config(const char *config_file) ast_log(LOG_NOTICE, "Configuration file '%s' not found, using default options.\n", config_file); 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) { ast_clear_flag(&config_flags, CONFIG_FLAG_FILEUNCHANGED); cfg = ast_config_load2(config_file, "res_fax", config_flags); |