From: Matthew Nicholson <mnicholson@digium.com>
Date: Thu, 28 Jul 2011 15:26:56 +0000 (+0000)
Subject: check for CONFIG_STATUS_FILE_INVALID when loading the res_fax config file
X-Git-Tag: 1.8.6.0-rc1~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1067b58cd36fa577b823d2d7e01fff64eede939d;p=thirdparty%2Fasterisk.git

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
---

diff --git a/res/res_fax.c b/res/res_fax.c
index 272c709af2..933f980fc7 100644
--- a/res/res_fax.c
+++ b/res/res_fax.c
@@ -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);
 		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);