From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 29 Apr 2014 09:39:57 +0000 (+0200)
Subject: settings: Reduce log verbosity if files can't be opened
X-Git-Tag: 5.2.0dr4~1^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f65ac98c645e5b5798ecdd7b81b22c1978cbf1dc;p=thirdparty%2Fstrongswan.git

settings: Reduce log verbosity if files can't be opened

Basically reintroducing 2a38b4556e9fd8102bd6c6c61f2893599a5e8e51.
---

diff --git a/src/libstrongswan/settings/settings_parser.y b/src/libstrongswan/settings/settings_parser.y
index b81003f297..d5566df9d9 100644
--- a/src/libstrongswan/settings/settings_parser.y
+++ b/src/libstrongswan/settings/settings_parser.y
@@ -255,7 +255,16 @@ bool settings_parser_parse_file(section_t *root, char *name)
 	helper->file_include(helper, name);
 	if (!settings_parser_open_next_file(helper))
 	{
-		DBG1(DBG_CFG, "failed to open config file '%s'", name);
+#ifdef STRONGSWAN_CONF
+		if (streq(name, STRONGSWAN_CONF))
+		{
+			DBG2(DBG_CFG, "failed to open config file '%s'", name);
+		}
+		else
+#endif
+		{
+			DBG1(DBG_CFG, "failed to open config file '%s'", name);
+		}
 	}
 	else
 	{
diff --git a/src/libstrongswan/utils/parser_helper.c b/src/libstrongswan/utils/parser_helper.c
index fb549a5729..5093166651 100644
--- a/src/libstrongswan/utils/parser_helper.c
+++ b/src/libstrongswan/utils/parser_helper.c
@@ -111,7 +111,7 @@ METHOD(parser_helper_t, file_next, parser_helper_file_t*,
 				array_insert(this->files, ARRAY_TAIL, next);
 				return &next->public;
 			}
-			PARSER_DBG1(&this->public, "unable to open '%s'", name);
+			PARSER_DBG2(&this->public, "unable to open '%s'", name);
 			parser_helper_file_destroy(next);
 		}
 		file->matches->destroy(file->matches);