diff options
| author | Yves-Alexis Perez <corsac@corsac.net> | 2017-04-01 16:26:44 +0200 |
|---|---|---|
| committer | Yves-Alexis Perez <corsac@corsac.net> | 2017-04-01 16:26:44 +0200 |
| commit | dc9380af81fbce8e1a9532b07bc671b9d346101b (patch) | |
| tree | 219f7df0b01243ac1c41c7f679d1b4c6aef36b27 /src/charon-cmd/charon-cmd.c | |
| parent | 212c0ba74c0e453497b840f9cd131ec99f73754a (diff) | |
| parent | 05ddd767992d68bb38c7f16ece142e8c2e9ae016 (diff) | |
| download | vyos-strongswan-dc9380af81fbce8e1a9532b07bc671b9d346101b.tar.gz vyos-strongswan-dc9380af81fbce8e1a9532b07bc671b9d346101b.zip | |
Merge tag 'upstream/5.5.2'
Upstream version 5.5.2
Diffstat (limited to 'src/charon-cmd/charon-cmd.c')
| -rw-r--r-- | src/charon-cmd/charon-cmd.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/charon-cmd/charon-cmd.c b/src/charon-cmd/charon-cmd.c index f350198c6..793496451 100644 --- a/src/charon-cmd/charon-cmd.c +++ b/src/charon-cmd/charon-cmd.c @@ -40,11 +40,6 @@ static level_t default_loglevel = LEVEL_CTRL; /** - * Loglevel configuration - */ -static level_t levels[DBG_MAX]; - -/** * Connection to initiate */ static cmd_connection_t *conn; @@ -129,7 +124,7 @@ static int run() "configuration"); if (lib->settings->load_files(lib->settings, lib->conf, FALSE)) { - charon->load_loggers(charon, levels, TRUE); + charon->load_loggers(charon); lib->plugins->reload(lib->plugins, NULL); } else @@ -311,6 +306,7 @@ int main(int argc, char *argv[]) { struct sigaction action; struct utsname utsname; + level_t levels[DBG_MAX]; int group; /* handle simple arguments */ @@ -338,7 +334,8 @@ int main(int argc, char *argv[]) { levels[group] = default_loglevel; } - charon->load_loggers(charon, levels, TRUE); + charon->set_default_loggers(charon, levels, TRUE); + charon->load_loggers(charon); if (!lookup_uid_gid()) { |