From 05ddd767992d68bb38c7f16ece142e8c2e9ae016 Mon Sep 17 00:00:00 2001 From: Yves-Alexis Perez Date: Sat, 1 Apr 2017 16:26:44 +0200 Subject: New upstream version 5.5.2 --- src/charon-svc/Makefile.in | 2 +- src/charon-svc/charon-svc.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src/charon-svc') diff --git a/src/charon-svc/Makefile.in b/src/charon-svc/Makefile.in index e9cb26620..7dd0fb6fe 100644 --- a/src/charon-svc/Makefile.in +++ b/src/charon-svc/Makefile.in @@ -327,7 +327,6 @@ exec_prefix = @exec_prefix@ fips_mode = @fips_mode@ gtk_CFLAGS = @gtk_CFLAGS@ gtk_LIBS = @gtk_LIBS@ -h_plugins = @h_plugins@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -362,6 +361,7 @@ nm_LIBS = @nm_LIBS@ nm_ca_dir = @nm_ca_dir@ nm_plugins = @nm_plugins@ oldincludedir = @oldincludedir@ +p_plugins = @p_plugins@ pcsclite_CFLAGS = @pcsclite_CFLAGS@ pcsclite_LIBS = @pcsclite_LIBS@ pdfdir = @pdfdir@ diff --git a/src/charon-svc/charon-svc.c b/src/charon-svc/charon-svc.c index 823b366c0..7201fae02 100644 --- a/src/charon-svc/charon-svc.c +++ b/src/charon-svc/charon-svc.c @@ -220,7 +220,8 @@ static void init_and_run(DWORD dwArgc, LPTSTR *lpszArgv, int (*wait)()) update_status(SERVICE_START_PENDING); if (libcharon_init()) { - charon->load_loggers(charon, levels, TRUE); + charon->set_default_loggers(charon, levels, TRUE); + charon->load_loggers(charon); print_version(); update_status(SERVICE_START_PENDING); if (charon->initialize(charon, PLUGINS)) -- cgit v1.2.3