From c7f1b0530b85bc7654e68992f25ed8ced5d0a80d Mon Sep 17 00:00:00 2001
From: Rene Mayrhofer <rene@mayrhofer.eu.org>
Date: Fri, 5 Dec 2008 16:15:54 +0000
Subject: [svn-upgrade] Integrating new upstream version, strongswan (4.2.9)

---
 testing/tests/ikev2/net2net-route/evaltest.dat                   | 2 +-
 testing/tests/ikev2/net2net-route/hosts/moon/etc/strongswan.conf | 2 +-
 testing/tests/ikev2/net2net-route/hosts/sun/etc/strongswan.conf  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'testing/tests/ikev2/net2net-route')

diff --git a/testing/tests/ikev2/net2net-route/evaltest.dat b/testing/tests/ikev2/net2net-route/evaltest.dat
index d5350467e..a89e5a298 100644
--- a/testing/tests/ikev2/net2net-route/evaltest.dat
+++ b/testing/tests/ikev2/net2net-route/evaltest.dat
@@ -1,4 +1,4 @@
-moon::cat /var/log/daemon.log::creating acquire job for CHILD_SA::YES
+moon::cat /var/log/daemon.log::creating acquire job::YES
 moon::ipsec statusall::net-net.*INSTALLED::YES
 sun::ipsec statusall::net-net.*INSTALLED::YES
 alice::ping -c 1 PH_IP_BOB::64 bytes from PH_IP_BOB: icmp_seq=1::YES
diff --git a/testing/tests/ikev2/net2net-route/hosts/moon/etc/strongswan.conf b/testing/tests/ikev2/net2net-route/hosts/moon/etc/strongswan.conf
index ef63f7262..40eb84b8a 100644
--- a/testing/tests/ikev2/net2net-route/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/ikev2/net2net-route/hosts/moon/etc/strongswan.conf
@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink
+  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink updown
 }
diff --git a/testing/tests/ikev2/net2net-route/hosts/sun/etc/strongswan.conf b/testing/tests/ikev2/net2net-route/hosts/sun/etc/strongswan.conf
index ef63f7262..40eb84b8a 100644
--- a/testing/tests/ikev2/net2net-route/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/ikev2/net2net-route/hosts/sun/etc/strongswan.conf
@@ -1,5 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink
+  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink updown
 }
-- 
cgit v1.2.3