summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2003-02-19 22:55:34 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2003-02-19 22:55:34 +0000
commit5cc5d4e6ff86b5a94e82c83da52ab3b7a7335666 (patch)
tree4675ceff85ed9aa434fc25f3b3d10f0ee920f88c
parentfae0e45bccf3b6881af0af13e6c216cbee43af6e (diff)
adjust after pfctl changes; and test icmp version / address family mismatch
a bit better
-rw-r--r--regress/sbin/pfctl/pfail2.in3
-rw-r--r--regress/sbin/pfctl/pfail2.ok9
-rw-r--r--regress/sbin/pfctl/pfail3.ok2
-rw-r--r--regress/sbin/pfctl/pfail5.ok2
4 files changed, 11 insertions, 5 deletions
diff --git a/regress/sbin/pfctl/pfail2.in b/regress/sbin/pfctl/pfail2.in
index c380e7b711b..c8d9a547d8a 100644
--- a/regress/sbin/pfctl/pfail2.in
+++ b/regress/sbin/pfctl/pfail2.in
@@ -1 +1,4 @@
+# test address family / icmp version mismatches
+
pass in inet6 proto icmp all
+pass inet proto icmp6
diff --git a/regress/sbin/pfctl/pfail2.ok b/regress/sbin/pfctl/pfail2.ok
index b4232866eeb..b3dbe028438 100644
--- a/regress/sbin/pfctl/pfail2.ok
+++ b/regress/sbin/pfctl/pfail2.ok
@@ -1,4 +1,7 @@
-stdin:1: icmp version does not match address family
-stdin:1: skipping rule due to errors
-stdin:1: rule expands to no valid combination
+stdin:3: proto icmp doesn't match address family inet6
+stdin:3: skipping rule due to errors
+stdin:3: rule expands to no valid combination
+stdin:4: proto icmp6 doesn't match address family inet
+stdin:4: skipping rule due to errors
+stdin:4: rule expands to no valid combination
pfctl: Syntax error in file: pf rules not loaded
diff --git a/regress/sbin/pfctl/pfail3.ok b/regress/sbin/pfctl/pfail3.ok
index b4232866eeb..3cede88a87b 100644
--- a/regress/sbin/pfctl/pfail3.ok
+++ b/regress/sbin/pfctl/pfail3.ok
@@ -1,4 +1,4 @@
-stdin:1: icmp version does not match address family
+stdin:1: proto icmp6 doesn't match address family inet
stdin:1: skipping rule due to errors
stdin:1: rule expands to no valid combination
pfctl: Syntax error in file: pf rules not loaded
diff --git a/regress/sbin/pfctl/pfail5.ok b/regress/sbin/pfctl/pfail5.ok
index b4232866eeb..3cede88a87b 100644
--- a/regress/sbin/pfctl/pfail5.ok
+++ b/regress/sbin/pfctl/pfail5.ok
@@ -1,4 +1,4 @@
-stdin:1: icmp version does not match address family
+stdin:1: proto icmp6 doesn't match address family inet
stdin:1: skipping rule due to errors
stdin:1: rule expands to no valid combination
pfctl: Syntax error in file: pf rules not loaded