summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Weisgerber <naddy@cvs.openbsd.org>2006-08-29 23:15:02 +0000
committerChristian Weisgerber <naddy@cvs.openbsd.org>2006-08-29 23:15:02 +0000
commit38941469eea34610d230e3edd16b288e03b81fb0 (patch)
tree611afe4283d289059f4db3d2752422519ed7c449
parentb76e4d56522a7ad75802b1548ae342b00bcf4140 (diff)
Test for an as yet unresolved problem:
If list expansion produces peer pairings between different address families, this should be an error. Suggested by and ok hshoexer@
-rw-r--r--regress/sbin/ipsecctl/Makefile4
-rw-r--r--regress/sbin/ipsecctl/ikefail7.in2
-rw-r--r--regress/sbin/ipsecctl/ikefail7.ok2
3 files changed, 6 insertions, 2 deletions
diff --git a/regress/sbin/ipsecctl/Makefile b/regress/sbin/ipsecctl/Makefile
index 6961b629de7..f6653e03080 100644
--- a/regress/sbin/ipsecctl/Makefile
+++ b/regress/sbin/ipsecctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.41 2006/08/29 17:52:40 naddy Exp $
+# $OpenBSD: Makefile,v 1.42 2006/08/29 23:15:01 naddy Exp $
# TARGETS
# ipsec: feed ipsecNN.in through ipsecctl and check wether the output matches
@@ -14,7 +14,7 @@ TCPMD5TESTS=1 2 3
SATESTS=1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
SAFAIL=1 2
IPSECFAIL=1 2
-IKEFAIL=1 3 4 5 6
+IKEFAIL=1 3 4 5 6 7
IKETESTS=1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
IKETESTS+=16 17 18 19 20 21 22 23
IKETESTS+=29 30 31 32 33 34 35 36 37 38 39 40
diff --git a/regress/sbin/ipsecctl/ikefail7.in b/regress/sbin/ipsecctl/ikefail7.in
new file mode 100644
index 00000000000..e5bab74fad1
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikefail7.in
@@ -0,0 +1,2 @@
+# specifying peers from different address families should cause an error
+ike from 1.1.1.1 to { 3ffe::1, 2.2.2.2 }
diff --git a/regress/sbin/ipsecctl/ikefail7.ok b/regress/sbin/ipsecctl/ikefail7.ok
new file mode 100644
index 00000000000..32f6d9aed9b
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikefail7.ok
@@ -0,0 +1,2 @@
+stdin: 1: src and dst addresses do not match
+ipsecctl: Syntax error in config file: ipsec rules not loaded