From be214cb17e4eead2e3260dfe4700939756f4734a Mon Sep 17 00:00:00 2001
From: Tobias Brunner <tobias@strongswan.org>
Date: Fri, 10 Nov 2017 15:53:52 +0100
Subject: testing: Globally define logging via syslog for charon-systemd

We could make the same change for charon (actually setting it for charon
in strongswan.conf.testing would work for charon-systemd too), however,
there are dozens of test cases that currently set charondebug in
ipsec.conf.
---
 testing/hosts/default/etc/strongswan.conf.testing             |  9 +++++++++
 .../tests/af-alg/alg-camellia/hosts/carol/etc/strongswan.conf | 11 +----------
 .../tests/af-alg/alg-camellia/hosts/moon/etc/strongswan.conf  | 11 +----------
 testing/tests/af-alg/rw-cert/hosts/carol/etc/strongswan.conf  | 11 +----------
 testing/tests/af-alg/rw-cert/hosts/dave/etc/strongswan.conf   | 11 +----------
 testing/tests/af-alg/rw-cert/hosts/moon/etc/strongswan.conf   | 11 +----------
 .../gcrypt-ikev1/alg-serpent/hosts/carol/etc/strongswan.conf  |  9 ---------
 .../gcrypt-ikev1/alg-serpent/hosts/moon/etc/strongswan.conf   |  9 ---------
 .../gcrypt-ikev1/alg-twofish/hosts/carol/etc/strongswan.conf  |  9 ---------
 .../gcrypt-ikev1/alg-twofish/hosts/moon/etc/strongswan.conf   |  9 ---------
 .../gcrypt-ikev2/alg-camellia/hosts/carol/etc/strongswan.conf | 11 +----------
 .../gcrypt-ikev2/alg-camellia/hosts/moon/etc/strongswan.conf  | 11 +----------
 .../gcrypt-ikev2/rw-cert/hosts/carol/etc/strongswan.conf      | 11 +----------
 .../tests/gcrypt-ikev2/rw-cert/hosts/dave/etc/strongswan.conf | 11 +----------
 .../tests/gcrypt-ikev2/rw-cert/hosts/moon/etc/strongswan.conf | 11 +----------
 .../tests/ipv6/host2host-ikev1/hosts/moon/etc/strongswan.conf | 11 +----------
 .../tests/ipv6/host2host-ikev1/hosts/sun/etc/strongswan.conf  | 11 +----------
 .../tests/ipv6/host2host-ikev2/hosts/moon/etc/strongswan.conf | 11 +----------
 .../tests/ipv6/host2host-ikev2/hosts/sun/etc/strongswan.conf  | 11 +----------
 .../tests/ipv6/net2net-ikev1/hosts/moon/etc/strongswan.conf   |  9 ---------
 .../tests/ipv6/net2net-ikev1/hosts/sun/etc/strongswan.conf    |  9 ---------
 .../tests/ipv6/net2net-ikev2/hosts/moon/etc/strongswan.conf   |  9 ---------
 .../tests/ipv6/net2net-ikev2/hosts/sun/etc/strongswan.conf    |  9 ---------
 .../net2net-ip4-in-ip6-ikev1/hosts/moon/etc/strongswan.conf   |  9 ---------
 .../net2net-ip4-in-ip6-ikev1/hosts/sun/etc/strongswan.conf    |  9 ---------
 .../net2net-ip4-in-ip6-ikev2/hosts/moon/etc/strongswan.conf   |  9 ---------
 .../net2net-ip4-in-ip6-ikev2/hosts/sun/etc/strongswan.conf    |  9 ---------
 .../net2net-ip6-in-ip4-ikev1/hosts/moon/etc/strongswan.conf   | 10 ----------
 .../net2net-ip6-in-ip4-ikev1/hosts/sun/etc/strongswan.conf    | 10 ----------
 .../net2net-ip6-in-ip4-ikev2/hosts/moon/etc/strongswan.conf   | 10 ----------
 .../net2net-ip6-in-ip4-ikev2/hosts/sun/etc/strongswan.conf    | 10 ----------
 .../ipv6/net2net-rfc3779-ikev2/hosts/moon/etc/strongswan.conf |  9 ---------
 .../ipv6/net2net-rfc3779-ikev2/hosts/sun/etc/strongswan.conf  | 10 ----------
 .../ipv6/rw-compress-ikev2/hosts/carol/etc/strongswan.conf    |  9 ---------
 .../ipv6/rw-compress-ikev2/hosts/moon/etc/strongswan.conf     |  9 ---------
 testing/tests/ipv6/rw-ikev1/hosts/carol/etc/strongswan.conf   |  9 ---------
 testing/tests/ipv6/rw-ikev1/hosts/dave/etc/strongswan.conf    |  9 ---------
 testing/tests/ipv6/rw-ikev1/hosts/moon/etc/strongswan.conf    |  9 ---------
 testing/tests/ipv6/rw-ikev2/hosts/carol/etc/strongswan.conf   |  9 ---------
 testing/tests/ipv6/rw-ikev2/hosts/dave/etc/strongswan.conf    |  9 ---------
 testing/tests/ipv6/rw-ikev2/hosts/moon/etc/strongswan.conf    |  9 ---------
 .../ipv6/rw-ip6-in-ip4-ikev1/hosts/carol/etc/strongswan.conf  |  9 ---------
 .../ipv6/rw-ip6-in-ip4-ikev1/hosts/dave/etc/strongswan.conf   |  9 ---------
 .../ipv6/rw-ip6-in-ip4-ikev1/hosts/moon/etc/strongswan.conf   |  9 ---------
 .../ipv6/rw-ip6-in-ip4-ikev2/hosts/carol/etc/strongswan.conf  |  9 ---------
 .../ipv6/rw-ip6-in-ip4-ikev2/hosts/dave/etc/strongswan.conf   |  9 ---------
 .../ipv6/rw-ip6-in-ip4-ikev2/hosts/moon/etc/strongswan.conf   |  9 ---------
 .../tests/ipv6/rw-psk-ikev1/hosts/carol/etc/strongswan.conf   |  9 ---------
 .../tests/ipv6/rw-psk-ikev1/hosts/dave/etc/strongswan.conf    |  9 ---------
 .../tests/ipv6/rw-psk-ikev1/hosts/moon/etc/strongswan.conf    |  9 ---------
 .../tests/ipv6/rw-psk-ikev2/hosts/carol/etc/strongswan.conf   |  9 ---------
 .../tests/ipv6/rw-psk-ikev2/hosts/dave/etc/strongswan.conf    |  9 ---------
 .../tests/ipv6/rw-psk-ikev2/hosts/moon/etc/strongswan.conf    |  9 ---------
 .../ipv6/rw-rfc3779-ikev2/hosts/carol/etc/strongswan.conf     |  9 ---------
 .../ipv6/rw-rfc3779-ikev2/hosts/dave/etc/strongswan.conf      |  9 ---------
 .../ipv6/rw-rfc3779-ikev2/hosts/moon/etc/strongswan.conf      |  9 ---------
 .../tests/ipv6/transport-ikev1/hosts/moon/etc/strongswan.conf | 11 +----------
 .../tests/ipv6/transport-ikev1/hosts/sun/etc/strongswan.conf  | 11 +----------
 .../tests/ipv6/transport-ikev2/hosts/moon/etc/strongswan.conf | 11 +----------
 .../tests/ipv6/transport-ikev2/hosts/sun/etc/strongswan.conf  | 11 +----------
 .../libipsec/host2host-cert/hosts/moon/etc/strongswan.conf    | 10 +---------
 .../libipsec/host2host-cert/hosts/sun/etc/strongswan.conf     | 10 +---------
 .../libipsec/net2net-3des/hosts/moon/etc/strongswan.conf      | 11 +----------
 .../tests/libipsec/net2net-3des/hosts/sun/etc/strongswan.conf | 11 +----------
 .../libipsec/net2net-cert-ipv6/hosts/moon/etc/strongswan.conf | 11 +----------
 .../libipsec/net2net-cert-ipv6/hosts/sun/etc/strongswan.conf  | 11 +----------
 .../libipsec/net2net-cert/hosts/moon/etc/strongswan.conf      | 11 +----------
 .../tests/libipsec/net2net-cert/hosts/sun/etc/strongswan.conf | 11 +----------
 .../libipsec/net2net-null/hosts/moon/etc/strongswan.conf      | 11 +----------
 .../tests/libipsec/net2net-null/hosts/sun/etc/strongswan.conf | 11 +----------
 .../sql/ip-pool-db-expired/hosts/carol/etc/strongswan.conf    |  8 --------
 .../sql/ip-pool-db-expired/hosts/dave/etc/strongswan.conf     |  8 --------
 .../sql/ip-pool-db-expired/hosts/moon/etc/strongswan.conf     |  8 --------
 .../sql/ip-pool-db-restart/hosts/carol/etc/strongswan.conf    |  8 --------
 .../sql/ip-pool-db-restart/hosts/dave/etc/strongswan.conf     |  8 --------
 .../sql/ip-pool-db-restart/hosts/moon/etc/strongswan.conf     |  8 --------
 testing/tests/sql/ip-pool-db/hosts/carol/etc/strongswan.conf  |  8 --------
 testing/tests/sql/ip-pool-db/hosts/dave/etc/strongswan.conf   |  8 --------
 testing/tests/sql/ip-pool-db/hosts/moon/etc/strongswan.conf   |  8 --------
 .../ip-split-pools-db-restart/hosts/carol/etc/strongswan.conf |  8 --------
 .../ip-split-pools-db-restart/hosts/dave/etc/strongswan.conf  |  8 --------
 .../ip-split-pools-db-restart/hosts/moon/etc/strongswan.conf  |  8 --------
 .../sql/ip-split-pools-db/hosts/carol/etc/strongswan.conf     |  8 --------
 .../sql/ip-split-pools-db/hosts/dave/etc/strongswan.conf      |  8 --------
 .../sql/ip-split-pools-db/hosts/moon/etc/strongswan.conf      |  8 --------
 .../tests/sql/multi-level-ca/hosts/carol/etc/strongswan.conf  |  8 --------
 .../tests/sql/multi-level-ca/hosts/dave/etc/strongswan.conf   |  8 --------
 .../tests/sql/multi-level-ca/hosts/moon/etc/strongswan.conf   |  8 --------
 testing/tests/sql/net2net-cert/hosts/moon/etc/strongswan.conf |  8 --------
 testing/tests/sql/net2net-cert/hosts/sun/etc/strongswan.conf  |  8 --------
 testing/tests/sql/net2net-psk/hosts/moon/etc/strongswan.conf  |  8 --------
 testing/tests/sql/net2net-psk/hosts/sun/etc/strongswan.conf   |  8 --------
 .../sql/net2net-route-pem/hosts/moon/etc/strongswan.conf      |  8 --------
 .../tests/sql/net2net-route-pem/hosts/sun/etc/strongswan.conf |  8 --------
 .../sql/net2net-start-pem/hosts/moon/etc/strongswan.conf      |  8 --------
 .../tests/sql/net2net-start-pem/hosts/sun/etc/strongswan.conf |  8 --------
 testing/tests/sql/rw-cert/hosts/carol/etc/strongswan.conf     |  8 --------
 testing/tests/sql/rw-cert/hosts/dave/etc/strongswan.conf      |  8 --------
 testing/tests/sql/rw-cert/hosts/moon/etc/strongswan.conf      |  8 --------
 .../tests/sql/rw-eap-aka-rsa/hosts/carol/etc/strongswan.conf  |  8 --------
 .../tests/sql/rw-eap-aka-rsa/hosts/moon/etc/strongswan.conf   |  8 --------
 testing/tests/sql/rw-psk-ipv4/hosts/carol/etc/strongswan.conf |  8 --------
 testing/tests/sql/rw-psk-ipv4/hosts/dave/etc/strongswan.conf  |  8 --------
 testing/tests/sql/rw-psk-ipv4/hosts/moon/etc/strongswan.conf  |  8 --------
 testing/tests/sql/rw-psk-ipv6/hosts/carol/etc/strongswan.conf |  8 --------
 testing/tests/sql/rw-psk-ipv6/hosts/dave/etc/strongswan.conf  |  8 --------
 testing/tests/sql/rw-psk-ipv6/hosts/moon/etc/strongswan.conf  |  8 --------
 .../sql/rw-psk-rsa-split/hosts/carol/etc/strongswan.conf      |  8 --------
 .../tests/sql/rw-psk-rsa-split/hosts/dave/etc/strongswan.conf |  8 --------
 .../tests/sql/rw-psk-rsa-split/hosts/moon/etc/strongswan.conf |  8 --------
 .../tests/sql/rw-rsa-keyid/hosts/carol/etc/strongswan.conf    |  8 --------
 testing/tests/sql/rw-rsa-keyid/hosts/dave/etc/strongswan.conf |  8 --------
 testing/tests/sql/rw-rsa-keyid/hosts/moon/etc/strongswan.conf |  8 --------
 testing/tests/sql/rw-rsa/hosts/carol/etc/strongswan.conf      |  8 --------
 testing/tests/sql/rw-rsa/hosts/dave/etc/strongswan.conf       |  8 --------
 testing/tests/sql/rw-rsa/hosts/moon/etc/strongswan.conf       |  8 --------
 .../sql/shunt-policies-nat-rw/hosts/alice/etc/strongswan.conf |  8 --------
 .../sql/shunt-policies-nat-rw/hosts/sun/etc/strongswan.conf   |  8 --------
 .../sql/shunt-policies-nat-rw/hosts/venus/etc/strongswan.conf |  8 --------
 .../swanctl/config-payload/hosts/carol/etc/strongswan.conf    |  9 ---------
 .../swanctl/config-payload/hosts/dave/etc/strongswan.conf     |  9 ---------
 .../swanctl/config-payload/hosts/moon/etc/strongswan.conf     |  9 ---------
 .../swanctl/crl-to-cache/hosts/carol/etc/strongswan.conf      |  8 --------
 .../tests/swanctl/crl-to-cache/hosts/moon/etc/strongswan.conf |  8 --------
 .../swanctl/dhcp-dynamic/hosts/carol/etc/strongswan.conf      |  9 ---------
 .../tests/swanctl/dhcp-dynamic/hosts/dave/etc/strongswan.conf |  9 ---------
 .../tests/swanctl/dhcp-dynamic/hosts/moon/etc/strongswan.conf |  8 --------
 .../tests/swanctl/frags-ipv4/hosts/carol/etc/strongswan.conf  |  9 ---------
 .../tests/swanctl/frags-ipv4/hosts/dave/etc/strongswan.conf   |  9 ---------
 .../tests/swanctl/frags-ipv4/hosts/moon/etc/strongswan.conf   |  9 ---------
 .../tests/swanctl/frags-ipv6/hosts/carol/etc/strongswan.conf  |  9 ---------
 .../tests/swanctl/frags-ipv6/hosts/dave/etc/strongswan.conf   |  9 ---------
 .../tests/swanctl/frags-ipv6/hosts/moon/etc/strongswan.conf   |  9 ---------
 .../tests/swanctl/ip-pool-db/hosts/carol/etc/strongswan.conf  |  9 ---------
 .../tests/swanctl/ip-pool-db/hosts/dave/etc/strongswan.conf   |  9 ---------
 .../tests/swanctl/ip-pool-db/hosts/moon/etc/strongswan.conf   |  8 --------
 testing/tests/swanctl/ip-pool/hosts/carol/etc/strongswan.conf |  9 ---------
 testing/tests/swanctl/ip-pool/hosts/dave/etc/strongswan.conf  |  9 ---------
 testing/tests/swanctl/ip-pool/hosts/moon/etc/strongswan.conf  |  9 ---------
 .../tests/swanctl/manual-prio/hosts/carol/etc/strongswan.conf |  9 ---------
 .../tests/swanctl/manual-prio/hosts/dave/etc/strongswan.conf  |  9 ---------
 .../tests/swanctl/manual-prio/hosts/moon/etc/strongswan.conf  |  9 ---------
 .../mult-auth-rsa-eap-sim-id/hosts/carol/etc/strongswan.conf  |  9 ---------
 .../mult-auth-rsa-eap-sim-id/hosts/dave/etc/strongswan.conf   |  9 ---------
 .../mult-auth-rsa-eap-sim-id/hosts/moon/etc/strongswan.conf   |  8 --------
 .../swanctl/multi-level-ca/hosts/carol/etc/strongswan.conf    |  9 ---------
 .../swanctl/multi-level-ca/hosts/dave/etc/strongswan.conf     |  9 ---------
 .../swanctl/multi-level-ca/hosts/moon/etc/strongswan.conf     |  9 ---------
 .../tests/swanctl/net2net-cert/hosts/moon/etc/strongswan.conf |  9 ---------
 .../tests/swanctl/net2net-cert/hosts/sun/etc/strongswan.conf  |  9 ---------
 .../swanctl/net2net-ed25519/hosts/moon/etc/strongswan.conf    |  9 ---------
 .../swanctl/net2net-ed25519/hosts/sun/etc/strongswan.conf     |  9 ---------
 .../tests/swanctl/net2net-gw/hosts/carol/etc/strongswan.conf  |  9 ---------
 .../tests/swanctl/net2net-gw/hosts/moon/etc/strongswan.conf   |  9 ---------
 .../tests/swanctl/net2net-gw/hosts/sun/etc/strongswan.conf    |  9 ---------
 .../swanctl/net2net-multicast/hosts/moon/etc/strongswan.conf  |  8 --------
 .../swanctl/net2net-multicast/hosts/sun/etc/strongswan.conf   |  8 --------
 .../swanctl/net2net-pubkey/hosts/moon/etc/strongswan.conf     |  9 ---------
 .../swanctl/net2net-pubkey/hosts/sun/etc/strongswan.conf      |  9 ---------
 .../swanctl/net2net-route/hosts/moon/etc/strongswan.conf      |  9 ---------
 .../tests/swanctl/net2net-route/hosts/sun/etc/strongswan.conf |  9 ---------
 .../net2net-sha3-rsa-cert/hosts/moon/etc/strongswan.conf      |  9 ---------
 .../net2net-sha3-rsa-cert/hosts/sun/etc/strongswan.conf       |  9 ---------
 .../swanctl/net2net-start/hosts/moon/etc/strongswan.conf      |  9 ---------
 .../tests/swanctl/net2net-start/hosts/sun/etc/strongswan.conf |  9 ---------
 .../swanctl/ocsp-disabled/hosts/carol/etc/strongswan.conf     |  8 --------
 .../swanctl/ocsp-disabled/hosts/moon/etc/strongswan.conf      |  8 --------
 .../swanctl/ocsp-multi-level/hosts/carol/etc/strongswan.conf  |  9 ---------
 .../swanctl/ocsp-multi-level/hosts/dave/etc/strongswan.conf   |  9 ---------
 .../swanctl/ocsp-multi-level/hosts/moon/etc/strongswan.conf   |  9 ---------
 .../swanctl/ocsp-signer-cert/hosts/carol/etc/strongswan.conf  |  9 ---------
 .../swanctl/ocsp-signer-cert/hosts/moon/etc/strongswan.conf   |  9 ---------
 .../swanctl/protoport-dual/hosts/carol/etc/strongswan.conf    |  9 ---------
 .../swanctl/protoport-dual/hosts/moon/etc/strongswan.conf     |  9 ---------
 .../swanctl/protoport-range/hosts/carol/etc/strongswan.conf   |  9 ---------
 .../swanctl/protoport-range/hosts/moon/etc/strongswan.conf    |  9 ---------
 testing/tests/swanctl/rw-cert/hosts/carol/etc/strongswan.conf |  9 ---------
 testing/tests/swanctl/rw-cert/hosts/dave/etc/strongswan.conf  |  9 ---------
 testing/tests/swanctl/rw-cert/hosts/moon/etc/strongswan.conf  |  9 ---------
 .../tests/swanctl/rw-dnssec/hosts/carol/etc/strongswan.conf   |  8 --------
 .../tests/swanctl/rw-dnssec/hosts/dave/etc/strongswan.conf    |  8 --------
 .../tests/swanctl/rw-dnssec/hosts/moon/etc/strongswan.conf    |  8 --------
 .../rw-eap-aka-sql-rsa/hosts/carol/etc/strongswan.conf        |  8 --------
 .../swanctl/rw-eap-aka-sql-rsa/hosts/moon/etc/strongswan.conf |  8 --------
 .../swanctl/rw-eap-md5-id-rsa/hosts/carol/etc/strongswan.conf |  9 ---------
 .../swanctl/rw-eap-md5-id-rsa/hosts/moon/etc/strongswan.conf  |  9 ---------
 .../rw-eap-tls-sha3-rsa/hosts/carol/etc/strongswan.conf       |  9 ---------
 .../rw-eap-tls-sha3-rsa/hosts/dave/etc/strongswan.conf        |  9 ---------
 .../rw-eap-tls-sha3-rsa/hosts/moon/etc/strongswan.conf        |  9 ---------
 .../swanctl/rw-hash-and-url/hosts/carol/etc/strongswan.conf   |  8 --------
 .../swanctl/rw-hash-and-url/hosts/dave/etc/strongswan.conf    |  8 --------
 .../swanctl/rw-hash-and-url/hosts/moon/etc/strongswan.conf    |  8 --------
 .../rw-multi-ciphers-ikev1/hosts/carol/etc/strongswan.conf    | 10 ----------
 .../rw-multi-ciphers-ikev1/hosts/dave/etc/strongswan.conf     | 10 ----------
 .../rw-multi-ciphers-ikev1/hosts/moon/etc/strongswan.conf     | 10 ----------
 .../swanctl/rw-newhope-bliss/hosts/carol/etc/strongswan.conf  |  9 ---------
 .../swanctl/rw-newhope-bliss/hosts/dave/etc/strongswan.conf   |  9 ---------
 .../swanctl/rw-newhope-bliss/hosts/moon/etc/strongswan.conf   |  9 ---------
 .../swanctl/rw-ntru-bliss/hosts/carol/etc/strongswan.conf     |  9 ---------
 .../swanctl/rw-ntru-bliss/hosts/dave/etc/strongswan.conf      |  9 ---------
 .../swanctl/rw-ntru-bliss/hosts/moon/etc/strongswan.conf      |  9 ---------
 .../tests/swanctl/rw-psk-fqdn/hosts/carol/etc/strongswan.conf |  9 ---------
 .../tests/swanctl/rw-psk-fqdn/hosts/dave/etc/strongswan.conf  |  9 ---------
 .../tests/swanctl/rw-psk-fqdn/hosts/moon/etc/strongswan.conf  |  9 ---------
 .../swanctl/rw-psk-ikev1/hosts/carol/etc/strongswan.conf      | 10 ----------
 .../tests/swanctl/rw-psk-ikev1/hosts/dave/etc/strongswan.conf | 10 ----------
 .../tests/swanctl/rw-psk-ikev1/hosts/moon/etc/strongswan.conf | 10 ----------
 .../tests/swanctl/rw-psk-ipv4/hosts/carol/etc/strongswan.conf |  9 ---------
 .../tests/swanctl/rw-psk-ipv4/hosts/dave/etc/strongswan.conf  |  9 ---------
 .../tests/swanctl/rw-psk-ipv4/hosts/moon/etc/strongswan.conf  |  9 ---------
 .../swanctl/rw-pubkey-anon/hosts/carol/etc/strongswan.conf    |  9 ---------
 .../swanctl/rw-pubkey-anon/hosts/dave/etc/strongswan.conf     |  9 ---------
 .../swanctl/rw-pubkey-anon/hosts/moon/etc/strongswan.conf     |  9 ---------
 .../swanctl/rw-pubkey-keyid/hosts/carol/etc/strongswan.conf   |  9 ---------
 .../swanctl/rw-pubkey-keyid/hosts/dave/etc/strongswan.conf    |  9 ---------
 .../swanctl/rw-pubkey-keyid/hosts/moon/etc/strongswan.conf    |  9 ---------
 .../shunt-policies-nat-rw/hosts/alice/etc/strongswan.conf     |  8 --------
 .../shunt-policies-nat-rw/hosts/sun/etc/strongswan.conf       |  9 ---------
 .../shunt-policies-nat-rw/hosts/venus/etc/strongswan.conf     |  8 --------
 .../tests/swanctl/xauth-rsa/hosts/carol/etc/strongswan.conf   |  9 ---------
 .../tests/swanctl/xauth-rsa/hosts/dave/etc/strongswan.conf    |  9 ---------
 .../tests/swanctl/xauth-rsa/hosts/moon/etc/strongswan.conf    |  9 ---------
 .../tests/tnc/tnccs-11-fhh/hosts/carol/etc/strongswan.conf    |  3 ---
 testing/tests/tnc/tnccs-11-fhh/hosts/dave/etc/strongswan.conf |  3 ---
 testing/tests/tnc/tnccs-11-fhh/hosts/moon/etc/strongswan.conf |  3 ---
 .../tnc/tnccs-11-radius-block/hosts/carol/etc/strongswan.conf |  3 ---
 .../tnc/tnccs-11-radius-block/hosts/dave/etc/strongswan.conf  |  3 ---
 .../tnc/tnccs-11-radius-block/hosts/moon/etc/strongswan.conf  |  8 --------
 .../tnc/tnccs-11-radius-pts/hosts/carol/etc/strongswan.conf   |  3 ---
 .../tnc/tnccs-11-radius-pts/hosts/dave/etc/strongswan.conf    |  3 ---
 .../tnc/tnccs-11-radius-pts/hosts/moon/etc/strongswan.conf    |  8 --------
 .../tests/tnc/tnccs-11-radius/hosts/carol/etc/strongswan.conf |  3 ---
 .../tests/tnc/tnccs-11-radius/hosts/dave/etc/strongswan.conf  |  3 ---
 .../tests/tnc/tnccs-11-radius/hosts/moon/etc/strongswan.conf  |  8 --------
 testing/tests/tnc/tnccs-11/hosts/carol/etc/strongswan.conf    |  3 ---
 testing/tests/tnc/tnccs-11/hosts/dave/etc/strongswan.conf     |  3 ---
 testing/tests/tnc/tnccs-11/hosts/moon/etc/strongswan.conf     |  3 ---
 .../tests/tnc/tnccs-20-block/hosts/carol/etc/strongswan.conf  |  3 ---
 .../tests/tnc/tnccs-20-block/hosts/dave/etc/strongswan.conf   |  3 ---
 .../tests/tnc/tnccs-20-block/hosts/moon/etc/strongswan.conf   |  3 ---
 .../tnc/tnccs-20-client-retry/hosts/carol/etc/strongswan.conf |  3 ---
 .../tnc/tnccs-20-client-retry/hosts/dave/etc/strongswan.conf  |  3 ---
 .../tnc/tnccs-20-client-retry/hosts/moon/etc/strongswan.conf  |  3 ---
 .../tnc/tnccs-20-ev-pt-tls/hosts/alice/etc/strongswan.conf    |  7 ++-----
 .../tnc/tnccs-20-fail-init/hosts/carol/etc/strongswan.conf    |  3 ---
 .../tnc/tnccs-20-fail-init/hosts/dave/etc/strongswan.conf     |  3 ---
 .../tnc/tnccs-20-fail-init/hosts/moon/etc/strongswan.conf     |  3 ---
 .../tnc/tnccs-20-fail-resp/hosts/carol/etc/strongswan.conf    |  3 ---
 .../tnc/tnccs-20-fail-resp/hosts/moon/etc/strongswan.conf     |  3 ---
 .../tests/tnc/tnccs-20-fhh/hosts/carol/etc/strongswan.conf    |  3 ---
 testing/tests/tnc/tnccs-20-fhh/hosts/dave/etc/strongswan.conf |  3 ---
 testing/tests/tnc/tnccs-20-fhh/hosts/moon/etc/strongswan.conf |  3 ---
 .../tnc/tnccs-20-hcd-eap/hosts/alice/etc/strongswan.conf      |  3 ---
 .../tnc/tnccs-20-hcd-eap/hosts/carol/etc/strongswan.conf      |  3 ---
 .../tests/tnc/tnccs-20-hcd-eap/hosts/dave/etc/strongswan.conf |  3 ---
 .../tests/tnc/tnccs-20-hcd-eap/hosts/moon/etc/strongswan.conf |  8 --------
 .../tnccs-20-mutual-eap-fail/hosts/moon/etc/strongswan.conf   |  3 ---
 .../tnccs-20-mutual-eap-fail/hosts/sun/etc/strongswan.conf    |  3 ---
 .../tnc/tnccs-20-mutual-eap/hosts/moon/etc/strongswan.conf    |  3 ---
 .../tnc/tnccs-20-mutual-eap/hosts/sun/etc/strongswan.conf     |  3 ---
 .../tnc/tnccs-20-mutual-pt-tls/hosts/sun/etc/strongswan.conf  |  3 ---
 .../tnc/tnccs-20-nea-pt-tls/hosts/alice/etc/strongswan.conf   |  7 ++-----
 .../tests/tnc/tnccs-20-os-pts/hosts/carol/etc/strongswan.conf |  3 ---
 .../tests/tnc/tnccs-20-os-pts/hosts/dave/etc/strongswan.conf  |  3 ---
 .../tests/tnc/tnccs-20-os-pts/hosts/moon/etc/strongswan.conf  |  3 ---
 testing/tests/tnc/tnccs-20-os/hosts/carol/etc/strongswan.conf |  3 ---
 testing/tests/tnc/tnccs-20-os/hosts/dave/etc/strongswan.conf  |  3 ---
 testing/tests/tnc/tnccs-20-os/hosts/moon/etc/strongswan.conf  |  3 ---
 .../tnc/tnccs-20-pdp-eap/hosts/alice/etc/strongswan.conf      |  3 ---
 .../tnc/tnccs-20-pdp-eap/hosts/carol/etc/strongswan.conf      |  3 ---
 .../tests/tnc/tnccs-20-pdp-eap/hosts/dave/etc/strongswan.conf |  3 ---
 .../tests/tnc/tnccs-20-pdp-eap/hosts/moon/etc/strongswan.conf |  8 --------
 .../tnc/tnccs-20-pdp-pt-tls/hosts/alice/etc/strongswan.conf   |  7 ++-----
 .../tnc/tnccs-20-pts-no-ecc/hosts/carol/etc/strongswan.conf   |  3 ---
 .../tnc/tnccs-20-pts-no-ecc/hosts/dave/etc/strongswan.conf    |  3 ---
 .../tnc/tnccs-20-pts-no-ecc/hosts/moon/etc/strongswan.conf    |  3 ---
 .../tests/tnc/tnccs-20-pts/hosts/carol/etc/strongswan.conf    |  3 ---
 testing/tests/tnc/tnccs-20-pts/hosts/dave/etc/strongswan.conf |  3 ---
 testing/tests/tnc/tnccs-20-pts/hosts/moon/etc/strongswan.conf |  3 ---
 .../tnc/tnccs-20-server-retry/hosts/carol/etc/strongswan.conf |  3 ---
 .../tnc/tnccs-20-server-retry/hosts/dave/etc/strongswan.conf  |  3 ---
 .../tnc/tnccs-20-server-retry/hosts/moon/etc/strongswan.conf  |  3 ---
 .../tests/tnc/tnccs-20-tls/hosts/carol/etc/strongswan.conf    |  3 ---
 testing/tests/tnc/tnccs-20-tls/hosts/dave/etc/strongswan.conf |  3 ---
 testing/tests/tnc/tnccs-20-tls/hosts/moon/etc/strongswan.conf |  3 ---
 testing/tests/tnc/tnccs-20/hosts/carol/etc/strongswan.conf    |  3 ---
 testing/tests/tnc/tnccs-20/hosts/dave/etc/strongswan.conf     |  3 ---
 testing/tests/tnc/tnccs-20/hosts/moon/etc/strongswan.conf     |  3 ---
 .../tests/tnc/tnccs-dynamic/hosts/carol/etc/strongswan.conf   |  3 ---
 .../tests/tnc/tnccs-dynamic/hosts/dave/etc/strongswan.conf    |  3 ---
 .../tests/tnc/tnccs-dynamic/hosts/moon/etc/strongswan.conf    |  3 ---
 291 files changed, 43 insertions(+), 2196 deletions(-)

diff --git a/testing/hosts/default/etc/strongswan.conf.testing b/testing/hosts/default/etc/strongswan.conf.testing
index b62355097..976f9a7b8 100644
--- a/testing/hosts/default/etc/strongswan.conf.testing
+++ b/testing/hosts/default/etc/strongswan.conf.testing
@@ -8,5 +8,14 @@ charon {
     }
   }
 }
+charon-systemd {
+  syslog {
+    daemon {
+    }
+    auth {
+      default = 0
+    }
+  }
+}
 
 include strongswan.conf
diff --git a/testing/tests/af-alg/alg-camellia/hosts/carol/etc/strongswan.conf b/testing/tests/af-alg/alg-camellia/hosts/carol/etc/strongswan.conf
index 5d05001e6..e475be3ca 100644
--- a/testing/tests/af-alg/alg-camellia/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/af-alg/alg-camellia/hosts/carol/etc/strongswan.conf
@@ -1,18 +1,9 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random 
+  load = pem pkcs1 x509 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
   load = random nonce pem pkcs1 af-alg gmp x509 revocation kernel-netlink curl socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/af-alg/alg-camellia/hosts/moon/etc/strongswan.conf b/testing/tests/af-alg/alg-camellia/hosts/moon/etc/strongswan.conf
index 5d05001e6..e475be3ca 100644
--- a/testing/tests/af-alg/alg-camellia/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/af-alg/alg-camellia/hosts/moon/etc/strongswan.conf
@@ -1,18 +1,9 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random 
+  load = pem pkcs1 x509 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
   load = random nonce pem pkcs1 af-alg gmp x509 revocation kernel-netlink curl socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/af-alg/rw-cert/hosts/carol/etc/strongswan.conf b/testing/tests/af-alg/rw-cert/hosts/carol/etc/strongswan.conf
index ba2f2aade..456c70df2 100644
--- a/testing/tests/af-alg/rw-cert/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/af-alg/rw-cert/hosts/carol/etc/strongswan.conf
@@ -1,20 +1,11 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random 
+  load = pem pkcs1 x509 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
   load = random nonce test-vectors pem pkcs1 af-alg gmp x509 revocation curl ctr ccm gcm kernel-netlink socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   integrity_test = yes
   crypto_test {
     on_add = yes
diff --git a/testing/tests/af-alg/rw-cert/hosts/dave/etc/strongswan.conf b/testing/tests/af-alg/rw-cert/hosts/dave/etc/strongswan.conf
index a2a660994..b6be829f4 100644
--- a/testing/tests/af-alg/rw-cert/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/af-alg/rw-cert/hosts/dave/etc/strongswan.conf
@@ -1,20 +1,11 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random 
+  load = pem pkcs1 x509 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
   load = random nonce test-vectors aes des sha1 sha2 md5 pem pkcs1 gmp x509 revocation curl hmac xcbc ctr ccm gcm kernel-netlink socket-default updown vici
-
-   syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   integrity_test = yes
   crypto_test {
     on_add = yes
diff --git a/testing/tests/af-alg/rw-cert/hosts/moon/etc/strongswan.conf b/testing/tests/af-alg/rw-cert/hosts/moon/etc/strongswan.conf
index ba2f2aade..456c70df2 100644
--- a/testing/tests/af-alg/rw-cert/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/af-alg/rw-cert/hosts/moon/etc/strongswan.conf
@@ -1,20 +1,11 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random 
+  load = pem pkcs1 x509 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
   load = random nonce test-vectors pem pkcs1 af-alg gmp x509 revocation curl ctr ccm gcm kernel-netlink socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   integrity_test = yes
   crypto_test {
     on_add = yes
diff --git a/testing/tests/gcrypt-ikev1/alg-serpent/hosts/carol/etc/strongswan.conf b/testing/tests/gcrypt-ikev1/alg-serpent/hosts/carol/etc/strongswan.conf
index b5ca668ac..b57ffec12 100644
--- a/testing/tests/gcrypt-ikev1/alg-serpent/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/gcrypt-ikev1/alg-serpent/hosts/carol/etc/strongswan.conf
@@ -6,14 +6,5 @@ swanctl {
 
 charon-systemd {
   load = nonce pem pkcs1 gcrypt hmac x509 revocation curl vici kernel-netlink socket-default
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   send_vendor_id = yes
 }
diff --git a/testing/tests/gcrypt-ikev1/alg-serpent/hosts/moon/etc/strongswan.conf b/testing/tests/gcrypt-ikev1/alg-serpent/hosts/moon/etc/strongswan.conf
index 41e98d7d7..22371e465 100644
--- a/testing/tests/gcrypt-ikev1/alg-serpent/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/gcrypt-ikev1/alg-serpent/hosts/moon/etc/strongswan.conf
@@ -6,14 +6,5 @@ swanctl {
 
 charon-systemd {
   load = nonce pem pkcs1 gcrypt hmac x509 revocation vici kernel-netlink socket-default
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   send_vendor_id = yes
 }
diff --git a/testing/tests/gcrypt-ikev1/alg-twofish/hosts/carol/etc/strongswan.conf b/testing/tests/gcrypt-ikev1/alg-twofish/hosts/carol/etc/strongswan.conf
index b5ca668ac..b57ffec12 100644
--- a/testing/tests/gcrypt-ikev1/alg-twofish/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/gcrypt-ikev1/alg-twofish/hosts/carol/etc/strongswan.conf
@@ -6,14 +6,5 @@ swanctl {
 
 charon-systemd {
   load = nonce pem pkcs1 gcrypt hmac x509 revocation curl vici kernel-netlink socket-default
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   send_vendor_id = yes
 }
diff --git a/testing/tests/gcrypt-ikev1/alg-twofish/hosts/moon/etc/strongswan.conf b/testing/tests/gcrypt-ikev1/alg-twofish/hosts/moon/etc/strongswan.conf
index 41e98d7d7..22371e465 100644
--- a/testing/tests/gcrypt-ikev1/alg-twofish/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/gcrypt-ikev1/alg-twofish/hosts/moon/etc/strongswan.conf
@@ -6,14 +6,5 @@ swanctl {
 
 charon-systemd {
   load = nonce pem pkcs1 gcrypt hmac x509 revocation vici kernel-netlink socket-default
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   send_vendor_id = yes
 }
diff --git a/testing/tests/gcrypt-ikev2/alg-camellia/hosts/carol/etc/strongswan.conf b/testing/tests/gcrypt-ikev2/alg-camellia/hosts/carol/etc/strongswan.conf
index dcc744541..e1d5a10dc 100644
--- a/testing/tests/gcrypt-ikev2/alg-camellia/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/gcrypt-ikev2/alg-camellia/hosts/carol/etc/strongswan.conf
@@ -1,18 +1,9 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random 
+  load = pem pkcs1 x509 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
   load = random nonce pem pkcs1 gcrypt hmac x509 revocation kernel-netlink curl socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/gcrypt-ikev2/alg-camellia/hosts/moon/etc/strongswan.conf b/testing/tests/gcrypt-ikev2/alg-camellia/hosts/moon/etc/strongswan.conf
index dcc744541..e1d5a10dc 100644
--- a/testing/tests/gcrypt-ikev2/alg-camellia/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/gcrypt-ikev2/alg-camellia/hosts/moon/etc/strongswan.conf
@@ -1,18 +1,9 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random 
+  load = pem pkcs1 x509 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
   load = random nonce pem pkcs1 gcrypt hmac x509 revocation kernel-netlink curl socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/gcrypt-ikev2/rw-cert/hosts/carol/etc/strongswan.conf b/testing/tests/gcrypt-ikev2/rw-cert/hosts/carol/etc/strongswan.conf
index 21e3c417a..c637e97ec 100644
--- a/testing/tests/gcrypt-ikev2/rw-cert/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/gcrypt-ikev2/rw-cert/hosts/carol/etc/strongswan.conf
@@ -1,20 +1,11 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random 
+  load = pem pkcs1 x509 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
   load = curl test-vectors pem pkcs1 gcrypt nonce x509 revocation hmac xcbc ctr ccm gcm vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   integrity_test = yes
   crypto_test {
     on_add = yes
diff --git a/testing/tests/gcrypt-ikev2/rw-cert/hosts/dave/etc/strongswan.conf b/testing/tests/gcrypt-ikev2/rw-cert/hosts/dave/etc/strongswan.conf
index fb195ff3c..4f6bec1b4 100644
--- a/testing/tests/gcrypt-ikev2/rw-cert/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/gcrypt-ikev2/rw-cert/hosts/dave/etc/strongswan.conf
@@ -1,20 +1,11 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random 
+  load = pem pkcs1 x509 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
   load = test-vectors aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 curl revocation hmac xcbc ctr ccm vici stroke kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   integrity_test = yes
   crypto_test {
     required = yes
diff --git a/testing/tests/gcrypt-ikev2/rw-cert/hosts/moon/etc/strongswan.conf b/testing/tests/gcrypt-ikev2/rw-cert/hosts/moon/etc/strongswan.conf
index 21e3c417a..c637e97ec 100644
--- a/testing/tests/gcrypt-ikev2/rw-cert/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/gcrypt-ikev2/rw-cert/hosts/moon/etc/strongswan.conf
@@ -1,20 +1,11 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random 
+  load = pem pkcs1 x509 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
   load = curl test-vectors pem pkcs1 gcrypt nonce x509 revocation hmac xcbc ctr ccm gcm vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   integrity_test = yes
   crypto_test {
     on_add = yes
diff --git a/testing/tests/ipv6/host2host-ikev1/hosts/moon/etc/strongswan.conf b/testing/tests/ipv6/host2host-ikev1/hosts/moon/etc/strongswan.conf
index c45d26b80..15f8ad5bc 100644
--- a/testing/tests/ipv6/host2host-ikev1/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/ipv6/host2host-ikev1/hosts/moon/etc/strongswan.conf
@@ -1,18 +1,9 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random 
+  load = pem pkcs1 x509 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/ipv6/host2host-ikev1/hosts/sun/etc/strongswan.conf b/testing/tests/ipv6/host2host-ikev1/hosts/sun/etc/strongswan.conf
index c45d26b80..15f8ad5bc 100644
--- a/testing/tests/ipv6/host2host-ikev1/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/ipv6/host2host-ikev1/hosts/sun/etc/strongswan.conf
@@ -1,18 +1,9 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random 
+  load = pem pkcs1 x509 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/ipv6/host2host-ikev2/hosts/moon/etc/strongswan.conf b/testing/tests/ipv6/host2host-ikev2/hosts/moon/etc/strongswan.conf
index c45d26b80..15f8ad5bc 100644
--- a/testing/tests/ipv6/host2host-ikev2/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/ipv6/host2host-ikev2/hosts/moon/etc/strongswan.conf
@@ -1,18 +1,9 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random 
+  load = pem pkcs1 x509 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/ipv6/host2host-ikev2/hosts/sun/etc/strongswan.conf b/testing/tests/ipv6/host2host-ikev2/hosts/sun/etc/strongswan.conf
index c45d26b80..15f8ad5bc 100644
--- a/testing/tests/ipv6/host2host-ikev2/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/ipv6/host2host-ikev2/hosts/sun/etc/strongswan.conf
@@ -1,18 +1,9 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random 
+  load = pem pkcs1 x509 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/ipv6/net2net-ikev1/hosts/moon/etc/strongswan.conf b/testing/tests/ipv6/net2net-ikev1/hosts/moon/etc/strongswan.conf
index f84cc0ede..93dbda2d6 100644
--- a/testing/tests/ipv6/net2net-ikev1/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/ipv6/net2net-ikev1/hosts/moon/etc/strongswan.conf
@@ -6,14 +6,5 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   fragment_size = 1400
 }
diff --git a/testing/tests/ipv6/net2net-ikev1/hosts/sun/etc/strongswan.conf b/testing/tests/ipv6/net2net-ikev1/hosts/sun/etc/strongswan.conf
index f84cc0ede..93dbda2d6 100644
--- a/testing/tests/ipv6/net2net-ikev1/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/ipv6/net2net-ikev1/hosts/sun/etc/strongswan.conf
@@ -6,14 +6,5 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   fragment_size = 1400
 }
diff --git a/testing/tests/ipv6/net2net-ikev2/hosts/moon/etc/strongswan.conf b/testing/tests/ipv6/net2net-ikev2/hosts/moon/etc/strongswan.conf
index f84cc0ede..93dbda2d6 100644
--- a/testing/tests/ipv6/net2net-ikev2/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/ipv6/net2net-ikev2/hosts/moon/etc/strongswan.conf
@@ -6,14 +6,5 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   fragment_size = 1400
 }
diff --git a/testing/tests/ipv6/net2net-ikev2/hosts/sun/etc/strongswan.conf b/testing/tests/ipv6/net2net-ikev2/hosts/sun/etc/strongswan.conf
index f84cc0ede..93dbda2d6 100644
--- a/testing/tests/ipv6/net2net-ikev2/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/ipv6/net2net-ikev2/hosts/sun/etc/strongswan.conf
@@ -6,14 +6,5 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   fragment_size = 1400
 }
diff --git a/testing/tests/ipv6/net2net-ip4-in-ip6-ikev1/hosts/moon/etc/strongswan.conf b/testing/tests/ipv6/net2net-ip4-in-ip6-ikev1/hosts/moon/etc/strongswan.conf
index f84cc0ede..93dbda2d6 100644
--- a/testing/tests/ipv6/net2net-ip4-in-ip6-ikev1/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/ipv6/net2net-ip4-in-ip6-ikev1/hosts/moon/etc/strongswan.conf
@@ -6,14 +6,5 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   fragment_size = 1400
 }
diff --git a/testing/tests/ipv6/net2net-ip4-in-ip6-ikev1/hosts/sun/etc/strongswan.conf b/testing/tests/ipv6/net2net-ip4-in-ip6-ikev1/hosts/sun/etc/strongswan.conf
index f84cc0ede..93dbda2d6 100644
--- a/testing/tests/ipv6/net2net-ip4-in-ip6-ikev1/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/ipv6/net2net-ip4-in-ip6-ikev1/hosts/sun/etc/strongswan.conf
@@ -6,14 +6,5 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   fragment_size = 1400
 }
diff --git a/testing/tests/ipv6/net2net-ip4-in-ip6-ikev2/hosts/moon/etc/strongswan.conf b/testing/tests/ipv6/net2net-ip4-in-ip6-ikev2/hosts/moon/etc/strongswan.conf
index f84cc0ede..93dbda2d6 100644
--- a/testing/tests/ipv6/net2net-ip4-in-ip6-ikev2/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/ipv6/net2net-ip4-in-ip6-ikev2/hosts/moon/etc/strongswan.conf
@@ -6,14 +6,5 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   fragment_size = 1400
 }
diff --git a/testing/tests/ipv6/net2net-ip4-in-ip6-ikev2/hosts/sun/etc/strongswan.conf b/testing/tests/ipv6/net2net-ip4-in-ip6-ikev2/hosts/sun/etc/strongswan.conf
index f84cc0ede..93dbda2d6 100644
--- a/testing/tests/ipv6/net2net-ip4-in-ip6-ikev2/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/ipv6/net2net-ip4-in-ip6-ikev2/hosts/sun/etc/strongswan.conf
@@ -6,14 +6,5 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   fragment_size = 1400
 }
diff --git a/testing/tests/ipv6/net2net-ip6-in-ip4-ikev1/hosts/moon/etc/strongswan.conf b/testing/tests/ipv6/net2net-ip6-in-ip4-ikev1/hosts/moon/etc/strongswan.conf
index c9c4aad2a..89e0dfced 100644
--- a/testing/tests/ipv6/net2net-ip6-in-ip4-ikev1/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/ipv6/net2net-ip6-in-ip4-ikev1/hosts/moon/etc/strongswan.conf
@@ -6,16 +6,6 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
-
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   fragment_size = 1400
   install_routes = no
 }
diff --git a/testing/tests/ipv6/net2net-ip6-in-ip4-ikev1/hosts/sun/etc/strongswan.conf b/testing/tests/ipv6/net2net-ip6-in-ip4-ikev1/hosts/sun/etc/strongswan.conf
index c9c4aad2a..89e0dfced 100644
--- a/testing/tests/ipv6/net2net-ip6-in-ip4-ikev1/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/ipv6/net2net-ip6-in-ip4-ikev1/hosts/sun/etc/strongswan.conf
@@ -6,16 +6,6 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
-
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   fragment_size = 1400
   install_routes = no
 }
diff --git a/testing/tests/ipv6/net2net-ip6-in-ip4-ikev2/hosts/moon/etc/strongswan.conf b/testing/tests/ipv6/net2net-ip6-in-ip4-ikev2/hosts/moon/etc/strongswan.conf
index c9c4aad2a..89e0dfced 100644
--- a/testing/tests/ipv6/net2net-ip6-in-ip4-ikev2/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/ipv6/net2net-ip6-in-ip4-ikev2/hosts/moon/etc/strongswan.conf
@@ -6,16 +6,6 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
-
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   fragment_size = 1400
   install_routes = no
 }
diff --git a/testing/tests/ipv6/net2net-ip6-in-ip4-ikev2/hosts/sun/etc/strongswan.conf b/testing/tests/ipv6/net2net-ip6-in-ip4-ikev2/hosts/sun/etc/strongswan.conf
index c9c4aad2a..89e0dfced 100644
--- a/testing/tests/ipv6/net2net-ip6-in-ip4-ikev2/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/ipv6/net2net-ip6-in-ip4-ikev2/hosts/sun/etc/strongswan.conf
@@ -6,16 +6,6 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
-
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   fragment_size = 1400
   install_routes = no
 }
diff --git a/testing/tests/ipv6/net2net-rfc3779-ikev2/hosts/moon/etc/strongswan.conf b/testing/tests/ipv6/net2net-rfc3779-ikev2/hosts/moon/etc/strongswan.conf
index 51aea1d4d..285350d7b 100644
--- a/testing/tests/ipv6/net2net-rfc3779-ikev2/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/ipv6/net2net-rfc3779-ikev2/hosts/moon/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation addrblock hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/ipv6/net2net-rfc3779-ikev2/hosts/sun/etc/strongswan.conf b/testing/tests/ipv6/net2net-rfc3779-ikev2/hosts/sun/etc/strongswan.conf
index 3e13c26f1..285350d7b 100644
--- a/testing/tests/ipv6/net2net-rfc3779-ikev2/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/ipv6/net2net-rfc3779-ikev2/hosts/sun/etc/strongswan.conf
@@ -6,14 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation addrblock hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
-
 }
diff --git a/testing/tests/ipv6/rw-compress-ikev2/hosts/carol/etc/strongswan.conf b/testing/tests/ipv6/rw-compress-ikev2/hosts/carol/etc/strongswan.conf
index 547ef0b78..15f8ad5bc 100644
--- a/testing/tests/ipv6/rw-compress-ikev2/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/ipv6/rw-compress-ikev2/hosts/carol/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/ipv6/rw-compress-ikev2/hosts/moon/etc/strongswan.conf b/testing/tests/ipv6/rw-compress-ikev2/hosts/moon/etc/strongswan.conf
index 547ef0b78..15f8ad5bc 100644
--- a/testing/tests/ipv6/rw-compress-ikev2/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/ipv6/rw-compress-ikev2/hosts/moon/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/ipv6/rw-ikev1/hosts/carol/etc/strongswan.conf b/testing/tests/ipv6/rw-ikev1/hosts/carol/etc/strongswan.conf
index 547ef0b78..15f8ad5bc 100644
--- a/testing/tests/ipv6/rw-ikev1/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/ipv6/rw-ikev1/hosts/carol/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/ipv6/rw-ikev1/hosts/dave/etc/strongswan.conf b/testing/tests/ipv6/rw-ikev1/hosts/dave/etc/strongswan.conf
index 547ef0b78..15f8ad5bc 100644
--- a/testing/tests/ipv6/rw-ikev1/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/ipv6/rw-ikev1/hosts/dave/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/ipv6/rw-ikev1/hosts/moon/etc/strongswan.conf b/testing/tests/ipv6/rw-ikev1/hosts/moon/etc/strongswan.conf
index 547ef0b78..15f8ad5bc 100644
--- a/testing/tests/ipv6/rw-ikev1/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/ipv6/rw-ikev1/hosts/moon/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/ipv6/rw-ikev2/hosts/carol/etc/strongswan.conf b/testing/tests/ipv6/rw-ikev2/hosts/carol/etc/strongswan.conf
index 547ef0b78..15f8ad5bc 100644
--- a/testing/tests/ipv6/rw-ikev2/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/ipv6/rw-ikev2/hosts/carol/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/ipv6/rw-ikev2/hosts/dave/etc/strongswan.conf b/testing/tests/ipv6/rw-ikev2/hosts/dave/etc/strongswan.conf
index 547ef0b78..15f8ad5bc 100644
--- a/testing/tests/ipv6/rw-ikev2/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/ipv6/rw-ikev2/hosts/dave/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/ipv6/rw-ikev2/hosts/moon/etc/strongswan.conf b/testing/tests/ipv6/rw-ikev2/hosts/moon/etc/strongswan.conf
index 547ef0b78..15f8ad5bc 100644
--- a/testing/tests/ipv6/rw-ikev2/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/ipv6/rw-ikev2/hosts/moon/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/ipv6/rw-ip6-in-ip4-ikev1/hosts/carol/etc/strongswan.conf b/testing/tests/ipv6/rw-ip6-in-ip4-ikev1/hosts/carol/etc/strongswan.conf
index 547ef0b78..15f8ad5bc 100644
--- a/testing/tests/ipv6/rw-ip6-in-ip4-ikev1/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/ipv6/rw-ip6-in-ip4-ikev1/hosts/carol/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/ipv6/rw-ip6-in-ip4-ikev1/hosts/dave/etc/strongswan.conf b/testing/tests/ipv6/rw-ip6-in-ip4-ikev1/hosts/dave/etc/strongswan.conf
index 547ef0b78..15f8ad5bc 100644
--- a/testing/tests/ipv6/rw-ip6-in-ip4-ikev1/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/ipv6/rw-ip6-in-ip4-ikev1/hosts/dave/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/ipv6/rw-ip6-in-ip4-ikev1/hosts/moon/etc/strongswan.conf b/testing/tests/ipv6/rw-ip6-in-ip4-ikev1/hosts/moon/etc/strongswan.conf
index 547ef0b78..15f8ad5bc 100644
--- a/testing/tests/ipv6/rw-ip6-in-ip4-ikev1/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/ipv6/rw-ip6-in-ip4-ikev1/hosts/moon/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/ipv6/rw-ip6-in-ip4-ikev2/hosts/carol/etc/strongswan.conf b/testing/tests/ipv6/rw-ip6-in-ip4-ikev2/hosts/carol/etc/strongswan.conf
index 547ef0b78..15f8ad5bc 100644
--- a/testing/tests/ipv6/rw-ip6-in-ip4-ikev2/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/ipv6/rw-ip6-in-ip4-ikev2/hosts/carol/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/ipv6/rw-ip6-in-ip4-ikev2/hosts/dave/etc/strongswan.conf b/testing/tests/ipv6/rw-ip6-in-ip4-ikev2/hosts/dave/etc/strongswan.conf
index 547ef0b78..15f8ad5bc 100644
--- a/testing/tests/ipv6/rw-ip6-in-ip4-ikev2/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/ipv6/rw-ip6-in-ip4-ikev2/hosts/dave/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/ipv6/rw-ip6-in-ip4-ikev2/hosts/moon/etc/strongswan.conf b/testing/tests/ipv6/rw-ip6-in-ip4-ikev2/hosts/moon/etc/strongswan.conf
index 547ef0b78..15f8ad5bc 100644
--- a/testing/tests/ipv6/rw-ip6-in-ip4-ikev2/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/ipv6/rw-ip6-in-ip4-ikev2/hosts/moon/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/ipv6/rw-psk-ikev1/hosts/carol/etc/strongswan.conf b/testing/tests/ipv6/rw-psk-ikev1/hosts/carol/etc/strongswan.conf
index 2b37f9f7f..306228a75 100644
--- a/testing/tests/ipv6/rw-psk-ikev1/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/ipv6/rw-psk-ikev1/hosts/carol/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 curve25519 hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/ipv6/rw-psk-ikev1/hosts/dave/etc/strongswan.conf b/testing/tests/ipv6/rw-psk-ikev1/hosts/dave/etc/strongswan.conf
index 2b37f9f7f..306228a75 100644
--- a/testing/tests/ipv6/rw-psk-ikev1/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/ipv6/rw-psk-ikev1/hosts/dave/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 curve25519 hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/ipv6/rw-psk-ikev1/hosts/moon/etc/strongswan.conf b/testing/tests/ipv6/rw-psk-ikev1/hosts/moon/etc/strongswan.conf
index 2b37f9f7f..306228a75 100644
--- a/testing/tests/ipv6/rw-psk-ikev1/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/ipv6/rw-psk-ikev1/hosts/moon/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 curve25519 hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/ipv6/rw-psk-ikev2/hosts/carol/etc/strongswan.conf b/testing/tests/ipv6/rw-psk-ikev2/hosts/carol/etc/strongswan.conf
index 2b37f9f7f..306228a75 100644
--- a/testing/tests/ipv6/rw-psk-ikev2/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/ipv6/rw-psk-ikev2/hosts/carol/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 curve25519 hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/ipv6/rw-psk-ikev2/hosts/dave/etc/strongswan.conf b/testing/tests/ipv6/rw-psk-ikev2/hosts/dave/etc/strongswan.conf
index 2b37f9f7f..306228a75 100644
--- a/testing/tests/ipv6/rw-psk-ikev2/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/ipv6/rw-psk-ikev2/hosts/dave/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 curve25519 hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/ipv6/rw-psk-ikev2/hosts/moon/etc/strongswan.conf b/testing/tests/ipv6/rw-psk-ikev2/hosts/moon/etc/strongswan.conf
index 2b37f9f7f..306228a75 100644
--- a/testing/tests/ipv6/rw-psk-ikev2/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/ipv6/rw-psk-ikev2/hosts/moon/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 curve25519 hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/ipv6/rw-rfc3779-ikev2/hosts/carol/etc/strongswan.conf b/testing/tests/ipv6/rw-rfc3779-ikev2/hosts/carol/etc/strongswan.conf
index 51aea1d4d..285350d7b 100644
--- a/testing/tests/ipv6/rw-rfc3779-ikev2/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/ipv6/rw-rfc3779-ikev2/hosts/carol/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation addrblock hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/ipv6/rw-rfc3779-ikev2/hosts/dave/etc/strongswan.conf b/testing/tests/ipv6/rw-rfc3779-ikev2/hosts/dave/etc/strongswan.conf
index 51aea1d4d..285350d7b 100644
--- a/testing/tests/ipv6/rw-rfc3779-ikev2/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/ipv6/rw-rfc3779-ikev2/hosts/dave/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation addrblock hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/ipv6/rw-rfc3779-ikev2/hosts/moon/etc/strongswan.conf b/testing/tests/ipv6/rw-rfc3779-ikev2/hosts/moon/etc/strongswan.conf
index 51aea1d4d..285350d7b 100644
--- a/testing/tests/ipv6/rw-rfc3779-ikev2/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/ipv6/rw-rfc3779-ikev2/hosts/moon/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation addrblock hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/ipv6/transport-ikev1/hosts/moon/etc/strongswan.conf b/testing/tests/ipv6/transport-ikev1/hosts/moon/etc/strongswan.conf
index c45d26b80..15f8ad5bc 100644
--- a/testing/tests/ipv6/transport-ikev1/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/ipv6/transport-ikev1/hosts/moon/etc/strongswan.conf
@@ -1,18 +1,9 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random 
+  load = pem pkcs1 x509 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/ipv6/transport-ikev1/hosts/sun/etc/strongswan.conf b/testing/tests/ipv6/transport-ikev1/hosts/sun/etc/strongswan.conf
index c45d26b80..15f8ad5bc 100644
--- a/testing/tests/ipv6/transport-ikev1/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/ipv6/transport-ikev1/hosts/sun/etc/strongswan.conf
@@ -1,18 +1,9 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random 
+  load = pem pkcs1 x509 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/ipv6/transport-ikev2/hosts/moon/etc/strongswan.conf b/testing/tests/ipv6/transport-ikev2/hosts/moon/etc/strongswan.conf
index c45d26b80..15f8ad5bc 100644
--- a/testing/tests/ipv6/transport-ikev2/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/ipv6/transport-ikev2/hosts/moon/etc/strongswan.conf
@@ -1,18 +1,9 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random 
+  load = pem pkcs1 x509 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/ipv6/transport-ikev2/hosts/sun/etc/strongswan.conf b/testing/tests/ipv6/transport-ikev2/hosts/sun/etc/strongswan.conf
index c45d26b80..15f8ad5bc 100644
--- a/testing/tests/ipv6/transport-ikev2/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/ipv6/transport-ikev2/hosts/sun/etc/strongswan.conf
@@ -1,18 +1,9 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random 
+  load = pem pkcs1 x509 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/libipsec/host2host-cert/hosts/moon/etc/strongswan.conf b/testing/tests/libipsec/host2host-cert/hosts/moon/etc/strongswan.conf
index 3a95adcab..7fac82eb7 100644
--- a/testing/tests/libipsec/host2host-cert/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/libipsec/host2host-cert/hosts/moon/etc/strongswan.conf
@@ -1,20 +1,12 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random 
+  load = pem pkcs1 x509 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-libipsec kernel-netlink socket-default updown
 
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   multiple_authentication = no
 
   plugins {
diff --git a/testing/tests/libipsec/host2host-cert/hosts/sun/etc/strongswan.conf b/testing/tests/libipsec/host2host-cert/hosts/sun/etc/strongswan.conf
index 3a95adcab..7fac82eb7 100644
--- a/testing/tests/libipsec/host2host-cert/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/libipsec/host2host-cert/hosts/sun/etc/strongswan.conf
@@ -1,20 +1,12 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random 
+  load = pem pkcs1 x509 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-libipsec kernel-netlink socket-default updown
 
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   multiple_authentication = no
 
   plugins {
diff --git a/testing/tests/libipsec/net2net-3des/hosts/moon/etc/strongswan.conf b/testing/tests/libipsec/net2net-3des/hosts/moon/etc/strongswan.conf
index 9cee7d91e..2d6b814dd 100644
--- a/testing/tests/libipsec/net2net-3des/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/libipsec/net2net-3des/hosts/moon/etc/strongswan.conf
@@ -1,19 +1,10 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random 
+  load = pem pkcs1 x509 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
   load = random nonce des sha1 sha2 pem pkcs1 gmp x509 curl revocation hmac vici kernel-libipsec kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   multiple_authentication = no
 }
diff --git a/testing/tests/libipsec/net2net-3des/hosts/sun/etc/strongswan.conf b/testing/tests/libipsec/net2net-3des/hosts/sun/etc/strongswan.conf
index 9cee7d91e..2d6b814dd 100644
--- a/testing/tests/libipsec/net2net-3des/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/libipsec/net2net-3des/hosts/sun/etc/strongswan.conf
@@ -1,19 +1,10 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random 
+  load = pem pkcs1 x509 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
   load = random nonce des sha1 sha2 pem pkcs1 gmp x509 curl revocation hmac vici kernel-libipsec kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   multiple_authentication = no
 }
diff --git a/testing/tests/libipsec/net2net-cert-ipv6/hosts/moon/etc/strongswan.conf b/testing/tests/libipsec/net2net-cert-ipv6/hosts/moon/etc/strongswan.conf
index 1fd0c60e7..6870d32fe 100644
--- a/testing/tests/libipsec/net2net-cert-ipv6/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/libipsec/net2net-cert-ipv6/hosts/moon/etc/strongswan.conf
@@ -1,19 +1,10 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random 
+  load = pem pkcs1 x509 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
   load = random nonce pem pkcs1 x509 openssl curl revocation vici kernel-libipsec kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   multiple_authentication = no
 }
diff --git a/testing/tests/libipsec/net2net-cert-ipv6/hosts/sun/etc/strongswan.conf b/testing/tests/libipsec/net2net-cert-ipv6/hosts/sun/etc/strongswan.conf
index 1fd0c60e7..6870d32fe 100644
--- a/testing/tests/libipsec/net2net-cert-ipv6/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/libipsec/net2net-cert-ipv6/hosts/sun/etc/strongswan.conf
@@ -1,19 +1,10 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random 
+  load = pem pkcs1 x509 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
   load = random nonce pem pkcs1 x509 openssl curl revocation vici kernel-libipsec kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   multiple_authentication = no
 }
diff --git a/testing/tests/libipsec/net2net-cert/hosts/moon/etc/strongswan.conf b/testing/tests/libipsec/net2net-cert/hosts/moon/etc/strongswan.conf
index 88fea0a0e..e6a98b407 100644
--- a/testing/tests/libipsec/net2net-cert/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/libipsec/net2net-cert/hosts/moon/etc/strongswan.conf
@@ -1,19 +1,10 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random 
+  load = pem pkcs1 x509 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
   load = random nonce aes sha1 sha2 gcm pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-libipsec kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   multiple_authentication = no
 }
diff --git a/testing/tests/libipsec/net2net-cert/hosts/sun/etc/strongswan.conf b/testing/tests/libipsec/net2net-cert/hosts/sun/etc/strongswan.conf
index 88fea0a0e..e6a98b407 100644
--- a/testing/tests/libipsec/net2net-cert/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/libipsec/net2net-cert/hosts/sun/etc/strongswan.conf
@@ -1,19 +1,10 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random 
+  load = pem pkcs1 x509 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
   load = random nonce aes sha1 sha2 gcm pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-libipsec kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   multiple_authentication = no
 }
diff --git a/testing/tests/libipsec/net2net-null/hosts/moon/etc/strongswan.conf b/testing/tests/libipsec/net2net-null/hosts/moon/etc/strongswan.conf
index 3024563e9..9e2091f31 100644
--- a/testing/tests/libipsec/net2net-null/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/libipsec/net2net-null/hosts/moon/etc/strongswan.conf
@@ -1,19 +1,10 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random 
+  load = pem pkcs1 x509 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
   load = random nonce pem pkcs1 revocation openssl curl vici kernel-libipsec kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   multiple_authentication = no
 }
diff --git a/testing/tests/libipsec/net2net-null/hosts/sun/etc/strongswan.conf b/testing/tests/libipsec/net2net-null/hosts/sun/etc/strongswan.conf
index 3024563e9..9e2091f31 100644
--- a/testing/tests/libipsec/net2net-null/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/libipsec/net2net-null/hosts/sun/etc/strongswan.conf
@@ -1,19 +1,10 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 swanctl {
-  load = pem pkcs1 x509 revocation constraints pubkey openssl random 
+  load = pem pkcs1 x509 revocation constraints pubkey openssl random
 }
 
 charon-systemd {
   load = random nonce pem pkcs1 revocation openssl curl vici kernel-libipsec kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   multiple_authentication = no
 }
diff --git a/testing/tests/sql/ip-pool-db-expired/hosts/carol/etc/strongswan.conf b/testing/tests/sql/ip-pool-db-expired/hosts/carol/etc/strongswan.conf
index 221c2a169..f5b531db9 100644
--- a/testing/tests/sql/ip-pool-db-expired/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/sql/ip-pool-db-expired/hosts/carol/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/ip-pool-db-expired/hosts/dave/etc/strongswan.conf b/testing/tests/sql/ip-pool-db-expired/hosts/dave/etc/strongswan.conf
index 221c2a169..f5b531db9 100644
--- a/testing/tests/sql/ip-pool-db-expired/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/sql/ip-pool-db-expired/hosts/dave/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/ip-pool-db-expired/hosts/moon/etc/strongswan.conf b/testing/tests/sql/ip-pool-db-expired/hosts/moon/etc/strongswan.conf
index 1f91d0081..2e9e6464d 100644
--- a/testing/tests/sql/ip-pool-db-expired/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/sql/ip-pool-db-expired/hosts/moon/etc/strongswan.conf
@@ -3,14 +3,6 @@
 charon {
   load = random nonce aes sha1 sha2 pem pkcs1 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown sqlite sql attr-sql
 
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/ip-pool-db-restart/hosts/carol/etc/strongswan.conf b/testing/tests/sql/ip-pool-db-restart/hosts/carol/etc/strongswan.conf
index 221c2a169..f5b531db9 100644
--- a/testing/tests/sql/ip-pool-db-restart/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/sql/ip-pool-db-restart/hosts/carol/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/ip-pool-db-restart/hosts/dave/etc/strongswan.conf b/testing/tests/sql/ip-pool-db-restart/hosts/dave/etc/strongswan.conf
index 221c2a169..f5b531db9 100644
--- a/testing/tests/sql/ip-pool-db-restart/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/sql/ip-pool-db-restart/hosts/dave/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/ip-pool-db-restart/hosts/moon/etc/strongswan.conf b/testing/tests/sql/ip-pool-db-restart/hosts/moon/etc/strongswan.conf
index 1f91d0081..2e9e6464d 100644
--- a/testing/tests/sql/ip-pool-db-restart/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/sql/ip-pool-db-restart/hosts/moon/etc/strongswan.conf
@@ -3,14 +3,6 @@
 charon {
   load = random nonce aes sha1 sha2 pem pkcs1 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown sqlite sql attr-sql
 
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/ip-pool-db/hosts/carol/etc/strongswan.conf b/testing/tests/sql/ip-pool-db/hosts/carol/etc/strongswan.conf
index 2934235ec..310587ee2 100644
--- a/testing/tests/sql/ip-pool-db/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/sql/ip-pool-db/hosts/carol/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/ip-pool-db/hosts/dave/etc/strongswan.conf b/testing/tests/sql/ip-pool-db/hosts/dave/etc/strongswan.conf
index 2934235ec..310587ee2 100644
--- a/testing/tests/sql/ip-pool-db/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/sql/ip-pool-db/hosts/dave/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/ip-pool-db/hosts/moon/etc/strongswan.conf b/testing/tests/sql/ip-pool-db/hosts/moon/etc/strongswan.conf
index 1f91d0081..2e9e6464d 100644
--- a/testing/tests/sql/ip-pool-db/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/sql/ip-pool-db/hosts/moon/etc/strongswan.conf
@@ -3,14 +3,6 @@
 charon {
   load = random nonce aes sha1 sha2 pem pkcs1 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown sqlite sql attr-sql
 
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/ip-split-pools-db-restart/hosts/carol/etc/strongswan.conf b/testing/tests/sql/ip-split-pools-db-restart/hosts/carol/etc/strongswan.conf
index 221c2a169..f5b531db9 100644
--- a/testing/tests/sql/ip-split-pools-db-restart/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/sql/ip-split-pools-db-restart/hosts/carol/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/ip-split-pools-db-restart/hosts/dave/etc/strongswan.conf b/testing/tests/sql/ip-split-pools-db-restart/hosts/dave/etc/strongswan.conf
index 221c2a169..f5b531db9 100644
--- a/testing/tests/sql/ip-split-pools-db-restart/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/sql/ip-split-pools-db-restart/hosts/dave/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/ip-split-pools-db-restart/hosts/moon/etc/strongswan.conf b/testing/tests/sql/ip-split-pools-db-restart/hosts/moon/etc/strongswan.conf
index 1f91d0081..2e9e6464d 100644
--- a/testing/tests/sql/ip-split-pools-db-restart/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/sql/ip-split-pools-db-restart/hosts/moon/etc/strongswan.conf
@@ -3,14 +3,6 @@
 charon {
   load = random nonce aes sha1 sha2 pem pkcs1 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown sqlite sql attr-sql
 
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/ip-split-pools-db/hosts/carol/etc/strongswan.conf b/testing/tests/sql/ip-split-pools-db/hosts/carol/etc/strongswan.conf
index 221c2a169..f5b531db9 100644
--- a/testing/tests/sql/ip-split-pools-db/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/sql/ip-split-pools-db/hosts/carol/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/ip-split-pools-db/hosts/dave/etc/strongswan.conf b/testing/tests/sql/ip-split-pools-db/hosts/dave/etc/strongswan.conf
index 221c2a169..f5b531db9 100644
--- a/testing/tests/sql/ip-split-pools-db/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/sql/ip-split-pools-db/hosts/dave/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/ip-split-pools-db/hosts/moon/etc/strongswan.conf b/testing/tests/sql/ip-split-pools-db/hosts/moon/etc/strongswan.conf
index 1f91d0081..2e9e6464d 100644
--- a/testing/tests/sql/ip-split-pools-db/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/sql/ip-split-pools-db/hosts/moon/etc/strongswan.conf
@@ -3,14 +3,6 @@
 charon {
   load = random nonce aes sha1 sha2 pem pkcs1 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown sqlite sql attr-sql
 
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/multi-level-ca/hosts/carol/etc/strongswan.conf b/testing/tests/sql/multi-level-ca/hosts/carol/etc/strongswan.conf
index 221c2a169..f5b531db9 100644
--- a/testing/tests/sql/multi-level-ca/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/sql/multi-level-ca/hosts/carol/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/multi-level-ca/hosts/dave/etc/strongswan.conf b/testing/tests/sql/multi-level-ca/hosts/dave/etc/strongswan.conf
index 221c2a169..f5b531db9 100644
--- a/testing/tests/sql/multi-level-ca/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/sql/multi-level-ca/hosts/dave/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/multi-level-ca/hosts/moon/etc/strongswan.conf b/testing/tests/sql/multi-level-ca/hosts/moon/etc/strongswan.conf
index 221c2a169..f5b531db9 100644
--- a/testing/tests/sql/multi-level-ca/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/sql/multi-level-ca/hosts/moon/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/net2net-cert/hosts/moon/etc/strongswan.conf b/testing/tests/sql/net2net-cert/hosts/moon/etc/strongswan.conf
index 221c2a169..f5b531db9 100644
--- a/testing/tests/sql/net2net-cert/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/sql/net2net-cert/hosts/moon/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/net2net-cert/hosts/sun/etc/strongswan.conf b/testing/tests/sql/net2net-cert/hosts/sun/etc/strongswan.conf
index 221c2a169..f5b531db9 100644
--- a/testing/tests/sql/net2net-cert/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/sql/net2net-cert/hosts/sun/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/net2net-psk/hosts/moon/etc/strongswan.conf b/testing/tests/sql/net2net-psk/hosts/moon/etc/strongswan.conf
index 1b6009b81..6332df434 100644
--- a/testing/tests/sql/net2net-psk/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/sql/net2net-psk/hosts/moon/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/net2net-psk/hosts/sun/etc/strongswan.conf b/testing/tests/sql/net2net-psk/hosts/sun/etc/strongswan.conf
index 1b6009b81..6332df434 100644
--- a/testing/tests/sql/net2net-psk/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/sql/net2net-psk/hosts/sun/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/net2net-route-pem/hosts/moon/etc/strongswan.conf b/testing/tests/sql/net2net-route-pem/hosts/moon/etc/strongswan.conf
index 221c2a169..f5b531db9 100644
--- a/testing/tests/sql/net2net-route-pem/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/sql/net2net-route-pem/hosts/moon/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/net2net-route-pem/hosts/sun/etc/strongswan.conf b/testing/tests/sql/net2net-route-pem/hosts/sun/etc/strongswan.conf
index 221c2a169..f5b531db9 100644
--- a/testing/tests/sql/net2net-route-pem/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/sql/net2net-route-pem/hosts/sun/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/net2net-start-pem/hosts/moon/etc/strongswan.conf b/testing/tests/sql/net2net-start-pem/hosts/moon/etc/strongswan.conf
index 221c2a169..f5b531db9 100644
--- a/testing/tests/sql/net2net-start-pem/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/sql/net2net-start-pem/hosts/moon/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/net2net-start-pem/hosts/sun/etc/strongswan.conf b/testing/tests/sql/net2net-start-pem/hosts/sun/etc/strongswan.conf
index 221c2a169..f5b531db9 100644
--- a/testing/tests/sql/net2net-start-pem/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/sql/net2net-start-pem/hosts/sun/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/rw-cert/hosts/carol/etc/strongswan.conf b/testing/tests/sql/rw-cert/hosts/carol/etc/strongswan.conf
index a7790249d..22e6d1488 100644
--- a/testing/tests/sql/rw-cert/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/sql/rw-cert/hosts/carol/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/rw-cert/hosts/dave/etc/strongswan.conf b/testing/tests/sql/rw-cert/hosts/dave/etc/strongswan.conf
index a7790249d..22e6d1488 100644
--- a/testing/tests/sql/rw-cert/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/sql/rw-cert/hosts/dave/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/rw-cert/hosts/moon/etc/strongswan.conf b/testing/tests/sql/rw-cert/hosts/moon/etc/strongswan.conf
index e938fe745..212dd3ada 100644
--- a/testing/tests/sql/rw-cert/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/sql/rw-cert/hosts/moon/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/rw-eap-aka-rsa/hosts/carol/etc/strongswan.conf b/testing/tests/sql/rw-eap-aka-rsa/hosts/carol/etc/strongswan.conf
index c7de4db3b..25a3b427c 100644
--- a/testing/tests/sql/rw-eap-aka-rsa/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/sql/rw-eap-aka-rsa/hosts/carol/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/rw-eap-aka-rsa/hosts/moon/etc/strongswan.conf b/testing/tests/sql/rw-eap-aka-rsa/hosts/moon/etc/strongswan.conf
index e477a33a1..34cc5892b 100644
--- a/testing/tests/sql/rw-eap-aka-rsa/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/sql/rw-eap-aka-rsa/hosts/moon/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/rw-psk-ipv4/hosts/carol/etc/strongswan.conf b/testing/tests/sql/rw-psk-ipv4/hosts/carol/etc/strongswan.conf
index 1b6009b81..6332df434 100644
--- a/testing/tests/sql/rw-psk-ipv4/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/sql/rw-psk-ipv4/hosts/carol/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/rw-psk-ipv4/hosts/dave/etc/strongswan.conf b/testing/tests/sql/rw-psk-ipv4/hosts/dave/etc/strongswan.conf
index 1b6009b81..6332df434 100644
--- a/testing/tests/sql/rw-psk-ipv4/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/sql/rw-psk-ipv4/hosts/dave/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/rw-psk-ipv4/hosts/moon/etc/strongswan.conf b/testing/tests/sql/rw-psk-ipv4/hosts/moon/etc/strongswan.conf
index 1b6009b81..6332df434 100644
--- a/testing/tests/sql/rw-psk-ipv4/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/sql/rw-psk-ipv4/hosts/moon/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/rw-psk-ipv6/hosts/carol/etc/strongswan.conf b/testing/tests/sql/rw-psk-ipv6/hosts/carol/etc/strongswan.conf
index 1b6009b81..6332df434 100644
--- a/testing/tests/sql/rw-psk-ipv6/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/sql/rw-psk-ipv6/hosts/carol/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/rw-psk-ipv6/hosts/dave/etc/strongswan.conf b/testing/tests/sql/rw-psk-ipv6/hosts/dave/etc/strongswan.conf
index 1b6009b81..6332df434 100644
--- a/testing/tests/sql/rw-psk-ipv6/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/sql/rw-psk-ipv6/hosts/dave/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/rw-psk-ipv6/hosts/moon/etc/strongswan.conf b/testing/tests/sql/rw-psk-ipv6/hosts/moon/etc/strongswan.conf
index 1b6009b81..6332df434 100644
--- a/testing/tests/sql/rw-psk-ipv6/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/sql/rw-psk-ipv6/hosts/moon/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/rw-psk-rsa-split/hosts/carol/etc/strongswan.conf b/testing/tests/sql/rw-psk-rsa-split/hosts/carol/etc/strongswan.conf
index 221c2a169..f5b531db9 100644
--- a/testing/tests/sql/rw-psk-rsa-split/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/sql/rw-psk-rsa-split/hosts/carol/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/rw-psk-rsa-split/hosts/dave/etc/strongswan.conf b/testing/tests/sql/rw-psk-rsa-split/hosts/dave/etc/strongswan.conf
index 221c2a169..f5b531db9 100644
--- a/testing/tests/sql/rw-psk-rsa-split/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/sql/rw-psk-rsa-split/hosts/dave/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/rw-psk-rsa-split/hosts/moon/etc/strongswan.conf b/testing/tests/sql/rw-psk-rsa-split/hosts/moon/etc/strongswan.conf
index 221c2a169..f5b531db9 100644
--- a/testing/tests/sql/rw-psk-rsa-split/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/sql/rw-psk-rsa-split/hosts/moon/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/rw-rsa-keyid/hosts/carol/etc/strongswan.conf b/testing/tests/sql/rw-rsa-keyid/hosts/carol/etc/strongswan.conf
index 3060dcc61..43ece9087 100644
--- a/testing/tests/sql/rw-rsa-keyid/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/sql/rw-rsa-keyid/hosts/carol/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/rw-rsa-keyid/hosts/dave/etc/strongswan.conf b/testing/tests/sql/rw-rsa-keyid/hosts/dave/etc/strongswan.conf
index 3060dcc61..43ece9087 100644
--- a/testing/tests/sql/rw-rsa-keyid/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/sql/rw-rsa-keyid/hosts/dave/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/rw-rsa-keyid/hosts/moon/etc/strongswan.conf b/testing/tests/sql/rw-rsa-keyid/hosts/moon/etc/strongswan.conf
index 3060dcc61..43ece9087 100644
--- a/testing/tests/sql/rw-rsa-keyid/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/sql/rw-rsa-keyid/hosts/moon/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/rw-rsa/hosts/carol/etc/strongswan.conf b/testing/tests/sql/rw-rsa/hosts/carol/etc/strongswan.conf
index 3060dcc61..43ece9087 100644
--- a/testing/tests/sql/rw-rsa/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/sql/rw-rsa/hosts/carol/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/rw-rsa/hosts/dave/etc/strongswan.conf b/testing/tests/sql/rw-rsa/hosts/dave/etc/strongswan.conf
index 3060dcc61..43ece9087 100644
--- a/testing/tests/sql/rw-rsa/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/sql/rw-rsa/hosts/dave/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/rw-rsa/hosts/moon/etc/strongswan.conf b/testing/tests/sql/rw-rsa/hosts/moon/etc/strongswan.conf
index 3060dcc61..43ece9087 100644
--- a/testing/tests/sql/rw-rsa/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/sql/rw-rsa/hosts/moon/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/shunt-policies-nat-rw/hosts/alice/etc/strongswan.conf b/testing/tests/sql/shunt-policies-nat-rw/hosts/alice/etc/strongswan.conf
index 45c296b91..209df5871 100644
--- a/testing/tests/sql/shunt-policies-nat-rw/hosts/alice/etc/strongswan.conf
+++ b/testing/tests/sql/shunt-policies-nat-rw/hosts/alice/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/shunt-policies-nat-rw/hosts/sun/etc/strongswan.conf b/testing/tests/sql/shunt-policies-nat-rw/hosts/sun/etc/strongswan.conf
index 124d11559..4048545d5 100644
--- a/testing/tests/sql/shunt-policies-nat-rw/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/sql/shunt-policies-nat-rw/hosts/sun/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/sql/shunt-policies-nat-rw/hosts/venus/etc/strongswan.conf b/testing/tests/sql/shunt-policies-nat-rw/hosts/venus/etc/strongswan.conf
index 45c296b91..209df5871 100644
--- a/testing/tests/sql/shunt-policies-nat-rw/hosts/venus/etc/strongswan.conf
+++ b/testing/tests/sql/shunt-policies-nat-rw/hosts/venus/etc/strongswan.conf
@@ -1,14 +1,6 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/swanctl/config-payload/hosts/carol/etc/strongswan.conf b/testing/tests/swanctl/config-payload/hosts/carol/etc/strongswan.conf
index bc865ecf4..ad4c18e43 100755
--- a/testing/tests/swanctl/config-payload/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/swanctl/config-payload/hosts/carol/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 hmac pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/config-payload/hosts/dave/etc/strongswan.conf b/testing/tests/swanctl/config-payload/hosts/dave/etc/strongswan.conf
index bc865ecf4..ad4c18e43 100755
--- a/testing/tests/swanctl/config-payload/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/swanctl/config-payload/hosts/dave/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 hmac pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/config-payload/hosts/moon/etc/strongswan.conf b/testing/tests/swanctl/config-payload/hosts/moon/etc/strongswan.conf
index bc865ecf4..ad4c18e43 100755
--- a/testing/tests/swanctl/config-payload/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/swanctl/config-payload/hosts/moon/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 hmac pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/crl-to-cache/hosts/carol/etc/strongswan.conf b/testing/tests/swanctl/crl-to-cache/hosts/carol/etc/strongswan.conf
index b1d7beb6f..48e34abba 100644
--- a/testing/tests/swanctl/crl-to-cache/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/swanctl/crl-to-cache/hosts/carol/etc/strongswan.conf
@@ -7,13 +7,5 @@ swanctl {
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 gmp x509 curl revocation hmac kernel-netlink socket-default vici
 
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   cache_crls = yes
 }
diff --git a/testing/tests/swanctl/crl-to-cache/hosts/moon/etc/strongswan.conf b/testing/tests/swanctl/crl-to-cache/hosts/moon/etc/strongswan.conf
index b1d7beb6f..48e34abba 100644
--- a/testing/tests/swanctl/crl-to-cache/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/swanctl/crl-to-cache/hosts/moon/etc/strongswan.conf
@@ -7,13 +7,5 @@ swanctl {
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 gmp x509 curl revocation hmac kernel-netlink socket-default vici
 
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   cache_crls = yes
 }
diff --git a/testing/tests/swanctl/dhcp-dynamic/hosts/carol/etc/strongswan.conf b/testing/tests/swanctl/dhcp-dynamic/hosts/carol/etc/strongswan.conf
index c70325679..9932df379 100755
--- a/testing/tests/swanctl/dhcp-dynamic/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/swanctl/dhcp-dynamic/hosts/carol/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce sha1 sha2 aes hmac pem pkcs1 x509 revocation constraints pubkey curve25519 gmp curl kernel-netlink socket-default resolve updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/dhcp-dynamic/hosts/dave/etc/strongswan.conf b/testing/tests/swanctl/dhcp-dynamic/hosts/dave/etc/strongswan.conf
index 187df667a..9932df379 100755
--- a/testing/tests/swanctl/dhcp-dynamic/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/swanctl/dhcp-dynamic/hosts/dave/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce sha1 sha2 aes hmac pem pkcs1 x509 revocation constraints pubkey curve25519 gmp curl kernel-netlink socket-default resolve updown vici
-
-   syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/dhcp-dynamic/hosts/moon/etc/strongswan.conf b/testing/tests/swanctl/dhcp-dynamic/hosts/moon/etc/strongswan.conf
index 8e30eabd1..c00d3dc4b 100755
--- a/testing/tests/swanctl/dhcp-dynamic/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/swanctl/dhcp-dynamic/hosts/moon/etc/strongswan.conf
@@ -7,14 +7,6 @@ swanctl {
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown attr farp dhcp
 
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     dhcp {
       server = 10.1.255.255
diff --git a/testing/tests/swanctl/frags-ipv4/hosts/carol/etc/strongswan.conf b/testing/tests/swanctl/frags-ipv4/hosts/carol/etc/strongswan.conf
index 81b7b946b..6081084f7 100755
--- a/testing/tests/swanctl/frags-ipv4/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/swanctl/frags-ipv4/hosts/carol/etc/strongswan.conf
@@ -8,13 +8,4 @@ charon-systemd {
   load = pem pkcs1 x509 revocation constraints pubkey openssl random nonce curl kernel-netlink socket-default updown vici
 
   fragment_size = 1400
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/frags-ipv4/hosts/dave/etc/strongswan.conf b/testing/tests/swanctl/frags-ipv4/hosts/dave/etc/strongswan.conf
index 81b7b946b..6081084f7 100755
--- a/testing/tests/swanctl/frags-ipv4/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/swanctl/frags-ipv4/hosts/dave/etc/strongswan.conf
@@ -8,13 +8,4 @@ charon-systemd {
   load = pem pkcs1 x509 revocation constraints pubkey openssl random nonce curl kernel-netlink socket-default updown vici
 
   fragment_size = 1400
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/frags-ipv4/hosts/moon/etc/strongswan.conf b/testing/tests/swanctl/frags-ipv4/hosts/moon/etc/strongswan.conf
index 81b7b946b..6081084f7 100755
--- a/testing/tests/swanctl/frags-ipv4/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/swanctl/frags-ipv4/hosts/moon/etc/strongswan.conf
@@ -8,13 +8,4 @@ charon-systemd {
   load = pem pkcs1 x509 revocation constraints pubkey openssl random nonce curl kernel-netlink socket-default updown vici
 
   fragment_size = 1400
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/frags-ipv6/hosts/carol/etc/strongswan.conf b/testing/tests/swanctl/frags-ipv6/hosts/carol/etc/strongswan.conf
index 81b7b946b..6081084f7 100755
--- a/testing/tests/swanctl/frags-ipv6/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/swanctl/frags-ipv6/hosts/carol/etc/strongswan.conf
@@ -8,13 +8,4 @@ charon-systemd {
   load = pem pkcs1 x509 revocation constraints pubkey openssl random nonce curl kernel-netlink socket-default updown vici
 
   fragment_size = 1400
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/frags-ipv6/hosts/dave/etc/strongswan.conf b/testing/tests/swanctl/frags-ipv6/hosts/dave/etc/strongswan.conf
index 81b7b946b..6081084f7 100755
--- a/testing/tests/swanctl/frags-ipv6/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/swanctl/frags-ipv6/hosts/dave/etc/strongswan.conf
@@ -8,13 +8,4 @@ charon-systemd {
   load = pem pkcs1 x509 revocation constraints pubkey openssl random nonce curl kernel-netlink socket-default updown vici
 
   fragment_size = 1400
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/frags-ipv6/hosts/moon/etc/strongswan.conf b/testing/tests/swanctl/frags-ipv6/hosts/moon/etc/strongswan.conf
index 81b7b946b..6081084f7 100755
--- a/testing/tests/swanctl/frags-ipv6/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/swanctl/frags-ipv6/hosts/moon/etc/strongswan.conf
@@ -8,13 +8,4 @@ charon-systemd {
   load = pem pkcs1 x509 revocation constraints pubkey openssl random nonce curl kernel-netlink socket-default updown vici
 
   fragment_size = 1400
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/ip-pool-db/hosts/carol/etc/strongswan.conf b/testing/tests/swanctl/ip-pool-db/hosts/carol/etc/strongswan.conf
index b8eef2992..886b31f9b 100755
--- a/testing/tests/swanctl/ip-pool-db/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/swanctl/ip-pool-db/hosts/carol/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 hmac pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default resolve updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/ip-pool-db/hosts/dave/etc/strongswan.conf b/testing/tests/swanctl/ip-pool-db/hosts/dave/etc/strongswan.conf
index b8eef2992..886b31f9b 100755
--- a/testing/tests/swanctl/ip-pool-db/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/swanctl/ip-pool-db/hosts/dave/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 hmac pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default resolve updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/ip-pool-db/hosts/moon/etc/strongswan.conf b/testing/tests/swanctl/ip-pool-db/hosts/moon/etc/strongswan.conf
index 7a08c74b4..31cf56d24 100755
--- a/testing/tests/swanctl/ip-pool-db/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/swanctl/ip-pool-db/hosts/moon/etc/strongswan.conf
@@ -7,14 +7,6 @@ swanctl {
 charon-systemd {
   load = random nonce aes sha1 sha2 hmac pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown sqlite attr-sql vici
 
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     attr-sql {
       database = sqlite:///etc/db.d/ipsec.db
diff --git a/testing/tests/swanctl/ip-pool/hosts/carol/etc/strongswan.conf b/testing/tests/swanctl/ip-pool/hosts/carol/etc/strongswan.conf
index bc865ecf4..ad4c18e43 100755
--- a/testing/tests/swanctl/ip-pool/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/swanctl/ip-pool/hosts/carol/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 hmac pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/ip-pool/hosts/dave/etc/strongswan.conf b/testing/tests/swanctl/ip-pool/hosts/dave/etc/strongswan.conf
index bc865ecf4..ad4c18e43 100755
--- a/testing/tests/swanctl/ip-pool/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/swanctl/ip-pool/hosts/dave/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 hmac pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/ip-pool/hosts/moon/etc/strongswan.conf b/testing/tests/swanctl/ip-pool/hosts/moon/etc/strongswan.conf
index bc865ecf4..ad4c18e43 100755
--- a/testing/tests/swanctl/ip-pool/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/swanctl/ip-pool/hosts/moon/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 hmac pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/manual-prio/hosts/carol/etc/strongswan.conf b/testing/tests/swanctl/manual-prio/hosts/carol/etc/strongswan.conf
index bc865ecf4..ad4c18e43 100755
--- a/testing/tests/swanctl/manual-prio/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/swanctl/manual-prio/hosts/carol/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 hmac pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/manual-prio/hosts/dave/etc/strongswan.conf b/testing/tests/swanctl/manual-prio/hosts/dave/etc/strongswan.conf
index bc865ecf4..ad4c18e43 100755
--- a/testing/tests/swanctl/manual-prio/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/swanctl/manual-prio/hosts/dave/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 hmac pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/manual-prio/hosts/moon/etc/strongswan.conf b/testing/tests/swanctl/manual-prio/hosts/moon/etc/strongswan.conf
index bc865ecf4..ad4c18e43 100755
--- a/testing/tests/swanctl/manual-prio/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/swanctl/manual-prio/hosts/moon/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 hmac pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/mult-auth-rsa-eap-sim-id/hosts/carol/etc/strongswan.conf b/testing/tests/swanctl/mult-auth-rsa-eap-sim-id/hosts/carol/etc/strongswan.conf
index 9c2dbb081..54b79b35d 100644
--- a/testing/tests/swanctl/mult-auth-rsa-eap-sim-id/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/swanctl/mult-auth-rsa-eap-sim-id/hosts/carol/etc/strongswan.conf
@@ -2,13 +2,4 @@
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac xcbc vici kernel-netlink socket-default fips-prf eap-sim eap-sim-file eap-identity updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/mult-auth-rsa-eap-sim-id/hosts/dave/etc/strongswan.conf b/testing/tests/swanctl/mult-auth-rsa-eap-sim-id/hosts/dave/etc/strongswan.conf
index 9c2dbb081..54b79b35d 100644
--- a/testing/tests/swanctl/mult-auth-rsa-eap-sim-id/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/swanctl/mult-auth-rsa-eap-sim-id/hosts/dave/etc/strongswan.conf
@@ -2,13 +2,4 @@
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac xcbc vici kernel-netlink socket-default fips-prf eap-sim eap-sim-file eap-identity updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/mult-auth-rsa-eap-sim-id/hosts/moon/etc/strongswan.conf b/testing/tests/swanctl/mult-auth-rsa-eap-sim-id/hosts/moon/etc/strongswan.conf
index 3dfefcce0..b18ba6809 100644
--- a/testing/tests/swanctl/mult-auth-rsa-eap-sim-id/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/swanctl/mult-auth-rsa-eap-sim-id/hosts/moon/etc/strongswan.conf
@@ -3,14 +3,6 @@
 charon-systemd {
   load = random nonce aes sha1 sha2 md5 pem pkcs1 curve25519 gmp x509 curl revocation hmac xcbc vici kernel-netlink socket-default fips-prf eap-radius eap-identity updown
 
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     eap-radius {
       secret = gv6URkSs
diff --git a/testing/tests/swanctl/multi-level-ca/hosts/carol/etc/strongswan.conf b/testing/tests/swanctl/multi-level-ca/hosts/carol/etc/strongswan.conf
index b634d0335..f3b571a1b 100644
--- a/testing/tests/swanctl/multi-level-ca/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/swanctl/multi-level-ca/hosts/carol/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = pem pkcs1 x509 revocation constraints pubkey openssl random nonce curl kernel-netlink socket-default vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/multi-level-ca/hosts/dave/etc/strongswan.conf b/testing/tests/swanctl/multi-level-ca/hosts/dave/etc/strongswan.conf
index b634d0335..f3b571a1b 100644
--- a/testing/tests/swanctl/multi-level-ca/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/swanctl/multi-level-ca/hosts/dave/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = pem pkcs1 x509 revocation constraints pubkey openssl random nonce curl kernel-netlink socket-default vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/multi-level-ca/hosts/moon/etc/strongswan.conf b/testing/tests/swanctl/multi-level-ca/hosts/moon/etc/strongswan.conf
index b634d0335..f3b571a1b 100644
--- a/testing/tests/swanctl/multi-level-ca/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/swanctl/multi-level-ca/hosts/moon/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = pem pkcs1 x509 revocation constraints pubkey openssl random nonce curl kernel-netlink socket-default vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/net2net-cert/hosts/moon/etc/strongswan.conf b/testing/tests/swanctl/net2net-cert/hosts/moon/etc/strongswan.conf
index bc865ecf4..ad4c18e43 100755
--- a/testing/tests/swanctl/net2net-cert/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/swanctl/net2net-cert/hosts/moon/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 hmac pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/net2net-cert/hosts/sun/etc/strongswan.conf b/testing/tests/swanctl/net2net-cert/hosts/sun/etc/strongswan.conf
index bc865ecf4..ad4c18e43 100755
--- a/testing/tests/swanctl/net2net-cert/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/swanctl/net2net-cert/hosts/sun/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 hmac pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/net2net-ed25519/hosts/moon/etc/strongswan.conf b/testing/tests/swanctl/net2net-ed25519/hosts/moon/etc/strongswan.conf
index 071348af2..a35aea01c 100755
--- a/testing/tests/swanctl/net2net-ed25519/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/swanctl/net2net-ed25519/hosts/moon/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 hmac pem pkcs1 pkcs8 x509 revocation curve25519 curl kernel-netlink socket-default updown vici
-
-  syslog {
-    auth {
-      default = 0
-    }
-    daemon {
-      default = 1
-    }
-  }
 }
diff --git a/testing/tests/swanctl/net2net-ed25519/hosts/sun/etc/strongswan.conf b/testing/tests/swanctl/net2net-ed25519/hosts/sun/etc/strongswan.conf
index 071348af2..a35aea01c 100755
--- a/testing/tests/swanctl/net2net-ed25519/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/swanctl/net2net-ed25519/hosts/sun/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 hmac pem pkcs1 pkcs8 x509 revocation curve25519 curl kernel-netlink socket-default updown vici
-
-  syslog {
-    auth {
-      default = 0
-    }
-    daemon {
-      default = 1
-    }
-  }
 }
diff --git a/testing/tests/swanctl/net2net-gw/hosts/carol/etc/strongswan.conf b/testing/tests/swanctl/net2net-gw/hosts/carol/etc/strongswan.conf
index bc865ecf4..ad4c18e43 100755
--- a/testing/tests/swanctl/net2net-gw/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/swanctl/net2net-gw/hosts/carol/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 hmac pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/net2net-gw/hosts/moon/etc/strongswan.conf b/testing/tests/swanctl/net2net-gw/hosts/moon/etc/strongswan.conf
index bc865ecf4..ad4c18e43 100755
--- a/testing/tests/swanctl/net2net-gw/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/swanctl/net2net-gw/hosts/moon/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 hmac pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/net2net-gw/hosts/sun/etc/strongswan.conf b/testing/tests/swanctl/net2net-gw/hosts/sun/etc/strongswan.conf
index bc865ecf4..ad4c18e43 100755
--- a/testing/tests/swanctl/net2net-gw/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/swanctl/net2net-gw/hosts/sun/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 hmac pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/net2net-multicast/hosts/moon/etc/strongswan.conf b/testing/tests/swanctl/net2net-multicast/hosts/moon/etc/strongswan.conf
index 63068a8c1..812c12bf9 100644
--- a/testing/tests/swanctl/net2net-multicast/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/swanctl/net2net-multicast/hosts/moon/etc/strongswan.conf
@@ -9,14 +9,6 @@ charon-systemd {
 
   multiple_authentication = no
 
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     forecast {
       groups = 224.0.0.251
diff --git a/testing/tests/swanctl/net2net-multicast/hosts/sun/etc/strongswan.conf b/testing/tests/swanctl/net2net-multicast/hosts/sun/etc/strongswan.conf
index f626e61a7..1c5da7b88 100644
--- a/testing/tests/swanctl/net2net-multicast/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/swanctl/net2net-multicast/hosts/sun/etc/strongswan.conf
@@ -5,14 +5,6 @@ charon-systemd {
 
   multiple_authentication = no
 
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     forecast {
       groups = 224.0.0.251
diff --git a/testing/tests/swanctl/net2net-pubkey/hosts/moon/etc/strongswan.conf b/testing/tests/swanctl/net2net-pubkey/hosts/moon/etc/strongswan.conf
index 187796cc1..29e75f7b8 100644
--- a/testing/tests/swanctl/net2net-pubkey/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/swanctl/net2net-pubkey/hosts/moon/etc/strongswan.conf
@@ -2,13 +2,4 @@
 
 charon-systemd {
   load = random nonce openssl pem pkcs1 pubkey kernel-netlink socket-default vici updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/net2net-pubkey/hosts/sun/etc/strongswan.conf b/testing/tests/swanctl/net2net-pubkey/hosts/sun/etc/strongswan.conf
index 187796cc1..29e75f7b8 100644
--- a/testing/tests/swanctl/net2net-pubkey/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/swanctl/net2net-pubkey/hosts/sun/etc/strongswan.conf
@@ -2,13 +2,4 @@
 
 charon-systemd {
   load = random nonce openssl pem pkcs1 pubkey kernel-netlink socket-default vici updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/net2net-route/hosts/moon/etc/strongswan.conf b/testing/tests/swanctl/net2net-route/hosts/moon/etc/strongswan.conf
index bc865ecf4..ad4c18e43 100755
--- a/testing/tests/swanctl/net2net-route/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/swanctl/net2net-route/hosts/moon/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 hmac pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/net2net-route/hosts/sun/etc/strongswan.conf b/testing/tests/swanctl/net2net-route/hosts/sun/etc/strongswan.conf
index 41f06fc8d..61d2bd9e4 100755
--- a/testing/tests/swanctl/net2net-route/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/swanctl/net2net-route/hosts/sun/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 hmac pem pkcs1 x509 revocation curve25519 gmp kernel-netlink socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/net2net-sha3-rsa-cert/hosts/moon/etc/strongswan.conf b/testing/tests/swanctl/net2net-sha3-rsa-cert/hosts/moon/etc/strongswan.conf
index a17a8277d..73bb5f6b3 100755
--- a/testing/tests/swanctl/net2net-sha3-rsa-cert/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/swanctl/net2net-sha3-rsa-cert/hosts/moon/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce sha1 sha2 sha3 aes hmac pem pkcs1 x509 revocation constraints pubkey curve25519 gmp curl kernel-netlink socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/net2net-sha3-rsa-cert/hosts/sun/etc/strongswan.conf b/testing/tests/swanctl/net2net-sha3-rsa-cert/hosts/sun/etc/strongswan.conf
index a17a8277d..73bb5f6b3 100755
--- a/testing/tests/swanctl/net2net-sha3-rsa-cert/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/swanctl/net2net-sha3-rsa-cert/hosts/sun/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce sha1 sha2 sha3 aes hmac pem pkcs1 x509 revocation constraints pubkey curve25519 gmp curl kernel-netlink socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/net2net-start/hosts/moon/etc/strongswan.conf b/testing/tests/swanctl/net2net-start/hosts/moon/etc/strongswan.conf
index bc865ecf4..ad4c18e43 100755
--- a/testing/tests/swanctl/net2net-start/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/swanctl/net2net-start/hosts/moon/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 hmac pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/net2net-start/hosts/sun/etc/strongswan.conf b/testing/tests/swanctl/net2net-start/hosts/sun/etc/strongswan.conf
index bc865ecf4..ad4c18e43 100755
--- a/testing/tests/swanctl/net2net-start/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/swanctl/net2net-start/hosts/sun/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 hmac pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/ocsp-disabled/hosts/carol/etc/strongswan.conf b/testing/tests/swanctl/ocsp-disabled/hosts/carol/etc/strongswan.conf
index 2cba4b69a..79b138bd5 100644
--- a/testing/tests/swanctl/ocsp-disabled/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/swanctl/ocsp-disabled/hosts/carol/etc/strongswan.conf
@@ -3,14 +3,6 @@
 charon-systemd {
   load = random nonce aes sha1 sha2 md5 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default
 
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     revocation {
       enable_ocsp = no
diff --git a/testing/tests/swanctl/ocsp-disabled/hosts/moon/etc/strongswan.conf b/testing/tests/swanctl/ocsp-disabled/hosts/moon/etc/strongswan.conf
index 215ae9411..2e78d2279 100644
--- a/testing/tests/swanctl/ocsp-disabled/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/swanctl/ocsp-disabled/hosts/moon/etc/strongswan.conf
@@ -3,14 +3,6 @@
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default
 
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     revocation {
       enable_ocsp = no
diff --git a/testing/tests/swanctl/ocsp-multi-level/hosts/carol/etc/strongswan.conf b/testing/tests/swanctl/ocsp-multi-level/hosts/carol/etc/strongswan.conf
index b634d0335..f3b571a1b 100644
--- a/testing/tests/swanctl/ocsp-multi-level/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/swanctl/ocsp-multi-level/hosts/carol/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = pem pkcs1 x509 revocation constraints pubkey openssl random nonce curl kernel-netlink socket-default vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/ocsp-multi-level/hosts/dave/etc/strongswan.conf b/testing/tests/swanctl/ocsp-multi-level/hosts/dave/etc/strongswan.conf
index b634d0335..f3b571a1b 100644
--- a/testing/tests/swanctl/ocsp-multi-level/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/swanctl/ocsp-multi-level/hosts/dave/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = pem pkcs1 x509 revocation constraints pubkey openssl random nonce curl kernel-netlink socket-default vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/ocsp-multi-level/hosts/moon/etc/strongswan.conf b/testing/tests/swanctl/ocsp-multi-level/hosts/moon/etc/strongswan.conf
index b634d0335..f3b571a1b 100644
--- a/testing/tests/swanctl/ocsp-multi-level/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/swanctl/ocsp-multi-level/hosts/moon/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = pem pkcs1 x509 revocation constraints pubkey openssl random nonce curl kernel-netlink socket-default vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/ocsp-signer-cert/hosts/carol/etc/strongswan.conf b/testing/tests/swanctl/ocsp-signer-cert/hosts/carol/etc/strongswan.conf
index 33e5d3435..c7b494ddc 100644
--- a/testing/tests/swanctl/ocsp-signer-cert/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/swanctl/ocsp-signer-cert/hosts/carol/etc/strongswan.conf
@@ -2,13 +2,4 @@
 
 charon-systemd {
   load = random nonce aes sha1 sha2 md5 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/ocsp-signer-cert/hosts/moon/etc/strongswan.conf b/testing/tests/swanctl/ocsp-signer-cert/hosts/moon/etc/strongswan.conf
index 537601993..d9c31430b 100644
--- a/testing/tests/swanctl/ocsp-signer-cert/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/swanctl/ocsp-signer-cert/hosts/moon/etc/strongswan.conf
@@ -2,13 +2,4 @@
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/protoport-dual/hosts/carol/etc/strongswan.conf b/testing/tests/swanctl/protoport-dual/hosts/carol/etc/strongswan.conf
index b4ef51930..91e32f7ba 100644
--- a/testing/tests/swanctl/protoport-dual/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/swanctl/protoport-dual/hosts/carol/etc/strongswan.conf
@@ -2,13 +2,4 @@
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/protoport-dual/hosts/moon/etc/strongswan.conf b/testing/tests/swanctl/protoport-dual/hosts/moon/etc/strongswan.conf
index b4ef51930..91e32f7ba 100644
--- a/testing/tests/swanctl/protoport-dual/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/swanctl/protoport-dual/hosts/moon/etc/strongswan.conf
@@ -2,13 +2,4 @@
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/protoport-range/hosts/carol/etc/strongswan.conf b/testing/tests/swanctl/protoport-range/hosts/carol/etc/strongswan.conf
index b4ef51930..91e32f7ba 100644
--- a/testing/tests/swanctl/protoport-range/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/swanctl/protoport-range/hosts/carol/etc/strongswan.conf
@@ -2,13 +2,4 @@
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/protoport-range/hosts/moon/etc/strongswan.conf b/testing/tests/swanctl/protoport-range/hosts/moon/etc/strongswan.conf
index b4ef51930..91e32f7ba 100644
--- a/testing/tests/swanctl/protoport-range/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/swanctl/protoport-range/hosts/moon/etc/strongswan.conf
@@ -2,13 +2,4 @@
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/rw-cert/hosts/carol/etc/strongswan.conf b/testing/tests/swanctl/rw-cert/hosts/carol/etc/strongswan.conf
index 0fca1b59f..b415e075c 100755
--- a/testing/tests/swanctl/rw-cert/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/swanctl/rw-cert/hosts/carol/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce sha1 sha2 aes hmac pem pkcs1 x509 revocation constraints pubkey curve25519 gmp curl kernel-netlink socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/rw-cert/hosts/dave/etc/strongswan.conf b/testing/tests/swanctl/rw-cert/hosts/dave/etc/strongswan.conf
index 0fca1b59f..b415e075c 100755
--- a/testing/tests/swanctl/rw-cert/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/swanctl/rw-cert/hosts/dave/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce sha1 sha2 aes hmac pem pkcs1 x509 revocation constraints pubkey curve25519 gmp curl kernel-netlink socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/rw-cert/hosts/moon/etc/strongswan.conf b/testing/tests/swanctl/rw-cert/hosts/moon/etc/strongswan.conf
index 0fca1b59f..b415e075c 100755
--- a/testing/tests/swanctl/rw-cert/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/swanctl/rw-cert/hosts/moon/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce sha1 sha2 aes hmac pem pkcs1 x509 revocation constraints pubkey curve25519 gmp curl kernel-netlink socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/rw-dnssec/hosts/carol/etc/strongswan.conf b/testing/tests/swanctl/rw-dnssec/hosts/carol/etc/strongswan.conf
index af41540d5..6339790cd 100644
--- a/testing/tests/swanctl/rw-dnssec/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/swanctl/rw-dnssec/hosts/carol/etc/strongswan.conf
@@ -3,14 +3,6 @@
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp dnskey pubkey unbound ipseckey hmac vici kernel-netlink socket-default updown resolve
 
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     ipseckey {
       enable = yes
diff --git a/testing/tests/swanctl/rw-dnssec/hosts/dave/etc/strongswan.conf b/testing/tests/swanctl/rw-dnssec/hosts/dave/etc/strongswan.conf
index af41540d5..6339790cd 100644
--- a/testing/tests/swanctl/rw-dnssec/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/swanctl/rw-dnssec/hosts/dave/etc/strongswan.conf
@@ -3,14 +3,6 @@
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp dnskey pubkey unbound ipseckey hmac vici kernel-netlink socket-default updown resolve
 
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     ipseckey {
       enable = yes
diff --git a/testing/tests/swanctl/rw-dnssec/hosts/moon/etc/strongswan.conf b/testing/tests/swanctl/rw-dnssec/hosts/moon/etc/strongswan.conf
index 17913bab6..617b812d5 100644
--- a/testing/tests/swanctl/rw-dnssec/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/swanctl/rw-dnssec/hosts/moon/etc/strongswan.conf
@@ -3,14 +3,6 @@
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 dnskey pubkey unbound ipseckey curve25519 gmp hmac vici kernel-netlink socket-default updown attr
 
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   dns1 = PH_IP_WINNETOU
   dns2 = PH_IP_VENUS
 
diff --git a/testing/tests/swanctl/rw-eap-aka-sql-rsa/hosts/carol/etc/strongswan.conf b/testing/tests/swanctl/rw-eap-aka-sql-rsa/hosts/carol/etc/strongswan.conf
index a62b09ee8..653488a66 100644
--- a/testing/tests/swanctl/rw-eap-aka-sql-rsa/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/swanctl/rw-eap-aka-sql-rsa/hosts/carol/etc/strongswan.conf
@@ -7,14 +7,6 @@ swanctl {
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default sqlite fips-prf eap-aka eap-simaka-sql updown
 
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     eap-simaka-sql {
       database = sqlite:///etc/ipsec.d/ipsec.db
diff --git a/testing/tests/swanctl/rw-eap-aka-sql-rsa/hosts/moon/etc/strongswan.conf b/testing/tests/swanctl/rw-eap-aka-sql-rsa/hosts/moon/etc/strongswan.conf
index a62b09ee8..653488a66 100644
--- a/testing/tests/swanctl/rw-eap-aka-sql-rsa/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/swanctl/rw-eap-aka-sql-rsa/hosts/moon/etc/strongswan.conf
@@ -7,14 +7,6 @@ swanctl {
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default sqlite fips-prf eap-aka eap-simaka-sql updown
 
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     eap-simaka-sql {
       database = sqlite:///etc/ipsec.d/ipsec.db
diff --git a/testing/tests/swanctl/rw-eap-md5-id-rsa/hosts/carol/etc/strongswan.conf b/testing/tests/swanctl/rw-eap-md5-id-rsa/hosts/carol/etc/strongswan.conf
index c1249ebfc..d2cc789b3 100644
--- a/testing/tests/swanctl/rw-eap-md5-id-rsa/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/swanctl/rw-eap-md5-id-rsa/hosts/carol/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes md5 sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default eap-identity eap-md5 updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/rw-eap-md5-id-rsa/hosts/moon/etc/strongswan.conf b/testing/tests/swanctl/rw-eap-md5-id-rsa/hosts/moon/etc/strongswan.conf
index c1249ebfc..d2cc789b3 100644
--- a/testing/tests/swanctl/rw-eap-md5-id-rsa/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/swanctl/rw-eap-md5-id-rsa/hosts/moon/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes md5 sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default eap-identity eap-md5 updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/rw-eap-tls-sha3-rsa/hosts/carol/etc/strongswan.conf b/testing/tests/swanctl/rw-eap-tls-sha3-rsa/hosts/carol/etc/strongswan.conf
index 77764c14d..cae0025f6 100755
--- a/testing/tests/swanctl/rw-eap-tls-sha3-rsa/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/swanctl/rw-eap-tls-sha3-rsa/hosts/carol/etc/strongswan.conf
@@ -6,15 +6,6 @@ swanctl {
 
 charon-systemd {
   load = random nonce md5 sha1 sha2 sha3 aes hmac pem pkcs1 x509 revocation constraints pubkey curve25519 gmp curl eap-tls kernel-netlink socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
 
 libtls {
diff --git a/testing/tests/swanctl/rw-eap-tls-sha3-rsa/hosts/dave/etc/strongswan.conf b/testing/tests/swanctl/rw-eap-tls-sha3-rsa/hosts/dave/etc/strongswan.conf
index 77764c14d..cae0025f6 100755
--- a/testing/tests/swanctl/rw-eap-tls-sha3-rsa/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/swanctl/rw-eap-tls-sha3-rsa/hosts/dave/etc/strongswan.conf
@@ -6,15 +6,6 @@ swanctl {
 
 charon-systemd {
   load = random nonce md5 sha1 sha2 sha3 aes hmac pem pkcs1 x509 revocation constraints pubkey curve25519 gmp curl eap-tls kernel-netlink socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
 
 libtls {
diff --git a/testing/tests/swanctl/rw-eap-tls-sha3-rsa/hosts/moon/etc/strongswan.conf b/testing/tests/swanctl/rw-eap-tls-sha3-rsa/hosts/moon/etc/strongswan.conf
index 3608622d2..9c4e819c5 100755
--- a/testing/tests/swanctl/rw-eap-tls-sha3-rsa/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/swanctl/rw-eap-tls-sha3-rsa/hosts/moon/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce md5 sha1 sha2 sha3 aes hmac pem pkcs1 x509 revocation constraints pubkey curve25519 gmp curl eap-tls kernel-netlink socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/rw-hash-and-url/hosts/carol/etc/strongswan.conf b/testing/tests/swanctl/rw-hash-and-url/hosts/carol/etc/strongswan.conf
index c9411e8af..90f42a1c5 100755
--- a/testing/tests/swanctl/rw-hash-and-url/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/swanctl/rw-hash-and-url/hosts/carol/etc/strongswan.conf
@@ -7,13 +7,5 @@ swanctl {
 charon-systemd {
   load = random nonce aes sha1 sha2 hmac pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
 
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   hash_and_url = yes
 }
diff --git a/testing/tests/swanctl/rw-hash-and-url/hosts/dave/etc/strongswan.conf b/testing/tests/swanctl/rw-hash-and-url/hosts/dave/etc/strongswan.conf
index c9411e8af..90f42a1c5 100755
--- a/testing/tests/swanctl/rw-hash-and-url/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/swanctl/rw-hash-and-url/hosts/dave/etc/strongswan.conf
@@ -7,13 +7,5 @@ swanctl {
 charon-systemd {
   load = random nonce aes sha1 sha2 hmac pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
 
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   hash_and_url = yes
 }
diff --git a/testing/tests/swanctl/rw-hash-and-url/hosts/moon/etc/strongswan.conf b/testing/tests/swanctl/rw-hash-and-url/hosts/moon/etc/strongswan.conf
index c9411e8af..90f42a1c5 100755
--- a/testing/tests/swanctl/rw-hash-and-url/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/swanctl/rw-hash-and-url/hosts/moon/etc/strongswan.conf
@@ -7,13 +7,5 @@ swanctl {
 charon-systemd {
   load = random nonce aes sha1 sha2 hmac pem pkcs1 x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
 
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   hash_and_url = yes
 }
diff --git a/testing/tests/swanctl/rw-multi-ciphers-ikev1/hosts/carol/etc/strongswan.conf b/testing/tests/swanctl/rw-multi-ciphers-ikev1/hosts/carol/etc/strongswan.conf
index df7e24320..b8874523b 100755
--- a/testing/tests/swanctl/rw-multi-ciphers-ikev1/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/swanctl/rw-multi-ciphers-ikev1/hosts/carol/etc/strongswan.conf
@@ -6,14 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 hmac pkcs1 pem x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
-
-  syslog {
-    auth {
-      default = 0
-    }
-    daemon {
-      cfg = 1
-      ike = 1
-    }
-  }
 }
diff --git a/testing/tests/swanctl/rw-multi-ciphers-ikev1/hosts/dave/etc/strongswan.conf b/testing/tests/swanctl/rw-multi-ciphers-ikev1/hosts/dave/etc/strongswan.conf
index 3b75e7b34..c2b18d966 100755
--- a/testing/tests/swanctl/rw-multi-ciphers-ikev1/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/swanctl/rw-multi-ciphers-ikev1/hosts/dave/etc/strongswan.conf
@@ -6,14 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce des sha1 sha2 hmac pkcs1 pem x509 revocation gmp curl kernel-netlink socket-default updown vici
-
-  syslog {
-    auth {
-      default = 0
-    }
-    daemon {
-      cfg = 1
-      ike = 1
-    }
-  }
 }
diff --git a/testing/tests/swanctl/rw-multi-ciphers-ikev1/hosts/moon/etc/strongswan.conf b/testing/tests/swanctl/rw-multi-ciphers-ikev1/hosts/moon/etc/strongswan.conf
index 09d97d1cc..85354251d 100755
--- a/testing/tests/swanctl/rw-multi-ciphers-ikev1/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/swanctl/rw-multi-ciphers-ikev1/hosts/moon/etc/strongswan.conf
@@ -6,14 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes des sha1 sha2 hmac pkcs1 pem x509 revocation curve25519 gmp curl kernel-netlink socket-default updown vici
-
-  syslog {
-    auth {
-      default = 0
-    }
-    daemon {
-      cfg = 1
-      ike = 1
-    }
-  }
 }
diff --git a/testing/tests/swanctl/rw-newhope-bliss/hosts/carol/etc/strongswan.conf b/testing/tests/swanctl/rw-newhope-bliss/hosts/carol/etc/strongswan.conf
index 1b4cabcd1..16dcf16a1 100755
--- a/testing/tests/swanctl/rw-newhope-bliss/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/swanctl/rw-newhope-bliss/hosts/carol/etc/strongswan.conf
@@ -9,13 +9,4 @@ charon-systemd {
 
   send_vendor_id = yes
   fragment_size = 1500
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/rw-newhope-bliss/hosts/dave/etc/strongswan.conf b/testing/tests/swanctl/rw-newhope-bliss/hosts/dave/etc/strongswan.conf
index cd4d92c05..475705026 100755
--- a/testing/tests/swanctl/rw-newhope-bliss/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/swanctl/rw-newhope-bliss/hosts/dave/etc/strongswan.conf
@@ -9,13 +9,4 @@ charon-systemd {
 
   send_vendor_id = yes
   fragment_size = 1500
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/rw-newhope-bliss/hosts/moon/etc/strongswan.conf b/testing/tests/swanctl/rw-newhope-bliss/hosts/moon/etc/strongswan.conf
index 1b4cabcd1..16dcf16a1 100755
--- a/testing/tests/swanctl/rw-newhope-bliss/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/swanctl/rw-newhope-bliss/hosts/moon/etc/strongswan.conf
@@ -9,13 +9,4 @@ charon-systemd {
 
   send_vendor_id = yes
   fragment_size = 1500
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/rw-ntru-bliss/hosts/carol/etc/strongswan.conf b/testing/tests/swanctl/rw-ntru-bliss/hosts/carol/etc/strongswan.conf
index fc22b63d8..d655720cf 100644
--- a/testing/tests/swanctl/rw-ntru-bliss/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/swanctl/rw-ntru-bliss/hosts/carol/etc/strongswan.conf
@@ -5,13 +5,4 @@ charon-systemd {
 
   send_vendor_id = yes
   fragment_size = 1500
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/rw-ntru-bliss/hosts/dave/etc/strongswan.conf b/testing/tests/swanctl/rw-ntru-bliss/hosts/dave/etc/strongswan.conf
index fc22b63d8..d655720cf 100644
--- a/testing/tests/swanctl/rw-ntru-bliss/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/swanctl/rw-ntru-bliss/hosts/dave/etc/strongswan.conf
@@ -5,13 +5,4 @@ charon-systemd {
 
   send_vendor_id = yes
   fragment_size = 1500
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/rw-ntru-bliss/hosts/moon/etc/strongswan.conf b/testing/tests/swanctl/rw-ntru-bliss/hosts/moon/etc/strongswan.conf
index fc22b63d8..d655720cf 100644
--- a/testing/tests/swanctl/rw-ntru-bliss/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/swanctl/rw-ntru-bliss/hosts/moon/etc/strongswan.conf
@@ -5,13 +5,4 @@ charon-systemd {
 
   send_vendor_id = yes
   fragment_size = 1500
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/rw-psk-fqdn/hosts/carol/etc/strongswan.conf b/testing/tests/swanctl/rw-psk-fqdn/hosts/carol/etc/strongswan.conf
index e4a4820e9..dcef959ef 100755
--- a/testing/tests/swanctl/rw-psk-fqdn/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/swanctl/rw-psk-fqdn/hosts/carol/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 hmac curve25519 kernel-netlink socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/rw-psk-fqdn/hosts/dave/etc/strongswan.conf b/testing/tests/swanctl/rw-psk-fqdn/hosts/dave/etc/strongswan.conf
index e4a4820e9..dcef959ef 100755
--- a/testing/tests/swanctl/rw-psk-fqdn/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/swanctl/rw-psk-fqdn/hosts/dave/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 hmac curve25519 kernel-netlink socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/rw-psk-fqdn/hosts/moon/etc/strongswan.conf b/testing/tests/swanctl/rw-psk-fqdn/hosts/moon/etc/strongswan.conf
index e4a4820e9..dcef959ef 100755
--- a/testing/tests/swanctl/rw-psk-fqdn/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/swanctl/rw-psk-fqdn/hosts/moon/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 hmac curve25519 kernel-netlink socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/rw-psk-ikev1/hosts/carol/etc/strongswan.conf b/testing/tests/swanctl/rw-psk-ikev1/hosts/carol/etc/strongswan.conf
index 9ec12f606..dcef959ef 100755
--- a/testing/tests/swanctl/rw-psk-ikev1/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/swanctl/rw-psk-ikev1/hosts/carol/etc/strongswan.conf
@@ -6,14 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 hmac curve25519 kernel-netlink socket-default updown vici
-
-  syslog {
-    auth {
-      default = 0
-    }
-    daemon {
-      cfg = 1
-      ike = 1
-    }
-  }
 }
diff --git a/testing/tests/swanctl/rw-psk-ikev1/hosts/dave/etc/strongswan.conf b/testing/tests/swanctl/rw-psk-ikev1/hosts/dave/etc/strongswan.conf
index 2b3363a17..a12456f26 100755
--- a/testing/tests/swanctl/rw-psk-ikev1/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/swanctl/rw-psk-ikev1/hosts/dave/etc/strongswan.conf
@@ -6,14 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 hmac gmp kernel-netlink socket-default updown vici
-
-  syslog {
-    auth {
-      default = 0
-    }
-    daemon {
-      cfg = 1
-      ike = 1
-    }
-  }
 }
diff --git a/testing/tests/swanctl/rw-psk-ikev1/hosts/moon/etc/strongswan.conf b/testing/tests/swanctl/rw-psk-ikev1/hosts/moon/etc/strongswan.conf
index 718defbf0..f196d2431 100755
--- a/testing/tests/swanctl/rw-psk-ikev1/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/swanctl/rw-psk-ikev1/hosts/moon/etc/strongswan.conf
@@ -6,14 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 hmac curve25519 gmp kernel-netlink socket-default updown vici
-
-  syslog {
-    auth {
-      default = 0
-    }
-    daemon {
-      cfg = 1
-      ike = 1
-    }
-  }
 }
diff --git a/testing/tests/swanctl/rw-psk-ipv4/hosts/carol/etc/strongswan.conf b/testing/tests/swanctl/rw-psk-ipv4/hosts/carol/etc/strongswan.conf
index e4a4820e9..dcef959ef 100755
--- a/testing/tests/swanctl/rw-psk-ipv4/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/swanctl/rw-psk-ipv4/hosts/carol/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 hmac curve25519 kernel-netlink socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/rw-psk-ipv4/hosts/dave/etc/strongswan.conf b/testing/tests/swanctl/rw-psk-ipv4/hosts/dave/etc/strongswan.conf
index e4a4820e9..dcef959ef 100755
--- a/testing/tests/swanctl/rw-psk-ipv4/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/swanctl/rw-psk-ipv4/hosts/dave/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 hmac curve25519 kernel-netlink socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/rw-psk-ipv4/hosts/moon/etc/strongswan.conf b/testing/tests/swanctl/rw-psk-ipv4/hosts/moon/etc/strongswan.conf
index 810169b25..0325fe9a2 100755
--- a/testing/tests/swanctl/rw-psk-ipv4/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/swanctl/rw-psk-ipv4/hosts/moon/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce aes sha1 sha2 md5 hmac curve25519 kernel-netlink socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/rw-pubkey-anon/hosts/carol/etc/strongswan.conf b/testing/tests/swanctl/rw-pubkey-anon/hosts/carol/etc/strongswan.conf
index 35fc362af..331d5bc94 100755
--- a/testing/tests/swanctl/rw-pubkey-anon/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/swanctl/rw-pubkey-anon/hosts/carol/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce openssl pem pkcs1 pubkey kernel-netlink socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/rw-pubkey-anon/hosts/dave/etc/strongswan.conf b/testing/tests/swanctl/rw-pubkey-anon/hosts/dave/etc/strongswan.conf
index 35fc362af..331d5bc94 100755
--- a/testing/tests/swanctl/rw-pubkey-anon/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/swanctl/rw-pubkey-anon/hosts/dave/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce openssl pem pkcs1 pubkey kernel-netlink socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/rw-pubkey-anon/hosts/moon/etc/strongswan.conf b/testing/tests/swanctl/rw-pubkey-anon/hosts/moon/etc/strongswan.conf
index 702915272..6b99d98a9 100755
--- a/testing/tests/swanctl/rw-pubkey-anon/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/swanctl/rw-pubkey-anon/hosts/moon/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce openssl pem pkcs1 pubkey kernel-netlink socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/rw-pubkey-keyid/hosts/carol/etc/strongswan.conf b/testing/tests/swanctl/rw-pubkey-keyid/hosts/carol/etc/strongswan.conf
index 35fc362af..331d5bc94 100755
--- a/testing/tests/swanctl/rw-pubkey-keyid/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/swanctl/rw-pubkey-keyid/hosts/carol/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce openssl pem pkcs1 pubkey kernel-netlink socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/rw-pubkey-keyid/hosts/dave/etc/strongswan.conf b/testing/tests/swanctl/rw-pubkey-keyid/hosts/dave/etc/strongswan.conf
index 35fc362af..331d5bc94 100755
--- a/testing/tests/swanctl/rw-pubkey-keyid/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/swanctl/rw-pubkey-keyid/hosts/dave/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce openssl pem pkcs1 pubkey kernel-netlink socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/rw-pubkey-keyid/hosts/moon/etc/strongswan.conf b/testing/tests/swanctl/rw-pubkey-keyid/hosts/moon/etc/strongswan.conf
index 702915272..6b99d98a9 100755
--- a/testing/tests/swanctl/rw-pubkey-keyid/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/swanctl/rw-pubkey-keyid/hosts/moon/etc/strongswan.conf
@@ -6,13 +6,4 @@ swanctl {
 
 charon-systemd {
   load = random nonce openssl pem pkcs1 pubkey kernel-netlink socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/shunt-policies-nat-rw/hosts/alice/etc/strongswan.conf b/testing/tests/swanctl/shunt-policies-nat-rw/hosts/alice/etc/strongswan.conf
index 23671b07e..bf799a29b 100644
--- a/testing/tests/swanctl/shunt-policies-nat-rw/hosts/alice/etc/strongswan.conf
+++ b/testing/tests/swanctl/shunt-policies-nat-rw/hosts/alice/etc/strongswan.conf
@@ -3,13 +3,5 @@
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
 
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   keep_alive = 5
 }
diff --git a/testing/tests/swanctl/shunt-policies-nat-rw/hosts/sun/etc/strongswan.conf b/testing/tests/swanctl/shunt-policies-nat-rw/hosts/sun/etc/strongswan.conf
index b4ef51930..91e32f7ba 100644
--- a/testing/tests/swanctl/shunt-policies-nat-rw/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/swanctl/shunt-policies-nat-rw/hosts/sun/etc/strongswan.conf
@@ -2,13 +2,4 @@
 
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/shunt-policies-nat-rw/hosts/venus/etc/strongswan.conf b/testing/tests/swanctl/shunt-policies-nat-rw/hosts/venus/etc/strongswan.conf
index 23671b07e..bf799a29b 100644
--- a/testing/tests/swanctl/shunt-policies-nat-rw/hosts/venus/etc/strongswan.conf
+++ b/testing/tests/swanctl/shunt-policies-nat-rw/hosts/venus/etc/strongswan.conf
@@ -3,13 +3,5 @@
 charon-systemd {
   load = random nonce aes sha1 sha2 pem pkcs1 curve25519 gmp x509 curl revocation hmac vici kernel-netlink socket-default updown
 
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   keep_alive = 5
 }
diff --git a/testing/tests/swanctl/xauth-rsa/hosts/carol/etc/strongswan.conf b/testing/tests/swanctl/xauth-rsa/hosts/carol/etc/strongswan.conf
index 8ec501873..fccc73f22 100644
--- a/testing/tests/swanctl/xauth-rsa/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/swanctl/xauth-rsa/hosts/carol/etc/strongswan.conf
@@ -2,13 +2,4 @@
 
 charon-systemd {
   load = random nonce sha1 sha2 aes hmac pem pkcs1 x509 revocation gmp curl xauth-generic kernel-netlink socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/xauth-rsa/hosts/dave/etc/strongswan.conf b/testing/tests/swanctl/xauth-rsa/hosts/dave/etc/strongswan.conf
index 8ec501873..fccc73f22 100644
--- a/testing/tests/swanctl/xauth-rsa/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/swanctl/xauth-rsa/hosts/dave/etc/strongswan.conf
@@ -2,13 +2,4 @@
 
 charon-systemd {
   load = random nonce sha1 sha2 aes hmac pem pkcs1 x509 revocation gmp curl xauth-generic kernel-netlink socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/swanctl/xauth-rsa/hosts/moon/etc/strongswan.conf b/testing/tests/swanctl/xauth-rsa/hosts/moon/etc/strongswan.conf
index 8ec501873..fccc73f22 100644
--- a/testing/tests/swanctl/xauth-rsa/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/swanctl/xauth-rsa/hosts/moon/etc/strongswan.conf
@@ -2,13 +2,4 @@
 
 charon-systemd {
   load = random nonce sha1 sha2 aes hmac pem pkcs1 x509 revocation gmp curl xauth-generic kernel-netlink socket-default updown vici
-
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
 }
diff --git a/testing/tests/tnc/tnccs-11-fhh/hosts/carol/etc/strongswan.conf b/testing/tests/tnc/tnccs-11-fhh/hosts/carol/etc/strongswan.conf
index c2962bb10..b094a3aaa 100644
--- a/testing/tests/tnc/tnccs-11-fhh/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-11-fhh/hosts/carol/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication=no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 3
     }
diff --git a/testing/tests/tnc/tnccs-11-fhh/hosts/dave/etc/strongswan.conf b/testing/tests/tnc/tnccs-11-fhh/hosts/dave/etc/strongswan.conf
index c2962bb10..b094a3aaa 100644
--- a/testing/tests/tnc/tnccs-11-fhh/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-11-fhh/hosts/dave/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication=no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 3
     }
diff --git a/testing/tests/tnc/tnccs-11-fhh/hosts/moon/etc/strongswan.conf b/testing/tests/tnc/tnccs-11-fhh/hosts/moon/etc/strongswan.conf
index 4b544428f..aacee2221 100644
--- a/testing/tests/tnc/tnccs-11-fhh/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-11-fhh/hosts/moon/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication = no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 3
     }
diff --git a/testing/tests/tnc/tnccs-11-radius-block/hosts/carol/etc/strongswan.conf b/testing/tests/tnc/tnccs-11-radius-block/hosts/carol/etc/strongswan.conf
index 1f4e9177d..305a9d1e6 100644
--- a/testing/tests/tnc/tnccs-11-radius-block/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-11-radius-block/hosts/carol/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication=no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 3
       imc = 3
diff --git a/testing/tests/tnc/tnccs-11-radius-block/hosts/dave/etc/strongswan.conf b/testing/tests/tnc/tnccs-11-radius-block/hosts/dave/etc/strongswan.conf
index 4220e7e4c..5d17eb638 100644
--- a/testing/tests/tnc/tnccs-11-radius-block/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-11-radius-block/hosts/dave/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication=no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 3
       imc = 3
diff --git a/testing/tests/tnc/tnccs-11-radius-block/hosts/moon/etc/strongswan.conf b/testing/tests/tnc/tnccs-11-radius-block/hosts/moon/etc/strongswan.conf
index 0d1d51061..4c9dd6e1f 100644
--- a/testing/tests/tnc/tnccs-11-radius-block/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-11-radius-block/hosts/moon/etc/strongswan.conf
@@ -5,14 +5,6 @@ charon-systemd {
 
   multiple_authentication=no
 
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     eap-radius {
       secret = gv6URkSs
diff --git a/testing/tests/tnc/tnccs-11-radius-pts/hosts/carol/etc/strongswan.conf b/testing/tests/tnc/tnccs-11-radius-pts/hosts/carol/etc/strongswan.conf
index 44ea3e1c3..a534ac66e 100644
--- a/testing/tests/tnc/tnccs-11-radius-pts/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-11-radius-pts/hosts/carol/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication=no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 3
       imc = 3
diff --git a/testing/tests/tnc/tnccs-11-radius-pts/hosts/dave/etc/strongswan.conf b/testing/tests/tnc/tnccs-11-radius-pts/hosts/dave/etc/strongswan.conf
index db9c4aab1..469e81156 100644
--- a/testing/tests/tnc/tnccs-11-radius-pts/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-11-radius-pts/hosts/dave/etc/strongswan.conf
@@ -7,9 +7,6 @@ charon-systemd {
   retransmit_tries = 5
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 3
       imc = 3
diff --git a/testing/tests/tnc/tnccs-11-radius-pts/hosts/moon/etc/strongswan.conf b/testing/tests/tnc/tnccs-11-radius-pts/hosts/moon/etc/strongswan.conf
index 7283047dd..cbaf67c89 100644
--- a/testing/tests/tnc/tnccs-11-radius-pts/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-11-radius-pts/hosts/moon/etc/strongswan.conf
@@ -5,14 +5,6 @@ charon-systemd {
 
   multiple_authentication=no
 
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     eap-radius {
       secret = gv6URkSs
diff --git a/testing/tests/tnc/tnccs-11-radius/hosts/carol/etc/strongswan.conf b/testing/tests/tnc/tnccs-11-radius/hosts/carol/etc/strongswan.conf
index a0e2ffd97..1ca6c3d10 100644
--- a/testing/tests/tnc/tnccs-11-radius/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-11-radius/hosts/carol/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication=no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 3
       imc = 3
diff --git a/testing/tests/tnc/tnccs-11-radius/hosts/dave/etc/strongswan.conf b/testing/tests/tnc/tnccs-11-radius/hosts/dave/etc/strongswan.conf
index e7a200e37..9df983c80 100644
--- a/testing/tests/tnc/tnccs-11-radius/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-11-radius/hosts/dave/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication=no
 
  syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 3
       imc = 3
diff --git a/testing/tests/tnc/tnccs-11-radius/hosts/moon/etc/strongswan.conf b/testing/tests/tnc/tnccs-11-radius/hosts/moon/etc/strongswan.conf
index 0d1d51061..4c9dd6e1f 100644
--- a/testing/tests/tnc/tnccs-11-radius/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-11-radius/hosts/moon/etc/strongswan.conf
@@ -5,14 +5,6 @@ charon-systemd {
 
   multiple_authentication=no
 
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     eap-radius {
       secret = gv6URkSs
diff --git a/testing/tests/tnc/tnccs-11/hosts/carol/etc/strongswan.conf b/testing/tests/tnc/tnccs-11/hosts/carol/etc/strongswan.conf
index 2df81bc57..649426628 100644
--- a/testing/tests/tnc/tnccs-11/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-11/hosts/carol/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication=no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 3
       imc = 3
diff --git a/testing/tests/tnc/tnccs-11/hosts/dave/etc/strongswan.conf b/testing/tests/tnc/tnccs-11/hosts/dave/etc/strongswan.conf
index fef5453fd..0a20b9407 100644
--- a/testing/tests/tnc/tnccs-11/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-11/hosts/dave/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication=no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 3
       imc = 3
diff --git a/testing/tests/tnc/tnccs-11/hosts/moon/etc/strongswan.conf b/testing/tests/tnc/tnccs-11/hosts/moon/etc/strongswan.conf
index b70f35c65..ad5cb6205 100644
--- a/testing/tests/tnc/tnccs-11/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-11/hosts/moon/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication = no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 3
       imv = 3
diff --git a/testing/tests/tnc/tnccs-20-block/hosts/carol/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-block/hosts/carol/etc/strongswan.conf
index f99e5c92e..aa8bb7cd3 100644
--- a/testing/tests/tnc/tnccs-20-block/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-block/hosts/carol/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication = no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 3
       imc = 3
diff --git a/testing/tests/tnc/tnccs-20-block/hosts/dave/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-block/hosts/dave/etc/strongswan.conf
index 2d9bee0ff..b3d3049be 100644
--- a/testing/tests/tnc/tnccs-20-block/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-block/hosts/dave/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication=no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 3
       imc = 3
diff --git a/testing/tests/tnc/tnccs-20-block/hosts/moon/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-block/hosts/moon/etc/strongswan.conf
index 366f61462..b3845a3ee 100644
--- a/testing/tests/tnc/tnccs-20-block/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-block/hosts/moon/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication = no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 3
       imv = 3
diff --git a/testing/tests/tnc/tnccs-20-client-retry/hosts/carol/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-client-retry/hosts/carol/etc/strongswan.conf
index 6fc2351ec..fa3458e22 100644
--- a/testing/tests/tnc/tnccs-20-client-retry/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-client-retry/hosts/carol/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication = no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 3
       imc = 2
diff --git a/testing/tests/tnc/tnccs-20-client-retry/hosts/dave/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-client-retry/hosts/dave/etc/strongswan.conf
index 008bfb54c..f4d6543aa 100644
--- a/testing/tests/tnc/tnccs-20-client-retry/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-client-retry/hosts/dave/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication = no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 3
       imc = 2
diff --git a/testing/tests/tnc/tnccs-20-client-retry/hosts/moon/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-client-retry/hosts/moon/etc/strongswan.conf
index 178a7fb9f..10d0ae864 100644
--- a/testing/tests/tnc/tnccs-20-client-retry/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-client-retry/hosts/moon/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication = no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 3
       imv = 2
diff --git a/testing/tests/tnc/tnccs-20-ev-pt-tls/hosts/alice/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-ev-pt-tls/hosts/alice/etc/strongswan.conf
index 1b2fd5275..04d7dbacc 100644
--- a/testing/tests/tnc/tnccs-20-ev-pt-tls/hosts/alice/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-ev-pt-tls/hosts/alice/etc/strongswan.conf
@@ -4,12 +4,9 @@ charon-systemd {
   load = random nonce pem pkcs1 x509 openssl revocation constraints curl vici socket-default kernel-netlink tnc-pdp tnc-imv tnc-tnccs tnccs-20 sqlite
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tls = 2
-      tnc = 2 
+      tnc = 2
       imv = 3
     }
   }
@@ -32,7 +29,7 @@ libtls {
 
 libimcv {
   database = sqlite:///etc/db.d/config.db
-  policy_script = /usr/local/libexec/ipsec/imv_policy_manager 
+  policy_script = /usr/local/libexec/ipsec/imv_policy_manager
 
   plugins {
     imv-swima {
diff --git a/testing/tests/tnc/tnccs-20-fail-init/hosts/carol/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-fail-init/hosts/carol/etc/strongswan.conf
index da22c47a7..e91440326 100644
--- a/testing/tests/tnc/tnccs-20-fail-init/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-fail-init/hosts/carol/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication = no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 3
       imc = 3
diff --git a/testing/tests/tnc/tnccs-20-fail-init/hosts/dave/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-fail-init/hosts/dave/etc/strongswan.conf
index a90bef309..6c84f3abb 100644
--- a/testing/tests/tnc/tnccs-20-fail-init/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-fail-init/hosts/dave/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication = no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 3
       imc = 3
diff --git a/testing/tests/tnc/tnccs-20-fail-init/hosts/moon/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-fail-init/hosts/moon/etc/strongswan.conf
index 01841f242..1e9995eb6 100644
--- a/testing/tests/tnc/tnccs-20-fail-init/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-fail-init/hosts/moon/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication = no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 3
       imv = 3
diff --git a/testing/tests/tnc/tnccs-20-fail-resp/hosts/carol/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-fail-resp/hosts/carol/etc/strongswan.conf
index 13240bfaa..66c6cb541 100644
--- a/testing/tests/tnc/tnccs-20-fail-resp/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-fail-resp/hosts/carol/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication = no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 3
       imc = 3
diff --git a/testing/tests/tnc/tnccs-20-fail-resp/hosts/moon/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-fail-resp/hosts/moon/etc/strongswan.conf
index 2fa0c7620..a6e58ba4e 100644
--- a/testing/tests/tnc/tnccs-20-fail-resp/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-fail-resp/hosts/moon/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication = no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 3
       imv = 3
diff --git a/testing/tests/tnc/tnccs-20-fhh/hosts/carol/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-fhh/hosts/carol/etc/strongswan.conf
index a32cd8bb4..aa4934fb1 100644
--- a/testing/tests/tnc/tnccs-20-fhh/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-fhh/hosts/carol/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication = no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 3
       imc = 2
diff --git a/testing/tests/tnc/tnccs-20-fhh/hosts/dave/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-fhh/hosts/dave/etc/strongswan.conf
index a32cd8bb4..aa4934fb1 100644
--- a/testing/tests/tnc/tnccs-20-fhh/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-fhh/hosts/dave/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication = no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 3
       imc = 2
diff --git a/testing/tests/tnc/tnccs-20-fhh/hosts/moon/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-fhh/hosts/moon/etc/strongswan.conf
index 996feb1b9..4732fbd4b 100644
--- a/testing/tests/tnc/tnccs-20-fhh/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-fhh/hosts/moon/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication = no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 3
       imv = 2
diff --git a/testing/tests/tnc/tnccs-20-hcd-eap/hosts/alice/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-hcd-eap/hosts/alice/etc/strongswan.conf
index 62cc662cb..fb77fd87e 100644
--- a/testing/tests/tnc/tnccs-20-hcd-eap/hosts/alice/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-hcd-eap/hosts/alice/etc/strongswan.conf
@@ -4,9 +4,6 @@ charon-systemd {
   load = random nonce aes sha1 sha2 md5 pem pkcs1 gmp hmac x509 revocation curl vici socket-default kernel-netlink eap-identity eap-ttls eap-tnc tnc-pdp tnc-imv tnc-tnccs tnccs-20 sqlite
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 2
       imv = 3
diff --git a/testing/tests/tnc/tnccs-20-hcd-eap/hosts/carol/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-hcd-eap/hosts/carol/etc/strongswan.conf
index a577a456a..8e430843a 100644
--- a/testing/tests/tnc/tnccs-20-hcd-eap/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-hcd-eap/hosts/carol/etc/strongswan.conf
@@ -4,9 +4,6 @@ charon-systemd {
   load = random nonce aes sha1 sha2 md5 pem pkcs1 gmp hmac x509 revocation curl vici kernel-netlink socket-default eap-identity eap-ttls eap-tnc tnc-imc tnc-tnccs tnccs-20 updown
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 2
       imc = 3
diff --git a/testing/tests/tnc/tnccs-20-hcd-eap/hosts/dave/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-hcd-eap/hosts/dave/etc/strongswan.conf
index 8b4a4501c..9f1718992 100644
--- a/testing/tests/tnc/tnccs-20-hcd-eap/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-hcd-eap/hosts/dave/etc/strongswan.conf
@@ -4,9 +4,6 @@ charon-systemd {
   load = random nonce aes sha1 sha2 md5 pem pkcs1 gmp hmac x509 revocation curl vici kernel-netlink socket-default eap-identity eap-ttls eap-tnc tnc-imc tnc-tnccs tnccs-20 updown
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 2
       imc = 3
diff --git a/testing/tests/tnc/tnccs-20-hcd-eap/hosts/moon/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-hcd-eap/hosts/moon/etc/strongswan.conf
index 77cd39c1c..08e5e38e5 100644
--- a/testing/tests/tnc/tnccs-20-hcd-eap/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-hcd-eap/hosts/moon/etc/strongswan.conf
@@ -4,14 +4,6 @@ charon-systemd {
   load = random nonce aes sha1 sha2 md5 pem pkcs1 gmp hmac x509 revocation curl vici kernel-netlink socket-default eap-identity eap-radius updown
   multiple_authentication=no
 
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     eap-radius {
       secret = gv6URkSs
diff --git a/testing/tests/tnc/tnccs-20-mutual-eap-fail/hosts/moon/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-mutual-eap-fail/hosts/moon/etc/strongswan.conf
index ab776fe8c..a773b17be 100644
--- a/testing/tests/tnc/tnccs-20-mutual-eap-fail/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-mutual-eap-fail/hosts/moon/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication = no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 2
       imc = 2
diff --git a/testing/tests/tnc/tnccs-20-mutual-eap-fail/hosts/sun/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-mutual-eap-fail/hosts/sun/etc/strongswan.conf
index 4025e995a..c2e722f10 100644
--- a/testing/tests/tnc/tnccs-20-mutual-eap-fail/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-mutual-eap-fail/hosts/sun/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
    multiple_authentication = no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 2
       imc = 2
diff --git a/testing/tests/tnc/tnccs-20-mutual-eap/hosts/moon/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-mutual-eap/hosts/moon/etc/strongswan.conf
index ab776fe8c..a773b17be 100644
--- a/testing/tests/tnc/tnccs-20-mutual-eap/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-mutual-eap/hosts/moon/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication = no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 2
       imc = 2
diff --git a/testing/tests/tnc/tnccs-20-mutual-eap/hosts/sun/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-mutual-eap/hosts/sun/etc/strongswan.conf
index 47e3852a7..33aa8e1d9 100644
--- a/testing/tests/tnc/tnccs-20-mutual-eap/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-mutual-eap/hosts/sun/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
    multiple_authentication = no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 2
       imc = 2
diff --git a/testing/tests/tnc/tnccs-20-mutual-pt-tls/hosts/sun/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-mutual-pt-tls/hosts/sun/etc/strongswan.conf
index 37648ed2f..b596dbc1b 100644
--- a/testing/tests/tnc/tnccs-20-mutual-pt-tls/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-mutual-pt-tls/hosts/sun/etc/strongswan.conf
@@ -4,9 +4,6 @@ charon-systemd {
   load = random nonce x509 openssl pem pkcs1 revocation curl vici kernel-netlink socket-default tnc-pdp tnc-tnccs tnc-imc tnc-imv tnccs-20
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 2
       imc = 2
diff --git a/testing/tests/tnc/tnccs-20-nea-pt-tls/hosts/alice/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-nea-pt-tls/hosts/alice/etc/strongswan.conf
index 1b2fd5275..04d7dbacc 100644
--- a/testing/tests/tnc/tnccs-20-nea-pt-tls/hosts/alice/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-nea-pt-tls/hosts/alice/etc/strongswan.conf
@@ -4,12 +4,9 @@ charon-systemd {
   load = random nonce pem pkcs1 x509 openssl revocation constraints curl vici socket-default kernel-netlink tnc-pdp tnc-imv tnc-tnccs tnccs-20 sqlite
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tls = 2
-      tnc = 2 
+      tnc = 2
       imv = 3
     }
   }
@@ -32,7 +29,7 @@ libtls {
 
 libimcv {
   database = sqlite:///etc/db.d/config.db
-  policy_script = /usr/local/libexec/ipsec/imv_policy_manager 
+  policy_script = /usr/local/libexec/ipsec/imv_policy_manager
 
   plugins {
     imv-swima {
diff --git a/testing/tests/tnc/tnccs-20-os-pts/hosts/carol/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-os-pts/hosts/carol/etc/strongswan.conf
index 14d8e2f2f..3e4d76f10 100644
--- a/testing/tests/tnc/tnccs-20-os-pts/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-os-pts/hosts/carol/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication = no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 2
       imc = 3
diff --git a/testing/tests/tnc/tnccs-20-os-pts/hosts/dave/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-os-pts/hosts/dave/etc/strongswan.conf
index 3efcc6353..2e249d48d 100644
--- a/testing/tests/tnc/tnccs-20-os-pts/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-os-pts/hosts/dave/etc/strongswan.conf
@@ -7,9 +7,6 @@ charon-systemd {
   retransmit_tries = 5
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 2
       imc = 3
diff --git a/testing/tests/tnc/tnccs-20-os-pts/hosts/moon/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-os-pts/hosts/moon/etc/strongswan.conf
index 1a41043b0..70ff6323f 100644
--- a/testing/tests/tnc/tnccs-20-os-pts/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-os-pts/hosts/moon/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication = no
 
  syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 2
       imv = 3
diff --git a/testing/tests/tnc/tnccs-20-os/hosts/carol/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-os/hosts/carol/etc/strongswan.conf
index 1eee31032..3ec0227b2 100644
--- a/testing/tests/tnc/tnccs-20-os/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-os/hosts/carol/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication = no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 2
       imc = 3
diff --git a/testing/tests/tnc/tnccs-20-os/hosts/dave/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-os/hosts/dave/etc/strongswan.conf
index 437480b40..7de2756a9 100644
--- a/testing/tests/tnc/tnccs-20-os/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-os/hosts/dave/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication = no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 2
       imc = 3
diff --git a/testing/tests/tnc/tnccs-20-os/hosts/moon/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-os/hosts/moon/etc/strongswan.conf
index 4f7460fe7..8e8fda6c4 100644
--- a/testing/tests/tnc/tnccs-20-os/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-os/hosts/moon/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication = no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 2
       imv = 3
diff --git a/testing/tests/tnc/tnccs-20-pdp-eap/hosts/alice/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-pdp-eap/hosts/alice/etc/strongswan.conf
index 2bf6a9b4d..e01fe4b4c 100644
--- a/testing/tests/tnc/tnccs-20-pdp-eap/hosts/alice/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-pdp-eap/hosts/alice/etc/strongswan.conf
@@ -4,9 +4,6 @@ charon-systemd {
   load = random nonce aes sha1 sha2 md5 pem pkcs1 gmp hmac x509 revocation curl vici socket-default kernel-netlink eap-identity eap-ttls eap-md5 eap-tnc tnc-pdp tnc-imv tnc-tnccs tnccs-20 sqlite
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 2
       imv = 3
diff --git a/testing/tests/tnc/tnccs-20-pdp-eap/hosts/carol/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-pdp-eap/hosts/carol/etc/strongswan.conf
index c7d48724d..a8aff3883 100644
--- a/testing/tests/tnc/tnccs-20-pdp-eap/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-pdp-eap/hosts/carol/etc/strongswan.conf
@@ -4,9 +4,6 @@ charon-systemd {
   load = random nonce aes sha1 sha2 md5 pem pkcs1 gmp hmac x509 revocation curl vici kernel-netlink socket-default eap-identity eap-md5 eap-ttls eap-tnc tnc-imc tnc-tnccs tnccs-20 updown
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 2
       imc = 3
diff --git a/testing/tests/tnc/tnccs-20-pdp-eap/hosts/dave/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-pdp-eap/hosts/dave/etc/strongswan.conf
index 828232ddc..852e0714e 100644
--- a/testing/tests/tnc/tnccs-20-pdp-eap/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-pdp-eap/hosts/dave/etc/strongswan.conf
@@ -4,9 +4,6 @@ charon-systemd {
   load = random nonce aes sha1 sha2 md5 pem pkcs1 gmp hmac x509 revocation curl vici kernel-netlink socket-default eap-identity eap-md5 eap-ttls eap-tnc tnc-imc tnc-tnccs tnccs-20 updown
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 2
       imc = 3
diff --git a/testing/tests/tnc/tnccs-20-pdp-eap/hosts/moon/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-pdp-eap/hosts/moon/etc/strongswan.conf
index 4185e5d90..bcf316622 100644
--- a/testing/tests/tnc/tnccs-20-pdp-eap/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-pdp-eap/hosts/moon/etc/strongswan.conf
@@ -5,14 +5,6 @@ charon-systemd {
 
   multiple_authentication=no
 
-  syslog {
-    daemon {
-      default = 1
-    }
-    auth {
-      default = 0
-    }
-  }
   plugins {
     eap-radius {
       secret = gv6URkSs
diff --git a/testing/tests/tnc/tnccs-20-pdp-pt-tls/hosts/alice/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-pdp-pt-tls/hosts/alice/etc/strongswan.conf
index 496524066..944a5928d 100644
--- a/testing/tests/tnc/tnccs-20-pdp-pt-tls/hosts/alice/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-pdp-pt-tls/hosts/alice/etc/strongswan.conf
@@ -4,12 +4,9 @@ charon-systemd {
   load = random nonce pem pkcs1 x509 openssl revocation constraints curl vici socket-default kernel-netlink tnc-pdp tnc-imv tnc-tnccs tnccs-20 sqlite
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tls = 2
-      tnc = 2 
+      tnc = 2
       imv = 3
     }
   }
@@ -29,7 +26,7 @@ libtls {
 
 libimcv {
   database = sqlite:///etc/db.d/config.db
-  policy_script = /usr/local/libexec/ipsec/imv_policy_manager 
+  policy_script = /usr/local/libexec/ipsec/imv_policy_manager
 
   plugins {
     imv-swid {
diff --git a/testing/tests/tnc/tnccs-20-pts-no-ecc/hosts/carol/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-pts-no-ecc/hosts/carol/etc/strongswan.conf
index 7230b0baa..3b477dd81 100644
--- a/testing/tests/tnc/tnccs-20-pts-no-ecc/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-pts-no-ecc/hosts/carol/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication = no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 3
       imc = 3
diff --git a/testing/tests/tnc/tnccs-20-pts-no-ecc/hosts/dave/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-pts-no-ecc/hosts/dave/etc/strongswan.conf
index d9866e67c..9da89723d 100644
--- a/testing/tests/tnc/tnccs-20-pts-no-ecc/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-pts-no-ecc/hosts/dave/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication = no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 3
       imc = 3
diff --git a/testing/tests/tnc/tnccs-20-pts-no-ecc/hosts/moon/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-pts-no-ecc/hosts/moon/etc/strongswan.conf
index bb5e8d1a4..1e5f7becf 100644
--- a/testing/tests/tnc/tnccs-20-pts-no-ecc/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-pts-no-ecc/hosts/moon/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication = no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 3
       imv = 3
diff --git a/testing/tests/tnc/tnccs-20-pts/hosts/carol/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-pts/hosts/carol/etc/strongswan.conf
index d45ec972d..8ebf56878 100644
--- a/testing/tests/tnc/tnccs-20-pts/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-pts/hosts/carol/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication = no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 3
       imc = 3
diff --git a/testing/tests/tnc/tnccs-20-pts/hosts/dave/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-pts/hosts/dave/etc/strongswan.conf
index db7628355..0b47d35e7 100644
--- a/testing/tests/tnc/tnccs-20-pts/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-pts/hosts/dave/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication = no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 3
       imc = 3
diff --git a/testing/tests/tnc/tnccs-20-pts/hosts/moon/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-pts/hosts/moon/etc/strongswan.conf
index d99daf857..bf14fe327 100644
--- a/testing/tests/tnc/tnccs-20-pts/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-pts/hosts/moon/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication = no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 3
       imv = 3
diff --git a/testing/tests/tnc/tnccs-20-server-retry/hosts/carol/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-server-retry/hosts/carol/etc/strongswan.conf
index 9a00add3c..7f7f52869 100644
--- a/testing/tests/tnc/tnccs-20-server-retry/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-server-retry/hosts/carol/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication = no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 3
       imc = 2
diff --git a/testing/tests/tnc/tnccs-20-server-retry/hosts/dave/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-server-retry/hosts/dave/etc/strongswan.conf
index a3cce18eb..d93482b10 100644
--- a/testing/tests/tnc/tnccs-20-server-retry/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-server-retry/hosts/dave/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication = no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 3
       imc = 2
diff --git a/testing/tests/tnc/tnccs-20-server-retry/hosts/moon/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-server-retry/hosts/moon/etc/strongswan.conf
index 178a7fb9f..10d0ae864 100644
--- a/testing/tests/tnc/tnccs-20-server-retry/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-server-retry/hosts/moon/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication = no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 3
       imv = 2
diff --git a/testing/tests/tnc/tnccs-20-tls/hosts/carol/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-tls/hosts/carol/etc/strongswan.conf
index 68578e3db..dab32e727 100644
--- a/testing/tests/tnc/tnccs-20-tls/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-tls/hosts/carol/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication = no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 2
       imc = 2
diff --git a/testing/tests/tnc/tnccs-20-tls/hosts/dave/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-tls/hosts/dave/etc/strongswan.conf
index aab35b09b..e26da3e7a 100644
--- a/testing/tests/tnc/tnccs-20-tls/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-tls/hosts/dave/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication = no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 2
       imc = 2
diff --git a/testing/tests/tnc/tnccs-20-tls/hosts/moon/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-tls/hosts/moon/etc/strongswan.conf
index 1ffca237d..66799c1e4 100644
--- a/testing/tests/tnc/tnccs-20-tls/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-tls/hosts/moon/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication = no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 2
       imv = 2
diff --git a/testing/tests/tnc/tnccs-20/hosts/carol/etc/strongswan.conf b/testing/tests/tnc/tnccs-20/hosts/carol/etc/strongswan.conf
index 7a1f07f9b..da21bc6f8 100644
--- a/testing/tests/tnc/tnccs-20/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20/hosts/carol/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication = no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 3
       imc = 3
diff --git a/testing/tests/tnc/tnccs-20/hosts/dave/etc/strongswan.conf b/testing/tests/tnc/tnccs-20/hosts/dave/etc/strongswan.conf
index 3e543c6f2..e90055fad 100644
--- a/testing/tests/tnc/tnccs-20/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20/hosts/dave/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication = no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 3
       imc = 3
diff --git a/testing/tests/tnc/tnccs-20/hosts/moon/etc/strongswan.conf b/testing/tests/tnc/tnccs-20/hosts/moon/etc/strongswan.conf
index 01841f242..1e9995eb6 100644
--- a/testing/tests/tnc/tnccs-20/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20/hosts/moon/etc/strongswan.conf
@@ -6,9 +6,6 @@ charon-systemd {
   multiple_authentication = no
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 3
       imv = 3
diff --git a/testing/tests/tnc/tnccs-dynamic/hosts/carol/etc/strongswan.conf b/testing/tests/tnc/tnccs-dynamic/hosts/carol/etc/strongswan.conf
index 4f6215c01..f0f941815 100644
--- a/testing/tests/tnc/tnccs-dynamic/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-dynamic/hosts/carol/etc/strongswan.conf
@@ -7,9 +7,6 @@ charon-systemd {
   integrity_test = yes
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 3
       imc = 3
diff --git a/testing/tests/tnc/tnccs-dynamic/hosts/dave/etc/strongswan.conf b/testing/tests/tnc/tnccs-dynamic/hosts/dave/etc/strongswan.conf
index e3a63d946..e5925a4cf 100644
--- a/testing/tests/tnc/tnccs-dynamic/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-dynamic/hosts/dave/etc/strongswan.conf
@@ -7,9 +7,6 @@ charon-systemd {
   integrity_test = yes
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 3
       imc = 3
diff --git a/testing/tests/tnc/tnccs-dynamic/hosts/moon/etc/strongswan.conf b/testing/tests/tnc/tnccs-dynamic/hosts/moon/etc/strongswan.conf
index ddaa1c8d8..0261fe1b0 100644
--- a/testing/tests/tnc/tnccs-dynamic/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-dynamic/hosts/moon/etc/strongswan.conf
@@ -7,9 +7,6 @@ charon-systemd {
   integrity_test = yes
 
   syslog {
-    auth {
-      default = 0
-    }
     daemon {
       tnc = 3
       imv = 3
-- 
cgit v1.2.3