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/branches/10@329992 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/res/res_fax.c b/res/res_fax.c
index 8073f2d6e9433c78416a2b7034b67154bfda070f..50be862a49efdf801e25eff31382a24b55f6ca33 100644 (file)
--- 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);