settings: Use strongswan.conf used during library initialization for reload

Since 4b670a20 we require an explicit strongswan.conf to re-load configurations.
However, the define was missing in the build, breaking SIGHUP based config
reloading.

Fixes #651.

diff --git a/src/charon-cmd/charon-cmd.c b/src/charon-cmd/charon-cmd.c
index b41cf467c9c6d3e0f3fc15e70c512eb56a3c1a75..6f2b6f1780f6f3919eb9752e44dd226b669bd8d2 100644 (file)
--- a/src/charon-cmd/charon-cmd.c
+++ b/src/charon-cmd/charon-cmd.c
@@ -126,15 +126,12 @@ static int 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, TRUE);
                                        lib->plugins->reload(lib->plugins, NULL);
                                }
                                else
-#endif
                                {
                                        DBG1(DBG_DMN, "reloading config failed, keeping old");
                                }

diff --git a/src/charon/charon.c b/src/charon/charon.c
index 8afac3ffff1759c49892481c9d943699d2a28d67..081e49490bfbd93bc8d1b4a12855827c77ad2d34 100644 (file)
--- 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;
 }
-

diff --git a/src/libhydra/Makefile.am b/src/libhydra/Makefile.am
index 0c8ecda9e28b7f401e3ec0a0d6a2034bd64096e9..510f2a124dc9da5ba572332fd028c471b1a058d6 100644 (file)
--- a/src/libhydra/Makefile.am
+++ b/src/libhydra/Makefile.am
@@ -21,8 +21,7 @@ endif
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
        -DIPSEC_DIR=\"${ipsecdir}\" \
-       -DPLUGINDIR=\"${plugindir}\" \
-       -DSTRONGSWAN_CONF=\"${strongswan_conf}\"
+       -DPLUGINDIR=\"${plugindir}\"
 
 AM_LDFLAGS = \
   -no-undefined

diff --git a/src/libstrongswan/settings/settings_parser.y b/src/libstrongswan/settings/settings_parser.y
index b79faf6b788ad78865171fa21fcdd2ef9eb56f09..d95a24b2a952e128a614a093260e25dd64ce9894 100644 (file)
--- 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);
                }