diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2014-05-14 16:05:02 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2014-05-15 11:28:10 +0200 |
| commit | 4b670a20a9ee0ac5efd806ff804e75fe00509826 (patch) | |
| tree | caec3a95b3990471e64a40c346b01d8a166359af /src/charon/charon.c | |
| parent | da45f9e994f61324a058def37fbafd5cce75b5f3 (diff) | |
| download | strongswan-4b670a20.tar.bz2 strongswan-4b670a20.tar.xz | |
settings: strongswan.conf must be loaded explicitly
Diffstat (limited to 'src/charon/charon.c')
| -rw-r--r-- | src/charon/charon.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/charon/charon.c b/src/charon/charon.c index 089ac4570..a82aa4256 100644 --- a/src/charon/charon.c +++ b/src/charon/charon.c @@ -122,12 +122,15 @@ static void 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, !use_syslog); lib->plugins->reload(lib->plugins, NULL); } else +#endif { DBG1(DBG_DMN, "reloading config failed, keeping old"); } |