From 2b8de74ff4c334c25e89988c4a401b24b5bcf03d Mon Sep 17 00:00:00 2001
From: Romain Francoise <rfrancoise@debian.org>
Date: Tue, 21 Oct 2014 19:28:38 +0200
Subject: Import upstream release 5.2.1

---
 src/libstrongswan/settings/settings_parser.y | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/libstrongswan/settings/settings_parser.y')

diff --git a/src/libstrongswan/settings/settings_parser.y b/src/libstrongswan/settings/settings_parser.y
index b79faf6b7..d95a24b2a 100644
--- a/src/libstrongswan/settings/settings_parser.y
+++ b/src/libstrongswan/settings/settings_parser.y
@@ -259,13 +259,11 @@ bool settings_parser_parse_file(section_t *root, char *name)
 	helper->file_include(helper, name);
 	if (!settings_parser_open_next_file(helper))
 	{
-#ifdef STRONGSWAN_CONF
-		if (streq(name, STRONGSWAN_CONF))
+		if (lib->conf && streq(name, lib->conf))
 		{
 			DBG2(DBG_CFG, "failed to open config file '%s'", name);
 		}
 		else
-#endif
 		{
 			DBG1(DBG_CFG, "failed to open config file '%s'", name);
 		}
-- 
cgit v1.2.3