diff options
Diffstat (limited to 'src/charon')
| -rw-r--r-- | src/charon/Makefile.in | 9 | ||||
| -rw-r--r-- | src/charon/charon.c | 14 |
2 files changed, 23 insertions, 0 deletions
diff --git a/src/charon/Makefile.in b/src/charon/Makefile.in index f502b0f25..7192e9e96 100644 --- a/src/charon/Makefile.in +++ b/src/charon/Makefile.in @@ -199,7 +199,13 @@ 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@ @@ -238,8 +244,11 @@ 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@ diff --git a/src/charon/charon.c b/src/charon/charon.c index d1fff5bd9..9e2d02b83 100644 --- a/src/charon/charon.c +++ b/src/charon/charon.c @@ -26,8 +26,11 @@ #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> @@ -44,9 +47,12 @@ #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 @@ -273,6 +279,8 @@ static void unlink_pidfile() unlink(PID_FILE); } +<<<<<<< HEAD +======= /** * Initialize logging */ @@ -401,6 +409,7 @@ 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 @@ -528,10 +537,15 @@ 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; |