cbq control keyword is gone

5 files changed, 4 insertions, 14 deletions

diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile
index e8131ca43b7..0f1712cab71 100644
--- a/regress/sbin/pfctl/Makefile
+++ b/regress/sbin/pfctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.103 2003/02/28 22:21:58 henning Exp $
+# $OpenBSD: Makefile,v 1.104 2003/03/02 12:38:15 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 31
+PFFAIL+=28 29 30
 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/pf33.in b/regress/sbin/pfctl/pf33.in
index a8a1c098629..c54583d6d7d 100644
--- a/regress/sbin/pfctl/pf33.in
+++ b/regress/sbin/pfctl/pf33.in
@@ -1,8 +1,7 @@
 ext_if = "lo0"
 
 altq on $ext_if cbq bandwidth 10Mb tbrsize 1824 \
-    queue { ctrl, deflt, http, ssh, mail, rsets }
-queue	ctrl bandwidth 5% priority 0 cbq(control)
+    queue { deflt, http, ssh, mail, rsets }
 queue	deflt bandwidth 10% priority 0 cbq(default ecn)
 queue	http bandwidth 1.5Mb priority 3 { http_vhosts, http_cust1 }
 queue	 http_vhosts bandwidth 40% cbq(borrow red)
diff --git a/regress/sbin/pfctl/pf33.ok b/regress/sbin/pfctl/pf33.ok
index aa811216ae1..c2ac3af6fcf 100644
--- a/regress/sbin/pfctl/pf33.ok
+++ b/regress/sbin/pfctl/pf33.ok
@@ -1,6 +1,5 @@
 ext_if = "lo0"
-altq on lo0 cbq bandwidth 10.00Mb tbrsize 1824 queue { ctrl deflt http ssh mail rsets }
-queue ctrl bandwidth 500.00Kb priority 0 cbq( control ) 
+altq on lo0 cbq bandwidth 10.00Mb tbrsize 1824 queue { deflt http ssh mail rsets }
 queue deflt bandwidth 1.00Mb priority 0 cbq( red ecn default ) 
 queue http bandwidth 1.50Mb priority 3 { http_vhosts http_cust1 }
 queue http_vhosts bandwidth 600.00Kb cbq( red borrow ) 
diff --git a/regress/sbin/pfctl/pfail31.in b/regress/sbin/pfctl/pfail31.in
deleted file mode 100644
index 55fb30f0fda..00000000000
--- a/regress/sbin/pfctl/pfail31.in
+++ /dev/null
@@ -1,4 +0,0 @@
-#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
deleted file mode 100644
index e81d2997ce4..00000000000
--- a/regress/sbin/pfctl/pfail31.ok
+++ /dev/null
@@ -1,4 +0,0 @@
-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 )