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.
This commit is contained in:
Martin Willi
2014-09-22 13:40:39 +02:00
parent 9e783f6e89
commit 68da3bad57
4 changed files with 4 additions and 14 deletions
+1 -5
View File
@@ -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;
}