test opts in another than the classical order

3 files changed, 49 insertions, 2 deletions

diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile
index 21766cbb1ce..fafb977383e 100644
--- a/regress/sbin/pfctl/Makefile
+++ b/regress/sbin/pfctl/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.47 2002/12/02 09:43:25 deraadt Exp $
+# $OpenBSD: Makefile,v 1.48 2002/12/04 11:35:41 henning Exp $
 
 PFTESTS=1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27
-PFTESTS+=28 29 30 31 32 33 34 35 36 37 38
+PFTESTS+=28 29 30 31 32 33 34 35 36 37 38 39
 PFFAIL=1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
 PFSIMPLE=1 2
 PFSETUP=1
diff --git a/regress/sbin/pfctl/pf39.in b/regress/sbin/pfctl/pf39.in
new file mode 100644
index 00000000000..4212df1ef6b
--- /dev/null
+++ b/regress/sbin/pfctl/pf39.in
@@ -0,0 +1,24 @@
+#test random ordered opts
+
+body1="pass in log quick on lo0 inet proto icmp all "
+body2="pass in log quick on lo0 inet proto tcp all "
+o_user="user root "
+o_user2="user bin "
+o_group="group wheel "
+o_group2="group nobody "
+o_flags="flags S/SA "
+o_icmpspec="icmp-type 0 code 0 "
+o_tos="tos 0x08 "
+o_keep="keep state "
+o_fragment="fragment "
+o_allowopts="allow-opts "
+o_label="label blah"
+o_qname="queue blah"
+
+$body2 $o_fragment $o_keep $o_label $o_tos
+$body1 $o_user $o_qname $o_tos $o_keep $o_group $o_label $o_allowopts \
+$o_user2 $o_icmpspec $o_group2
+$body2 $o_keep
+$body2 $o_label $o_keep $o_qname $o_tos
+$body1 $o_icmpspec $o_tos
+$body2 $o_flags $o_allowopts 
diff --git a/regress/sbin/pfctl/pf39.ok b/regress/sbin/pfctl/pf39.ok
new file mode 100644
index 00000000000..2ee41f82337
--- /dev/null
+++ b/regress/sbin/pfctl/pf39.ok
@@ -0,0 +1,23 @@
+body1 = pass in log quick on lo0 inet proto icmp all 
+body2 = pass in log quick on lo0 inet proto tcp all 
+o_user = user root 
+o_user2 = user bin 
+o_group = group wheel 
+o_group2 = group nobody 
+o_flags = flags S/SA 
+o_icmpspec = icmp-type 0 code 0 
+o_tos = tos 0x08 
+o_keep = keep state 
+o_fragment = fragment 
+o_allowopts = allow-opts 
+o_label = label blah
+o_qname = queue blah
+@0 pass in log quick on lo0 inet proto tcp all tos 0x08 keep state fragment label blah 
+@1 pass in log quick on lo0 inet proto icmp all user = 3 group = 32767 icmp-type echorep code 0 tos 0x08 keep state allow-opts label blah queue blah
+@2 pass in log quick on lo0 inet proto icmp all user = 3 group = 0 icmp-type echorep code 0 tos 0x08 keep state allow-opts label blah queue blah
+@3 pass in log quick on lo0 inet proto icmp all user = 0 group = 32767 icmp-type echorep code 0 tos 0x08 keep state allow-opts label blah queue blah
+@4 pass in log quick on lo0 inet proto icmp all user = 0 group = 0 icmp-type echorep code 0 tos 0x08 keep state allow-opts label blah queue blah
+@5 pass in log quick on lo0 inet proto tcp all keep state 
+@6 pass in log quick on lo0 inet proto tcp all tos 0x08 keep state label blah queue blah
+@7 pass in log quick on lo0 inet proto icmp all icmp-type echorep code 0 tos 0x08 
+@8 pass in log quick on lo0 inet proto tcp all flags S/SA allow-opts