[svn-commits] mnicholson: branch 1.8 r329991 - /branches/1.8/res/res_fax.c

[SVN commits to the Digium repositories]

Author: mnicholson
Date: Thu Jul 28 10:26:56 2011
New Revision: 329991

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=329991
Log:
check for CONFIG_STATUS_FILE_INVALID when loading the res_fax config file

Patch by: tzafrir
Reported by: tzafrir
(closes issue ASTERISK-18161)

Modified:
    branches/1.8/res/res_fax.c

Modified: branches/1.8/res/res_fax.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/res/res_fax.c?view=diff&rev=329991&r1=329990&r2=329991
==============================================================================
--- branches/1.8/res/res_fax.c (original)
+++ branches/1.8/res/res_fax.c Thu Jul 28 10:26:56 2011
@@ -2613,6 +2613,12 @@
 		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);