From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Wed, 30 Jun 2010 01:02:41 +0000 (+0000)
Subject: Merged revisions 273142 via svnmerge from
X-Git-Tag: 1.6.2.11-rc1~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e546e044ee241dd6b1bf6a15280529073f0276fa;p=thirdparty%2Fasterisk.git

Merged revisions 273142 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r273142 | tilghman | 2010-06-29 20:01:14 -0500 (Tue, 29 Jun 2010) | 5 lines

  Don't attempt to proceed if our internal parser indicates an invalid file.

  (closes issue #17560)
   Reported by: Nick_Lewis
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@273143 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/config.c b/main/config.c
index 7eb10bde43..5b8195a146 100644
--- a/main/config.c
+++ b/main/config.c
@@ -1883,7 +1883,9 @@ int read_config_maps(void)
 	configtmp = ast_config_new();
 	configtmp->max_include_level = 1;
 	config = ast_config_internal_load(extconfig_conf, configtmp, flags, "", "extconfig");
-	if (!config) {
+	if (config == CONFIG_STATUS_FILEINVALID) {
+		return -1;
+	} else if (!config) {
 		ast_config_destroy(configtmp);
 		return 0;
 	}