- applied andreas's patch

  - logger output improvements
  - testin gupdates
  - and a lot more

123 files changed, 132 insertions, 12 deletions

diff --git a/testing/tests/alg-blowfish/hosts/carol/etc/ipsec.conf b/testing/tests/alg-blowfish/hosts/carol/etc/ipsec.conf
index fa68c9d3d..82b466a0b 100755
--- a/testing/tests/alg-blowfish/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/alg-blowfish/hosts/carol/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug="control crypt"
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/alg-blowfish/hosts/moon/etc/ipsec.conf b/testing/tests/alg-blowfish/hosts/moon/etc/ipsec.conf
index 39916a7ba..77a72f200 100755
--- a/testing/tests/alg-blowfish/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/alg-blowfish/hosts/moon/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug="control crypt"
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/alg-serpent/hosts/carol/etc/ipsec.conf b/testing/tests/alg-serpent/hosts/carol/etc/ipsec.conf
index 5d2369924..e814499cb 100755
--- a/testing/tests/alg-serpent/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/alg-serpent/hosts/carol/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug="control crypt"
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/alg-serpent/hosts/moon/etc/ipsec.conf b/testing/tests/alg-serpent/hosts/moon/etc/ipsec.conf
index 7bdddf008..f53cdf21a 100755
--- a/testing/tests/alg-serpent/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/alg-serpent/hosts/moon/etc/ipsec.conf
@@ -6,7 +6,8 @@ config setup
 	plutodebug="control crypt"
 	crlcheckinterval=180
 	strictcrlpolicy=no
-
+	charonstart=no
+       
 conn %default
 	ikelifetime=60m
 	keylife=20m
diff --git a/testing/tests/alg-sha2_256/hosts/carol/etc/ipsec.conf b/testing/tests/alg-sha2_256/hosts/carol/etc/ipsec.conf
index c55ae8ab1..a90e07444 100755
--- a/testing/tests/alg-sha2_256/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/alg-sha2_256/hosts/carol/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug="control crypt"
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/alg-sha2_256/hosts/moon/etc/ipsec.conf b/testing/tests/alg-sha2_256/hosts/moon/etc/ipsec.conf
index 748b1b85c..7cff7b3f3 100755
--- a/testing/tests/alg-sha2_256/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/alg-sha2_256/hosts/moon/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug="control crypt"
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/alg-twofish/hosts/carol/etc/ipsec.conf b/testing/tests/alg-twofish/hosts/carol/etc/ipsec.conf
index 8e3037a3b..1d6d3b29c 100755
--- a/testing/tests/alg-twofish/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/alg-twofish/hosts/carol/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug="control crypt"
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/alg-twofish/hosts/moon/etc/ipsec.conf b/testing/tests/alg-twofish/hosts/moon/etc/ipsec.conf
index 01004e94e..3467c495d 100755
--- a/testing/tests/alg-twofish/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/alg-twofish/hosts/moon/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug="control crypt"
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/attr-cert/hosts/carol/etc/ipsec.conf b/testing/tests/attr-cert/hosts/carol/etc/ipsec.conf
index 62fc49868..8f92ef45e 100755
--- a/testing/tests/attr-cert/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/attr-cert/hosts/carol/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/attr-cert/hosts/dave/etc/ipsec.conf b/testing/tests/attr-cert/hosts/dave/etc/ipsec.conf
index 9d932dc54..b0d770016 100755
--- a/testing/tests/attr-cert/hosts/dave/etc/ipsec.conf
+++ b/testing/tests/attr-cert/hosts/dave/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/attr-cert/hosts/moon/etc/ipsec.conf b/testing/tests/attr-cert/hosts/moon/etc/ipsec.conf
index bd72715ff..4a526f5f7 100755
--- a/testing/tests/attr-cert/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/attr-cert/hosts/moon/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/compress/hosts/carol/etc/ipsec.conf b/testing/tests/compress/hosts/carol/etc/ipsec.conf
index 9462ba5e6..1c6cdbe82 100755
--- a/testing/tests/compress/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/compress/hosts/carol/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug="control crypt"
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/compress/hosts/moon/etc/ipsec.conf b/testing/tests/compress/hosts/moon/etc/ipsec.conf
index b8dfae646..25d789a6d 100755
--- a/testing/tests/compress/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/compress/hosts/moon/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug="control crypt"
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/crl-from-cache/hosts/carol/etc/ipsec.conf b/testing/tests/crl-from-cache/hosts/carol/etc/ipsec.conf
index 93c4d7956..44930d30b 100755
--- a/testing/tests/crl-from-cache/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/crl-from-cache/hosts/carol/etc/ipsec.conf
@@ -7,6 +7,7 @@ config setup
 	crlcheckinterval=180
 	strictcrlpolicy=yes
 	cachecrls=yes
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/crl-from-cache/hosts/moon/etc/ipsec.conf b/testing/tests/crl-from-cache/hosts/moon/etc/ipsec.conf
index ef9237518..6b1d4c1e9 100755
--- a/testing/tests/crl-from-cache/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/crl-from-cache/hosts/moon/etc/ipsec.conf
@@ -7,6 +7,7 @@ config setup
 	crlcheckinterval=180
 	strictcrlpolicy=yes
 	cachecrls=yes
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/crl-ldap/hosts/carol/etc/ipsec.conf b/testing/tests/crl-ldap/hosts/carol/etc/ipsec.conf
index 669a47d06..f867d3c14 100755
--- a/testing/tests/crl-ldap/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/crl-ldap/hosts/carol/etc/ipsec.conf
@@ -7,6 +7,7 @@ config setup
 	crlcheckinterval=180
 	strictcrlpolicy=yes
 	cachecrls=yes
+	charonstart=no
 
 ca strongswan
 	cacert=strongswanCert.pem
diff --git a/testing/tests/crl-ldap/hosts/moon/etc/ipsec.conf b/testing/tests/crl-ldap/hosts/moon/etc/ipsec.conf
index d5c0dd163..323500801 100755
--- a/testing/tests/crl-ldap/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/crl-ldap/hosts/moon/etc/ipsec.conf
@@ -7,6 +7,7 @@ config setup
 	crlcheckinterval=180
 	strictcrlpolicy=yes
 	cachecrls=yes
+	charonstart=no
 
 ca strongswan
 	cacert=strongswanCert.pem
diff --git a/testing/tests/crl-revoked/hosts/carol/etc/ipsec.conf b/testing/tests/crl-revoked/hosts/carol/etc/ipsec.conf
index 5a1d246a6..b81adef9b 100755
--- a/testing/tests/crl-revoked/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/crl-revoked/hosts/carol/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=yes
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/crl-revoked/hosts/moon/etc/ipsec.conf b/testing/tests/crl-revoked/hosts/moon/etc/ipsec.conf
index a8953f557..ac302a5a4 100755
--- a/testing/tests/crl-revoked/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/crl-revoked/hosts/moon/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=yes
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/crl-strict/hosts/carol/etc/ipsec.conf b/testing/tests/crl-strict/hosts/carol/etc/ipsec.conf
index 6d0aee86a..156ea9bb3 100755
--- a/testing/tests/crl-strict/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/crl-strict/hosts/carol/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=yes
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/crl-strict/hosts/moon/etc/ipsec.conf b/testing/tests/crl-strict/hosts/moon/etc/ipsec.conf
index a8953f557..ac302a5a4 100755
--- a/testing/tests/crl-strict/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/crl-strict/hosts/moon/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=yes
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/crl-to-cache/hosts/carol/etc/ipsec.conf b/testing/tests/crl-to-cache/hosts/carol/etc/ipsec.conf
index 955f08b1f..3a0ddd545 100755
--- a/testing/tests/crl-to-cache/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/crl-to-cache/hosts/carol/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	cachecrls=yes
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/crl-to-cache/hosts/moon/etc/ipsec.conf b/testing/tests/crl-to-cache/hosts/moon/etc/ipsec.conf
index 885354ab5..d52084f21 100755
--- a/testing/tests/crl-to-cache/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/crl-to-cache/hosts/moon/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	cachecrls=yes
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/default-keys/hosts/carol/etc/ipsec.conf b/testing/tests/default-keys/hosts/carol/etc/ipsec.conf
index c4bb10a65..26ea4dfab 100755
--- a/testing/tests/default-keys/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/default-keys/hosts/carol/etc/ipsec.conf
@@ -7,6 +7,7 @@ config setup
 	crlcheckinterval=0
 	strictcrlpolicy=no
 	nocrsend=yes
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/default-keys/hosts/moon/etc/ipsec.conf b/testing/tests/default-keys/hosts/moon/etc/ipsec.conf
index eeeec645b..52d0853e6 100755
--- a/testing/tests/default-keys/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/default-keys/hosts/moon/etc/ipsec.conf
@@ -7,6 +7,7 @@ config setup
 	crlcheckinterval=0
 	strictcrlpolicy=no
 	nocrsend=yes
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
@@ -15,7 +16,7 @@ conn %default
 	keyingtries=1
 
 conn carol
-	left=192.168.0.1
+	left=PH_IP_MOON
 	leftnexthop=%direct
 	leftcert=selfCert.der
 	leftsendcert=never
diff --git a/testing/tests/double-nat-net/hosts/alice/etc/ipsec.conf b/testing/tests/double-nat-net/hosts/alice/etc/ipsec.conf
index 395e62e7c..35ce73c77 100755
--- a/testing/tests/double-nat-net/hosts/alice/etc/ipsec.conf
+++ b/testing/tests/double-nat-net/hosts/alice/etc/ipsec.conf
@@ -7,6 +7,7 @@ config setup
 	crlcheckinterval=180
 	strictcrlpolicy=no
 	nat_traversal=yes
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/double-nat-net/hosts/bob/etc/ipsec.conf b/testing/tests/double-nat-net/hosts/bob/etc/ipsec.conf
index 6927a5ce4..6b2863b84 100755
--- a/testing/tests/double-nat-net/hosts/bob/etc/ipsec.conf
+++ b/testing/tests/double-nat-net/hosts/bob/etc/ipsec.conf
@@ -7,6 +7,7 @@ config setup
 	crlcheckinterval=180
 	strictcrlpolicy=no
 	nat_traversal=yes
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/double-nat/hosts/alice/etc/ipsec.conf b/testing/tests/double-nat/hosts/alice/etc/ipsec.conf
index 5b3cddb63..bba11a5f6 100755
--- a/testing/tests/double-nat/hosts/alice/etc/ipsec.conf
+++ b/testing/tests/double-nat/hosts/alice/etc/ipsec.conf
@@ -7,6 +7,7 @@ config setup
 	crlcheckinterval=180
 	strictcrlpolicy=no
 	nat_traversal=yes
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/dpd-clear/hosts/moon/etc/ipsec.conf b/testing/tests/dpd-clear/hosts/moon/etc/ipsec.conf
index cac521c8f..641f2ae53 100755
--- a/testing/tests/dpd-clear/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/dpd-clear/hosts/moon/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/esp-ah-transport/hosts/carol/etc/ipsec.conf b/testing/tests/esp-ah-transport/hosts/carol/etc/ipsec.conf
index 13ab3e07f..794186638 100755
--- a/testing/tests/esp-ah-transport/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/esp-ah-transport/hosts/carol/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/esp-ah-transport/hosts/moon/etc/ipsec.conf b/testing/tests/esp-ah-transport/hosts/moon/etc/ipsec.conf
index 809f3c74b..926221f3e 100755
--- a/testing/tests/esp-ah-transport/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/esp-ah-transport/hosts/moon/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/esp-ah-tunnel/hosts/carol/etc/ipsec.conf b/testing/tests/esp-ah-tunnel/hosts/carol/etc/ipsec.conf
index 98cdaab7a..655a0c186 100755
--- a/testing/tests/esp-ah-tunnel/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/esp-ah-tunnel/hosts/carol/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/esp-ah-tunnel/hosts/moon/etc/ipsec.conf b/testing/tests/esp-ah-tunnel/hosts/moon/etc/ipsec.conf
index 7f976376d..446d1a7ad 100755
--- a/testing/tests/esp-ah-tunnel/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/esp-ah-tunnel/hosts/moon/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/esp-alg-des/hosts/carol/etc/ipsec.conf b/testing/tests/esp-alg-des/hosts/carol/etc/ipsec.conf
index b4f067b6d..ff74715eb 100755
--- a/testing/tests/esp-alg-des/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/esp-alg-des/hosts/carol/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug="control crypt"
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/esp-alg-des/hosts/moon/etc/ipsec.conf b/testing/tests/esp-alg-des/hosts/moon/etc/ipsec.conf
index 9513f810d..300b8974f 100755
--- a/testing/tests/esp-alg-des/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/esp-alg-des/hosts/moon/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug="control crypt"
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/esp-alg-null/hosts/carol/etc/ipsec.conf b/testing/tests/esp-alg-null/hosts/carol/etc/ipsec.conf
index b732eba93..79202c043 100755
--- a/testing/tests/esp-alg-null/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/esp-alg-null/hosts/carol/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/esp-alg-null/hosts/moon/etc/ipsec.conf b/testing/tests/esp-alg-null/hosts/moon/etc/ipsec.conf
index af11591a1..adbc542cb 100755
--- a/testing/tests/esp-alg-null/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/esp-alg-null/hosts/moon/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/esp-alg-strict-fail/hosts/carol/etc/ipsec.conf b/testing/tests/esp-alg-strict-fail/hosts/carol/etc/ipsec.conf
index ae8d2b772..da824ca1d 100755
--- a/testing/tests/esp-alg-strict-fail/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/esp-alg-strict-fail/hosts/carol/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/esp-alg-strict-fail/hosts/moon/etc/ipsec.conf b/testing/tests/esp-alg-strict-fail/hosts/moon/etc/ipsec.conf
index 2dd1c763a..0d34ff225 100755
--- a/testing/tests/esp-alg-strict-fail/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/esp-alg-strict-fail/hosts/moon/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/esp-alg-strict/hosts/carol/etc/ipsec.conf b/testing/tests/esp-alg-strict/hosts/carol/etc/ipsec.conf
index 5a14de070..f49e2ebb8 100755
--- a/testing/tests/esp-alg-strict/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/esp-alg-strict/hosts/carol/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/esp-alg-strict/hosts/moon/etc/ipsec.conf b/testing/tests/esp-alg-strict/hosts/moon/etc/ipsec.conf
index 2dd1c763a..0d34ff225 100755
--- a/testing/tests/esp-alg-strict/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/esp-alg-strict/hosts/moon/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/esp-alg-weak/hosts/carol/etc/ipsec.conf b/testing/tests/esp-alg-weak/hosts/carol/etc/ipsec.conf
index b4f067b6d..ff74715eb 100755
--- a/testing/tests/esp-alg-weak/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/esp-alg-weak/hosts/carol/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug="control crypt"
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/esp-alg-weak/hosts/moon/etc/ipsec.conf b/testing/tests/esp-alg-weak/hosts/moon/etc/ipsec.conf
index 3f07213ae..735af8671 100755
--- a/testing/tests/esp-alg-weak/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/esp-alg-weak/hosts/moon/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug="control crypt"
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/host2host-swapped/hosts/moon/etc/ipsec.conf b/testing/tests/host2host-swapped/hosts/moon/etc/ipsec.conf
index 4b66a5ecb..a51b1b215 100755
--- a/testing/tests/host2host-swapped/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/host2host-swapped/hosts/moon/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/host2host-swapped/hosts/sun/etc/ipsec.conf b/testing/tests/host2host-swapped/hosts/sun/etc/ipsec.conf
index a58894b33..2605628c2 100755
--- a/testing/tests/host2host-swapped/hosts/sun/etc/ipsec.conf
+++ b/testing/tests/host2host-swapped/hosts/sun/etc/ipsec.conf
@@ -7,6 +7,7 @@ config setup
 	crlcheckinterval=180
 	strictcrlpolicy=no
 	nat_traversal=yes
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/host2host-transport/hosts/moon/etc/ipsec.conf b/testing/tests/host2host-transport/hosts/moon/etc/ipsec.conf
index af5000fa8..f1fc0695e 100755
--- a/testing/tests/host2host-transport/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/host2host-transport/hosts/moon/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/host2host-transport/hosts/sun/etc/ipsec.conf b/testing/tests/host2host-transport/hosts/sun/etc/ipsec.conf
index 10bea9847..766fc39c4 100755
--- a/testing/tests/host2host-transport/hosts/sun/etc/ipsec.conf
+++ b/testing/tests/host2host-transport/hosts/sun/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/ike-alg-sha2_512/hosts/carol/etc/ipsec.conf b/testing/tests/ike-alg-sha2_512/hosts/carol/etc/ipsec.conf
index 1f73cdc21..ec6dfe2c1 100755
--- a/testing/tests/ike-alg-sha2_512/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/ike-alg-sha2_512/hosts/carol/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug="control crypt"
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/ike-alg-sha2_512/hosts/moon/etc/ipsec.conf b/testing/tests/ike-alg-sha2_512/hosts/moon/etc/ipsec.conf
index 90911997e..8433fabbe 100755
--- a/testing/tests/ike-alg-sha2_512/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/ike-alg-sha2_512/hosts/moon/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug="control crypt"
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/ike-alg-strict-fail/hosts/carol/etc/ipsec.conf b/testing/tests/ike-alg-strict-fail/hosts/carol/etc/ipsec.conf
index ae8d2b772..da824ca1d 100755
--- a/testing/tests/ike-alg-strict-fail/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/ike-alg-strict-fail/hosts/carol/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/ike-alg-strict-fail/hosts/moon/etc/ipsec.conf b/testing/tests/ike-alg-strict-fail/hosts/moon/etc/ipsec.conf
index 85cd235dc..50c0d0051 100755
--- a/testing/tests/ike-alg-strict-fail/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/ike-alg-strict-fail/hosts/moon/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/ike-alg-strict/hosts/carol/etc/ipsec.conf b/testing/tests/ike-alg-strict/hosts/carol/etc/ipsec.conf
index 5a14de070..f49e2ebb8 100755
--- a/testing/tests/ike-alg-strict/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/ike-alg-strict/hosts/carol/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/ike-alg-strict/hosts/moon/etc/ipsec.conf b/testing/tests/ike-alg-strict/hosts/moon/etc/ipsec.conf
index 85cd235dc..50c0d0051 100755
--- a/testing/tests/ike-alg-strict/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/ike-alg-strict/hosts/moon/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/ikev2-net2net/description.txt b/testing/tests/ikev2-net2net/description.txt
index 1f371c95e..0dd1b77a8 100644
--- a/testing/tests/ikev2-net2net/description.txt
+++ b/testing/tests/ikev2-net2net/description.txt
@@ -1,5 +1,5 @@
 A connection between the subnets behind the gateways <b>moon</b> and <b>sun</b>
 is set up using the IKEv2 key exchange protocol. The authentication is based on
-locally importerd <b>X.509 certificates</b>.
+locally imported <b>X.509 certificates</b>.
 In order to test the established tunnel, client <b>alice</b> behind gateway <b>moon</b>
 pings client <b>bob</b> located behind gateway <b>sun</b>.
diff --git a/testing/tests/ikev2-net2net/hosts/moon/etc/ipsec.conf b/testing/tests/ikev2-net2net/hosts/moon/etc/ipsec.conf
index 16f46cf8d..9c763e9a9 100644
--- a/testing/tests/ikev2-net2net/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/ikev2-net2net/hosts/moon/etc/ipsec.conf
@@ -6,10 +6,10 @@ config setup
 	plutostart=no
 
 conn net-net 
-	left=192.168.0.1
+	left=PH_IP_MOON
 	leftcert=moonCert.pem
 	leftsubnet=10.1.0.0/16
-	right=192.168.0.2
+	right=PH_IP_SUN
 	rightcert=sunCert.pem
 	rightsubnet=10.2.0.0/16
 	keyexchange=ikev2
diff --git a/testing/tests/ikev2-net2net/hosts/sun/etc/ipsec.conf b/testing/tests/ikev2-net2net/hosts/sun/etc/ipsec.conf
index a90a4ce7d..defccb9ea 100644
--- a/testing/tests/ikev2-net2net/hosts/sun/etc/ipsec.conf
+++ b/testing/tests/ikev2-net2net/hosts/sun/etc/ipsec.conf
@@ -6,10 +6,10 @@ config setup
 	plutostart=no
 
 conn net-net 
-	left=192.168.0.2
+	left=PH_IP_SUN
 	leftcert=sunCert.pem
 	leftsubnet=10.2.0.0/16
-	right=192.168.0.1
+	right=PH_IP_MOON
 	rightcert=moonCert.pem
 	rightsubnet=10.1.0.0/16
 	keyexchange=ikev2
diff --git a/testing/tests/mode-config-swapped/hosts/carol/etc/ipsec.conf b/testing/tests/mode-config-swapped/hosts/carol/etc/ipsec.conf
index bee23f4df..ca53709cc 100755
--- a/testing/tests/mode-config-swapped/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/mode-config-swapped/hosts/carol/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/mode-config-swapped/hosts/dave/etc/ipsec.conf b/testing/tests/mode-config-swapped/hosts/dave/etc/ipsec.conf
index 698cd9673..e4846008e 100755
--- a/testing/tests/mode-config-swapped/hosts/dave/etc/ipsec.conf
+++ b/testing/tests/mode-config-swapped/hosts/dave/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/mode-config-swapped/hosts/moon/etc/ipsec.conf b/testing/tests/mode-config-swapped/hosts/moon/etc/ipsec.conf
index b9e401080..a449130cd 100755
--- a/testing/tests/mode-config-swapped/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/mode-config-swapped/hosts/moon/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/mode-config/hosts/carol/etc/ipsec.conf b/testing/tests/mode-config/hosts/carol/etc/ipsec.conf
index 598997b45..b1d9a0813 100755
--- a/testing/tests/mode-config/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/mode-config/hosts/carol/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/mode-config/hosts/dave/etc/ipsec.conf b/testing/tests/mode-config/hosts/dave/etc/ipsec.conf
index da601389c..fcf690fb1 100755
--- a/testing/tests/mode-config/hosts/dave/etc/ipsec.conf
+++ b/testing/tests/mode-config/hosts/dave/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/mode-config/hosts/moon/etc/ipsec.conf b/testing/tests/mode-config/hosts/moon/etc/ipsec.conf
index 49333e217..d83b2d976 100755
--- a/testing/tests/mode-config/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/mode-config/hosts/moon/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/multi-level-ca-ldap/hosts/carol/etc/ipsec.conf b/testing/tests/multi-level-ca-ldap/hosts/carol/etc/ipsec.conf
index 222c3cf67..5149fcfd0 100755
--- a/testing/tests/multi-level-ca-ldap/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/multi-level-ca-ldap/hosts/carol/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 ca strongswan
         cacert=strongswanCert.pem
diff --git a/testing/tests/multi-level-ca-ldap/hosts/dave/etc/ipsec.conf b/testing/tests/multi-level-ca-ldap/hosts/dave/etc/ipsec.conf
index bfa0ebba3..d04667fc8 100755
--- a/testing/tests/multi-level-ca-ldap/hosts/dave/etc/ipsec.conf
+++ b/testing/tests/multi-level-ca-ldap/hosts/dave/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 ca strongswan
 	cacert=strongswanCert.pem
diff --git a/testing/tests/multi-level-ca-ldap/hosts/moon/etc/ipsec.conf b/testing/tests/multi-level-ca-ldap/hosts/moon/etc/ipsec.conf
index e2b60589b..3754c2e90 100755
--- a/testing/tests/multi-level-ca-ldap/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/multi-level-ca-ldap/hosts/moon/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=yes
+	charonstart=no
 
 ca strongswan
 	cacert=strongswanCert.pem
diff --git a/testing/tests/multi-level-ca-loop/hosts/carol/etc/ipsec.conf b/testing/tests/multi-level-ca-loop/hosts/carol/etc/ipsec.conf
index c56678b59..621dca270 100755
--- a/testing/tests/multi-level-ca-loop/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/multi-level-ca-loop/hosts/carol/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/multi-level-ca-loop/hosts/moon/etc/ipsec.conf b/testing/tests/multi-level-ca-loop/hosts/moon/etc/ipsec.conf
index 343042f15..c0b9b6a2b 100755
--- a/testing/tests/multi-level-ca-loop/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/multi-level-ca-loop/hosts/moon/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=yes
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/multi-level-ca-revoked/hosts/carol/etc/ipsec.conf b/testing/tests/multi-level-ca-revoked/hosts/carol/etc/ipsec.conf
index 6d0aee86a..156ea9bb3 100755
--- a/testing/tests/multi-level-ca-revoked/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/multi-level-ca-revoked/hosts/carol/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=yes
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/multi-level-ca-revoked/hosts/moon/etc/ipsec.conf b/testing/tests/multi-level-ca-revoked/hosts/moon/etc/ipsec.conf
index 39a298de9..e48a7f1a8 100755
--- a/testing/tests/multi-level-ca-revoked/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/multi-level-ca-revoked/hosts/moon/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=yes
+	charonstart=no
 
 ca strongswan
 	cacert=strongswanCert.pem
diff --git a/testing/tests/multi-level-ca-strict/hosts/carol/etc/ipsec.conf b/testing/tests/multi-level-ca-strict/hosts/carol/etc/ipsec.conf
index de179c565..1240dbfe7 100755
--- a/testing/tests/multi-level-ca-strict/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/multi-level-ca-strict/hosts/carol/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/multi-level-ca-strict/hosts/dave/etc/ipsec.conf b/testing/tests/multi-level-ca-strict/hosts/dave/etc/ipsec.conf
index 2fb6a301e..eb972c854 100755
--- a/testing/tests/multi-level-ca-strict/hosts/dave/etc/ipsec.conf
+++ b/testing/tests/multi-level-ca-strict/hosts/dave/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/multi-level-ca-strict/hosts/moon/etc/ipsec.conf b/testing/tests/multi-level-ca-strict/hosts/moon/etc/ipsec.conf
index 6ed262d20..2242cab54 100755
--- a/testing/tests/multi-level-ca-strict/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/multi-level-ca-strict/hosts/moon/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=yes
+	charonstart=no
 
 ca strongswan
 	cacert=strongswanCert.pem
diff --git a/testing/tests/multi-level-ca/hosts/carol/etc/ipsec.conf b/testing/tests/multi-level-ca/hosts/carol/etc/ipsec.conf
index e851a82f0..2a753b98f 100755
--- a/testing/tests/multi-level-ca/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/multi-level-ca/hosts/carol/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/multi-level-ca/hosts/dave/etc/ipsec.conf b/testing/tests/multi-level-ca/hosts/dave/etc/ipsec.conf
index 458a4ca5e..cabdfeaeb 100755
--- a/testing/tests/multi-level-ca/hosts/dave/etc/ipsec.conf
+++ b/testing/tests/multi-level-ca/hosts/dave/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/multi-level-ca/hosts/moon/etc/ipsec.conf b/testing/tests/multi-level-ca/hosts/moon/etc/ipsec.conf
index e60bbc016..dcc0296a7 100755
--- a/testing/tests/multi-level-ca/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/multi-level-ca/hosts/moon/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 ca strongswan
 	cacert=strongswanCert.pem
diff --git a/testing/tests/net2net-pgp/hosts/moon/etc/ipsec.conf b/testing/tests/net2net-pgp/hosts/moon/etc/ipsec.conf
index e7de6cf0b..4194c57ef 100755
--- a/testing/tests/net2net-pgp/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/net2net-pgp/hosts/moon/etc/ipsec.conf
@@ -5,6 +5,7 @@ version	2.0	# conforms to second version of ipsec.conf specification
 config setup
 	plutodebug=control
 	nocrsend=yes
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/net2net-pgp/hosts/sun/etc/ipsec.conf b/testing/tests/net2net-pgp/hosts/sun/etc/ipsec.conf
index 5dd8a8587..1a4484020 100755
--- a/testing/tests/net2net-pgp/hosts/sun/etc/ipsec.conf
+++ b/testing/tests/net2net-pgp/hosts/sun/etc/ipsec.conf
@@ -5,6 +5,7 @@ version	2.0	# conforms to second version of ipsec.conf specification
 config setup
 	plutodebug=control
 	nocrsend=yes
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/net2net-psk-fail/hosts/moon/etc/ipsec.conf b/testing/tests/net2net-psk-fail/hosts/moon/etc/ipsec.conf
index 87396e455..acc336a4e 100755
--- a/testing/tests/net2net-psk-fail/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/net2net-psk-fail/hosts/moon/etc/ipsec.conf
@@ -4,6 +4,7 @@ version	2.0	# conforms to second version of ipsec.conf specification
 
 config setup
 	plutodebug=control
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/net2net-psk-fail/hosts/sun/etc/ipsec.conf b/testing/tests/net2net-psk-fail/hosts/sun/etc/ipsec.conf
index 7e102b25c..4b2645370 100755
--- a/testing/tests/net2net-psk-fail/hosts/sun/etc/ipsec.conf
+++ b/testing/tests/net2net-psk-fail/hosts/sun/etc/ipsec.conf
@@ -4,6 +4,7 @@ version	2.0	# conforms to second version of ipsec.conf specification
 
 config setup
 	plutodebug=control
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/net2net-psk/hosts/moon/etc/ipsec.conf b/testing/tests/net2net-psk/hosts/moon/etc/ipsec.conf
index 51c53a505..ddfce35cd 100755
--- a/testing/tests/net2net-psk/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/net2net-psk/hosts/moon/etc/ipsec.conf
@@ -4,6 +4,7 @@ version	2.0	# conforms to second version of ipsec.conf specification
 
 config setup
 	plutodebug=control
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/net2net-psk/hosts/sun/etc/ipsec.conf b/testing/tests/net2net-psk/hosts/sun/etc/ipsec.conf
index 9c3695178..ed3fe259f 100755
--- a/testing/tests/net2net-psk/hosts/sun/etc/ipsec.conf
+++ b/testing/tests/net2net-psk/hosts/sun/etc/ipsec.conf
@@ -4,6 +4,7 @@ version	2.0	# conforms to second version of ipsec.conf specification
 
 config setup
 	plutodebug=control
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/net2net-route/hosts/moon/etc/ipsec.conf b/testing/tests/net2net-route/hosts/moon/etc/ipsec.conf
index 4063ae05f..a16129085 100755
--- a/testing/tests/net2net-route/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/net2net-route/hosts/moon/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/net2net-rsa/hosts/moon/etc/ipsec.conf b/testing/tests/net2net-rsa/hosts/moon/etc/ipsec.conf
index 772762321..7eaea4945 100755
--- a/testing/tests/net2net-rsa/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/net2net-rsa/hosts/moon/etc/ipsec.conf
@@ -4,6 +4,7 @@ version	2.0	# conforms to second version of ipsec.conf specification
 
 config setup
 	plutodebug=control
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/net2net-rsa/hosts/sun/etc/ipsec.conf b/testing/tests/net2net-rsa/hosts/sun/etc/ipsec.conf
index 9626ef168..018ea65a5 100755
--- a/testing/tests/net2net-rsa/hosts/sun/etc/ipsec.conf
+++ b/testing/tests/net2net-rsa/hosts/sun/etc/ipsec.conf
@@ -4,6 +4,7 @@ version	2.0	# conforms to second version of ipsec.conf specification
 
 config setup
 	plutodebug=control
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/net2net-start/hosts/moon/etc/ipsec.conf b/testing/tests/net2net-start/hosts/moon/etc/ipsec.conf
index 677955bc1..64b11a2fc 100755
--- a/testing/tests/net2net-start/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/net2net-start/hosts/moon/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/ocsp-revoked/hosts/carol/etc/ipsec.conf b/testing/tests/ocsp-revoked/hosts/carol/etc/ipsec.conf
index 7d4384767..2f495395e 100755
--- a/testing/tests/ocsp-revoked/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/ocsp-revoked/hosts/carol/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=yes
+	charonstart=no
 
 ca strongswan
 	cacert=strongswanCert.pem
diff --git a/testing/tests/ocsp-revoked/hosts/moon/etc/ipsec.conf b/testing/tests/ocsp-revoked/hosts/moon/etc/ipsec.conf
index 7134b6ee9..9236234ab 100755
--- a/testing/tests/ocsp-revoked/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/ocsp-revoked/hosts/moon/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=yes
+	charonstart=no
 
 ca strongswan
 	cacert=strongswanCert.pem
diff --git a/testing/tests/ocsp-strict/hosts/carol/etc/ipsec.conf b/testing/tests/ocsp-strict/hosts/carol/etc/ipsec.conf
index b34719401..1bdb0ac2f 100755
--- a/testing/tests/ocsp-strict/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/ocsp-strict/hosts/carol/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=yes
+	charonstart=no
 
 ca strongswan
 	cacert=strongswanCert.pem
diff --git a/testing/tests/ocsp-strict/hosts/moon/etc/ipsec.conf b/testing/tests/ocsp-strict/hosts/moon/etc/ipsec.conf
index 7134b6ee9..9236234ab 100755
--- a/testing/tests/ocsp-strict/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/ocsp-strict/hosts/moon/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=yes
+	charonstart=no
 
 ca strongswan
 	cacert=strongswanCert.pem
diff --git a/testing/tests/protoport-dual/hosts/carol/etc/ipsec.conf b/testing/tests/protoport-dual/hosts/carol/etc/ipsec.conf
index 9e05ecf61..b9e60c224 100755
--- a/testing/tests/protoport-dual/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/protoport-dual/hosts/carol/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/protoport-dual/hosts/moon/etc/ipsec.conf b/testing/tests/protoport-dual/hosts/moon/etc/ipsec.conf
index 84b9b0ba3..4597f96f4 100755
--- a/testing/tests/protoport-dual/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/protoport-dual/hosts/moon/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/protoport-pass/hosts/carol/etc/ipsec.conf b/testing/tests/protoport-pass/hosts/carol/etc/ipsec.conf
index ade7308f6..a19bc6dbf 100755
--- a/testing/tests/protoport-pass/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/protoport-pass/hosts/carol/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/protoport-pass/hosts/moon/etc/ipsec.conf b/testing/tests/protoport-pass/hosts/moon/etc/ipsec.conf
index fd67e2b4b..8c46e894f 100755
--- a/testing/tests/protoport-pass/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/protoport-pass/hosts/moon/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/protoport-route/hosts/carol/etc/ipsec.conf b/testing/tests/protoport-route/hosts/carol/etc/ipsec.conf
index 31c25c12f..94a78081a 100755
--- a/testing/tests/protoport-route/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/protoport-route/hosts/carol/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/protoport-route/hosts/moon/etc/ipsec.conf b/testing/tests/protoport-route/hosts/moon/etc/ipsec.conf
index 84b9b0ba3..4597f96f4 100755
--- a/testing/tests/protoport-route/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/protoport-route/hosts/moon/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/req-pkcs10/hosts/carol/etc/ipsec.conf b/testing/tests/req-pkcs10/hosts/carol/etc/ipsec.conf
index 58e2f1e5b..95d5bdebd 100755
--- a/testing/tests/req-pkcs10/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/req-pkcs10/hosts/carol/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/rw-psk-fqdn-named/hosts/carol/etc/ipsec.conf b/testing/tests/rw-psk-fqdn-named/hosts/carol/etc/ipsec.conf
index da5e198a8..9ae925cf6 100755
--- a/testing/tests/rw-psk-fqdn-named/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/rw-psk-fqdn-named/hosts/carol/etc/ipsec.conf
@@ -4,6 +4,7 @@ version	2.0	# conforms to second version of ipsec.conf specification
 
 config setup
 	plutodebug=control
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/rw-psk-fqdn-named/hosts/moon/etc/ipsec.conf b/testing/tests/rw-psk-fqdn-named/hosts/moon/etc/ipsec.conf
index c32dfaf9b..6244e04fb 100755
--- a/testing/tests/rw-psk-fqdn-named/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/rw-psk-fqdn-named/hosts/moon/etc/ipsec.conf
@@ -4,6 +4,7 @@ version	2.0	# conforms to second version of ipsec.conf specification
 
 config setup
 	plutodebug=control
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/rw-psk-fqdn/hosts/carol/etc/ipsec.conf b/testing/tests/rw-psk-fqdn/hosts/carol/etc/ipsec.conf
index da5e198a8..9ae925cf6 100755
--- a/testing/tests/rw-psk-fqdn/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/rw-psk-fqdn/hosts/carol/etc/ipsec.conf
@@ -4,6 +4,7 @@ version	2.0	# conforms to second version of ipsec.conf specification
 
 config setup
 	plutodebug=control
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/rw-psk-fqdn/hosts/moon/etc/ipsec.conf b/testing/tests/rw-psk-fqdn/hosts/moon/etc/ipsec.conf
index 9a894806c..bb0eec7f1 100755
--- a/testing/tests/rw-psk-fqdn/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/rw-psk-fqdn/hosts/moon/etc/ipsec.conf
@@ -4,6 +4,7 @@ version	2.0	# conforms to second version of ipsec.conf specification
 
 config setup
 	plutodebug=control
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/rw-psk-ipv4/hosts/carol/etc/ipsec.conf b/testing/tests/rw-psk-ipv4/hosts/carol/etc/ipsec.conf
index 2c0227b7a..57ae965c9 100755
--- a/testing/tests/rw-psk-ipv4/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/rw-psk-ipv4/hosts/carol/etc/ipsec.conf
@@ -4,6 +4,7 @@ version	2.0	# conforms to second version of ipsec.conf specification
 
 config setup
 	plutodebug=control
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/rw-psk-ipv4/hosts/moon/etc/ipsec.conf b/testing/tests/rw-psk-ipv4/hosts/moon/etc/ipsec.conf
index a75d4e222..fd6d6192a 100755
--- a/testing/tests/rw-psk-ipv4/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/rw-psk-ipv4/hosts/moon/etc/ipsec.conf
@@ -4,6 +4,7 @@ version	2.0	# conforms to second version of ipsec.conf specification
 
 config setup
 	plutodebug=control
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/rw-psk-no-policy/hosts/carol/etc/ipsec.conf b/testing/tests/rw-psk-no-policy/hosts/carol/etc/ipsec.conf
index 413eff762..8d402d740 100755
--- a/testing/tests/rw-psk-no-policy/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/rw-psk-no-policy/hosts/carol/etc/ipsec.conf
@@ -4,6 +4,7 @@ version	2.0	# conforms to second version of ipsec.conf specification
 
 config setup
 	plutodebug=control
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/rw-psk-no-policy/hosts/moon/etc/ipsec.conf b/testing/tests/rw-psk-no-policy/hosts/moon/etc/ipsec.conf
index ac63abdc9..196968e07 100755
--- a/testing/tests/rw-psk-no-policy/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/rw-psk-no-policy/hosts/moon/etc/ipsec.conf
@@ -4,6 +4,7 @@ version	2.0	# conforms to second version of ipsec.conf specification
 
 config setup
 	plutodebug=control
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/rw-psk-rsa-mixed/hosts/carol/etc/ipsec.conf b/testing/tests/rw-psk-rsa-mixed/hosts/carol/etc/ipsec.conf
index 69e13b538..d1abc5b6d 100755
--- a/testing/tests/rw-psk-rsa-mixed/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/rw-psk-rsa-mixed/hosts/carol/etc/ipsec.conf
@@ -4,6 +4,7 @@ version	2.0	# conforms to second version of ipsec.conf specification
 
 config setup
 	plutodebug=control
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/rw-psk-rsa-mixed/hosts/moon/etc/ipsec.conf b/testing/tests/rw-psk-rsa-mixed/hosts/moon/etc/ipsec.conf
index b23248b5b..3268b1f7c 100755
--- a/testing/tests/rw-psk-rsa-mixed/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/rw-psk-rsa-mixed/hosts/moon/etc/ipsec.conf
@@ -4,6 +4,7 @@ version	2.0	# conforms to second version of ipsec.conf specification
 
 config setup
 	plutodebug=control
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/self-signed/hosts/carol/etc/ipsec.conf b/testing/tests/self-signed/hosts/carol/etc/ipsec.conf
index fcf7a1754..cb831c436 100755
--- a/testing/tests/self-signed/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/self-signed/hosts/carol/etc/ipsec.conf
@@ -7,6 +7,7 @@ config setup
 	crlcheckinterval=0
 	strictcrlpolicy=no
 	nocrsend=yes
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/self-signed/hosts/moon/etc/ipsec.conf b/testing/tests/self-signed/hosts/moon/etc/ipsec.conf
index 7d7f42b06..7665e7cf6 100755
--- a/testing/tests/self-signed/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/self-signed/hosts/moon/etc/ipsec.conf
@@ -7,6 +7,7 @@ config setup
 	crlcheckinterval=0
 	strictcrlpolicy=no
 	nocrsend=yes
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
@@ -15,7 +16,7 @@ conn %default
 	keyingtries=1
 
 conn carol
-	left=192.168.0.1
+	left=PH_IP_MOON
 	leftnexthop=%direct
 	leftcert=moonCert.der
 	leftid=@moon.strongswan.org
diff --git a/testing/tests/starter-also-loop/hosts/moon/etc/ipsec.conf b/testing/tests/starter-also-loop/hosts/moon/etc/ipsec.conf
index e1d210253..e7731ddb9 100755
--- a/testing/tests/starter-also-loop/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/starter-also-loop/hosts/moon/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
@@ -30,7 +31,7 @@ conn rw
 	auto=add
 
 conn moon
-	left=192.168.0.1
+	left=PH_IP_MOON
         leftnexthop=%direct
         leftcert=moonCert.pem
         leftid=@moon.strongswan.org
@@ -41,7 +42,7 @@ conn moon-net
 	leftsubnet=10.1.0.0/16
 
 conn sun
-	right=192.168.0.2
+	right=PH_IP_SUN
 	rightid=@sun.strongswan.org
 
 conn sun-net
diff --git a/testing/tests/starter-also/hosts/moon/etc/ipsec.conf b/testing/tests/starter-also/hosts/moon/etc/ipsec.conf
index 74d009cfa..7da271636 100755
--- a/testing/tests/starter-also/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/starter-also/hosts/moon/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
@@ -30,7 +31,7 @@ conn rw
 	auto=add
 
 conn moon
-	left=192.168.0.1
+	left=PH_IP_MOON
         leftnexthop=%direct
         leftcert=moonCert.pem
         leftid=@moon.strongswan.org
@@ -40,7 +41,7 @@ conn moon-net
 	leftsubnet=10.1.0.0/16
 
 conn sun
-	right=192.168.0.2
+	right=PH_IP_SUN
 	rightid=@sun.strongswan.org
 
 conn sun-net
diff --git a/testing/tests/starter-includes/hosts/carol/etc/ipsec.conf b/testing/tests/starter-includes/hosts/carol/etc/ipsec.conf
index 598997b45..b1d9a0813 100755
--- a/testing/tests/starter-includes/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/starter-includes/hosts/carol/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/starter-includes/hosts/dave/etc/ipsec.conf b/testing/tests/starter-includes/hosts/dave/etc/ipsec.conf
index da601389c..fcf690fb1 100755
--- a/testing/tests/starter-includes/hosts/dave/etc/ipsec.conf
+++ b/testing/tests/starter-includes/hosts/dave/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/starter-includes/hosts/moon/etc/ipsec.conf b/testing/tests/starter-includes/hosts/moon/etc/ipsec.conf
index aa9116252..f8f78aa11 100755
--- a/testing/tests/starter-includes/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/starter-includes/hosts/moon/etc/ipsec.conf
@@ -6,5 +6,6 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 include /etc/ipsec.connections
diff --git a/testing/tests/virtual-ip-swapped/hosts/carol/etc/ipsec.conf b/testing/tests/virtual-ip-swapped/hosts/carol/etc/ipsec.conf
index 0e239b707..980552d36 100755
--- a/testing/tests/virtual-ip-swapped/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/virtual-ip-swapped/hosts/carol/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/virtual-ip-swapped/hosts/moon/etc/ipsec.conf b/testing/tests/virtual-ip-swapped/hosts/moon/etc/ipsec.conf
index db6effbac..253c2989e 100755
--- a/testing/tests/virtual-ip-swapped/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/virtual-ip-swapped/hosts/moon/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/virtual-ip/hosts/carol/etc/ipsec.conf b/testing/tests/virtual-ip/hosts/carol/etc/ipsec.conf
index 2f1170a6b..73f2189b0 100755
--- a/testing/tests/virtual-ip/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/virtual-ip/hosts/carol/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/virtual-ip/hosts/moon/etc/ipsec.conf b/testing/tests/virtual-ip/hosts/moon/etc/ipsec.conf
index 1cd8aab25..5cdd21530 100755
--- a/testing/tests/virtual-ip/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/virtual-ip/hosts/moon/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/wildcards/hosts/carol/etc/ipsec.conf b/testing/tests/wildcards/hosts/carol/etc/ipsec.conf
index de179c565..1240dbfe7 100755
--- a/testing/tests/wildcards/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/wildcards/hosts/carol/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/wildcards/hosts/dave/etc/ipsec.conf b/testing/tests/wildcards/hosts/dave/etc/ipsec.conf
index 2fb6a301e..eb972c854 100755
--- a/testing/tests/wildcards/hosts/dave/etc/ipsec.conf
+++ b/testing/tests/wildcards/hosts/dave/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/wildcards/hosts/moon/etc/ipsec.conf b/testing/tests/wildcards/hosts/moon/etc/ipsec.conf
index ee7bc8115..90bf48d83 100755
--- a/testing/tests/wildcards/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/wildcards/hosts/moon/etc/ipsec.conf
@@ -6,6 +6,7 @@ config setup
 	plutodebug=control
 	crlcheckinterval=180
 	strictcrlpolicy=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/wlan/hosts/alice/etc/ipsec.conf b/testing/tests/wlan/hosts/alice/etc/ipsec.conf
index a658e4fe8..9c3003f43 100755
--- a/testing/tests/wlan/hosts/alice/etc/ipsec.conf
+++ b/testing/tests/wlan/hosts/alice/etc/ipsec.conf
@@ -7,6 +7,7 @@ config setup
 	crlcheckinterval=180
 	strictcrlpolicy=no
 	nat_traversal=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/wlan/hosts/moon/etc/ipsec.conf b/testing/tests/wlan/hosts/moon/etc/ipsec.conf
index f873479e8..0a6c491b1 100755
--- a/testing/tests/wlan/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/wlan/hosts/moon/etc/ipsec.conf
@@ -7,6 +7,7 @@ config setup
 	crlcheckinterval=180
 	strictcrlpolicy=no
 	nat_traversal=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m
diff --git a/testing/tests/wlan/hosts/venus/etc/ipsec.conf b/testing/tests/wlan/hosts/venus/etc/ipsec.conf
index 742c1dbce..bf0f423c6 100755
--- a/testing/tests/wlan/hosts/venus/etc/ipsec.conf
+++ b/testing/tests/wlan/hosts/venus/etc/ipsec.conf
@@ -7,6 +7,7 @@ config setup
 	crlcheckinterval=180
 	strictcrlpolicy=no
 	nat_traversal=no
+	charonstart=no
 
 conn %default
 	ikelifetime=60m