aboutsummaryrefslogtreecommitdiffstats
path: root/src/charon-cmd/charon-cmd.c
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2014-05-14 16:05:02 +0200
committerTobias Brunner <tobias@strongswan.org>2014-05-15 11:28:10 +0200
commit4b670a20a9ee0ac5efd806ff804e75fe00509826 (patch)
treecaec3a95b3990471e64a40c346b01d8a166359af /src/charon-cmd/charon-cmd.c
parentda45f9e994f61324a058def37fbafd5cce75b5f3 (diff)
downloadstrongswan-4b670a20a9ee0ac5efd806ff804e75fe00509826.tar.bz2
strongswan-4b670a20a9ee0ac5efd806ff804e75fe00509826.tar.xz
settings: strongswan.conf must be loaded explicitly
Diffstat (limited to 'src/charon-cmd/charon-cmd.c')
-rw-r--r--src/charon-cmd/charon-cmd.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/charon-cmd/charon-cmd.c b/src/charon-cmd/charon-cmd.c
index a70d314af..b41cf467c 100644
--- a/src/charon-cmd/charon-cmd.c
+++ b/src/charon-cmd/charon-cmd.c
@@ -126,12 +126,15 @@ static int run()
{
DBG1(DBG_DMN, "signal of type SIGHUP received. Reloading "
"configuration");
- if (lib->settings->load_files(lib->settings, NULL, FALSE))
+#ifdef STRONGSWAN_CONF
+ if (lib->settings->load_files(lib->settings, STRONGSWAN_CONF,
+ FALSE))
{
charon->load_loggers(charon, levels, TRUE);
lib->plugins->reload(lib->plugins, NULL);
}
else
+#endif
{
DBG1(DBG_DMN, "reloading config failed, keeping old");
}