From 0410c3c3637d05788642ad7381d5659c45e658f1 Mon Sep 17 00:00:00 2001 From: Andreas Steffen Date: Wed, 1 Jun 2011 22:17:32 +0200 Subject: [PATCH] disable leak_detective in ikev2/rw-eap-tnc-11-radius scenario --- .../rw-eap-tnc-11-radius/hosts/alice/etc/strongswan.conf | 1 + .../ikev2/rw-eap-tnc-11-radius/hosts/carol/etc/ipsec.conf | 2 +- .../ikev2/rw-eap-tnc-11-radius/hosts/dave/etc/ipsec.conf | 2 +- testing/tests/ikev2/rw-eap-tnc-11-radius/posttest.dat | 2 +- testing/tests/ikev2/rw-eap-tnc-11-radius/pretest.dat | 6 +++--- 5 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/alice/etc/strongswan.conf diff --git a/testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/alice/etc/strongswan.conf b/testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/alice/etc/strongswan.conf new file mode 100644 index 0000000000..e79fe2c92d --- /dev/null +++ b/testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/alice/etc/strongswan.conf @@ -0,0 +1 @@ +# /etc/strongswan.conf - strongSwan configuration file diff --git a/testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/carol/etc/ipsec.conf b/testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/carol/etc/ipsec.conf index 9cf2b43c48..f9a508a1db 100755 --- a/testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/carol/etc/ipsec.conf +++ b/testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/carol/etc/ipsec.conf @@ -2,7 +2,7 @@ config setup plutostart=no - charondebug="tls 2, tnc 3" + charondebug="tnc 3" conn %default ikelifetime=60m diff --git a/testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/dave/etc/ipsec.conf b/testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/dave/etc/ipsec.conf index 998e6c2e58..74e0d1a567 100755 --- a/testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/dave/etc/ipsec.conf +++ b/testing/tests/ikev2/rw-eap-tnc-11-radius/hosts/dave/etc/ipsec.conf @@ -2,7 +2,7 @@ config setup plutostart=no - charondebug="tls 2, tnc 3" + charondebug="tnc 3" conn %default ikelifetime=60m diff --git a/testing/tests/ikev2/rw-eap-tnc-11-radius/posttest.dat b/testing/tests/ikev2/rw-eap-tnc-11-radius/posttest.dat index 1327521194..86bd89deaf 100644 --- a/testing/tests/ikev2/rw-eap-tnc-11-radius/posttest.dat +++ b/testing/tests/ikev2/rw-eap-tnc-11-radius/posttest.dat @@ -1,7 +1,7 @@ moon::ipsec stop carol::ipsec stop dave::ipsec stop -alice::/etc/init.d/radiusd stop +alice::killall radiusd alice::rm /etc/raddb/sites-enabled/inner-tunnel-second moon::/etc/init.d/iptables stop 2> /dev/null carol::/etc/init.d/iptables stop 2> /dev/null diff --git a/testing/tests/ikev2/rw-eap-tnc-11-radius/pretest.dat b/testing/tests/ikev2/rw-eap-tnc-11-radius/pretest.dat index 8dd8658195..56136f00f8 100644 --- a/testing/tests/ikev2/rw-eap-tnc-11-radius/pretest.dat +++ b/testing/tests/ikev2/rw-eap-tnc-11-radius/pretest.dat @@ -3,15 +3,15 @@ carol::/etc/init.d/iptables start 2> /dev/null dave::/etc/init.d/iptables start 2> /dev/null alice::ln -s /etc/raddb/sites-available/inner-tunnel-second /etc/raddb/sites-enabled/inner-tunnel-second alice::cat /etc/raddb/sites-enabled/inner-tunnel-second -alice::/etc/init.d/radiusd start +alice::LEAK_DETECTIVE_DISABLE=1 radiusd alice::cat /etc/tnc_config carol::cat /etc/tnc_config dave::cat /etc/tnc_config carol::cat /etc/tnc/dummyimc.file dave::cat /etc/tnc/dummyimc.file moon::ipsec start -carol::ipsec start -dave::ipsec start +carol::LEAK_DETECTIVE_DISABLE=1 ipsec start +dave::LEAK_DETECTIVE_DISABLE=1 ipsec start carol::sleep 1 carol::ipsec up home dave::ipsec up home