a cbq queue cannot be both default and control queue

fails right now

3 files changed, 10 insertions, 2 deletions

diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile
index 62f2ce7631b..e8131ca43b7 100644
--- a/regress/sbin/pfctl/Makefile
+++ b/regress/sbin/pfctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.102 2003/02/28 21:25:22 henning Exp $
+# $OpenBSD: Makefile,v 1.103 2003/02/28 22:21:58 henning Exp $
 
 # TARGETS
 # pf: feed pfNN.in through pfctl and check wether the output matches pfNN.ok
@@ -14,7 +14,7 @@ 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 39 40 41 42 43 44 45 46 47 48 49 50
 PFTESTS+=51 52 53 54 55 56 57
 PFFAIL=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
-PFFAIL+=28 29 30
+PFFAIL+=28 29 30 31
 PFSIMPLE=1 2
 PFSETUP=1 2 3
 PFLOAD=1 2 3 4 5 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 23 24 25 26 27 28 29
diff --git a/regress/sbin/pfctl/pfail31.in b/regress/sbin/pfctl/pfail31.in
new file mode 100644
index 00000000000..55fb30f0fda
--- /dev/null
+++ b/regress/sbin/pfctl/pfail31.in
@@ -0,0 +1,4 @@
+#queue cannot be both default and control
+
+altq on lo0 bandwidth 1Mb cbq queue yayayaya
+queue yayayaya cbq(default control)
diff --git a/regress/sbin/pfctl/pfail31.ok b/regress/sbin/pfctl/pfail31.ok
new file mode 100644
index 00000000000..e81d2997ce4
--- /dev/null
+++ b/regress/sbin/pfctl/pfail31.ok
@@ -0,0 +1,4 @@
+queue yayayaya: cannot be both default and control queue
+pfctl: Syntax error in file: pf rules not loaded
+altq on lo0 cbq bandwidth 1.00Mb tbrsize 33224 queue { yayayaya }
+queue root_lo0 bandwidth 1.00Mb priority 0 cbq( wrr root )