From b23b0e5609ed4b3d29396a1727aab035fa4a395f 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/charon/charon.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'src/charon/charon.c')

diff --git a/src/charon/charon.c b/src/charon/charon.c
index 8afac3fff..081e49490 100644
--- a/src/charon/charon.c
+++ b/src/charon/charon.c
@@ -124,15 +124,12 @@ static void run()
 			{
 				DBG1(DBG_DMN, "signal of type SIGHUP received. Reloading "
 					 "configuration");
-#ifdef STRONGSWAN_CONF
-				if (lib->settings->load_files(lib->settings, STRONGSWAN_CONF,
-											  FALSE))
+				if (lib->settings->load_files(lib->settings, lib->conf, FALSE))
 				{
 					charon->load_loggers(charon, levels, !use_syslog);
 					lib->plugins->reload(lib->plugins, NULL);
 				}
 				else
-#endif
 				{
 					DBG1(DBG_DMN, "reloading config failed, keeping old");
 				}
@@ -468,4 +465,3 @@ deinit:
 	library_deinit();
 	return status;
 }
-
-- 
cgit v1.2.3