diff options
Diffstat (limited to 'src/charon')
| -rw-r--r-- | src/charon/Makefile.in | 12 | ||||
| -rw-r--r-- | src/charon/charon.c | 25 |
2 files changed, 13 insertions, 24 deletions
diff --git a/src/charon/Makefile.in b/src/charon/Makefile.in index 7192e9e96..3ba9c2731 100644 --- a/src/charon/Makefile.in +++ b/src/charon/Makefile.in @@ -199,13 +199,7 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ ipsecdir = @ipsecdir@ -<<<<<<< HEAD -ipsecgid = @ipsecgid@ ipsecgroup = @ipsecgroup@ -ipsecuid = @ipsecuid@ -======= -ipsecgroup = @ipsecgroup@ ->>>>>>> upstream/4.5.1 ipsecuser = @ipsecuser@ libcharon_plugins = @libcharon_plugins@ libdir = @libdir@ @@ -226,6 +220,8 @@ nm_ca_dir = @nm_ca_dir@ oldincludedir = @oldincludedir@ openac_plugins = @openac_plugins@ p_plugins = @p_plugins@ +pcsclite_CFLAGS = @pcsclite_CFLAGS@ +pcsclite_LIBS = @pcsclite_LIBS@ pdfdir = @pdfdir@ piddir = @piddir@ pki_plugins = @pki_plugins@ @@ -244,14 +240,12 @@ sbindir = @sbindir@ scepclient_plugins = @scepclient_plugins@ scripts_plugins = @scripts_plugins@ sharedstatedir = @sharedstatedir@ -<<<<<<< HEAD -======= soup_CFLAGS = @soup_CFLAGS@ soup_LIBS = @soup_LIBS@ ->>>>>>> upstream/4.5.1 srcdir = @srcdir@ strongswan_conf = @strongswan_conf@ sysconfdir = @sysconfdir@ +systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ diff --git a/src/charon/charon.c b/src/charon/charon.c index 9e2d02b83..dda09f66d 100644 --- a/src/charon/charon.c +++ b/src/charon/charon.c @@ -26,11 +26,8 @@ #include <pthread.h> #include <sys/stat.h> #include <sys/types.h> -<<<<<<< HEAD -======= #include <syslog.h> #include <errno.h> ->>>>>>> upstream/4.5.1 #include <unistd.h> #include <getopt.h> #include <pwd.h> @@ -47,12 +44,9 @@ #include <private/android_filesystem_config.h> #endif -<<<<<<< HEAD -======= #ifndef LOG_AUTHPRIV /* not defined on OpenSolaris */ #define LOG_AUTHPRIV LOG_AUTH #endif ->>>>>>> upstream/4.5.1 /** * PID file, in which charon stores its process id @@ -115,7 +109,16 @@ static void run() { case SIGHUP: { - DBG1(DBG_DMN, "signal of type SIGHUP received. Ignored"); + DBG1(DBG_DMN, "signal of type SIGHUP received. Reloading " + "configuration"); + if (lib->settings->load_files(lib->settings, NULL, FALSE)) + { + lib->plugins->reload(lib->plugins, NULL); + } + else + { + DBG1(DBG_DMN, "reloading config failed, keeping old"); + } break; } case SIGINT: @@ -279,8 +282,6 @@ static void unlink_pidfile() unlink(PID_FILE); } -<<<<<<< HEAD -======= /** * Initialize logging */ @@ -409,7 +410,6 @@ static void initialize_loggers(bool use_stderr, level_t levels[]) sys_logger->set_level(sys_logger, DBG_ANY, LEVEL_AUDIT); } } ->>>>>>> upstream/4.5.1 /** * print command line usage and exit @@ -537,15 +537,10 @@ int main(int argc, char *argv[]) goto deinit; } -<<<<<<< HEAD - /* initialize daemon */ - if (!charon->initialize(charon, use_syslog, levels)) -======= initialize_loggers(!use_syslog, levels); /* initialize daemon */ if (!charon->initialize(charon)) ->>>>>>> upstream/4.5.1 { DBG1(DBG_DMN, "initialization failed - aborting charon"); goto deinit; |