queue doubly defined on one interface, fails right now

(is later rejected at load time by the kernel, but pfctl should detect it)

3 files changed, 17 insertions, 2 deletions

diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile
index 1ecf435c350..3fd81b876b4 100644
--- a/regress/sbin/pfctl/Makefile
+++ b/regress/sbin/pfctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.109 2003/03/09 18:08:53 henning Exp $
+# $OpenBSD: Makefile,v 1.110 2003/03/10 12:07:01 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 58 59
 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 31 32
 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/pfail32.in b/regress/sbin/pfctl/pfail32.in
new file mode 100644
index 00000000000..ef4d07a246a
--- /dev/null
+++ b/regress/sbin/pfctl/pfail32.in
@@ -0,0 +1,4 @@
+# queue doubly defined on one interface
+altq on lo0 cbq bandwidth 100Kb queue { eins, zwei }
+queue eins cbq (default) { zwei }
+queue zwei
diff --git a/regress/sbin/pfctl/pfail32.ok b/regress/sbin/pfctl/pfail32.ok
new file mode 100644
index 00000000000..eab8966ee3b
--- /dev/null
+++ b/regress/sbin/pfctl/pfail32.ok
@@ -0,0 +1,11 @@
+pfctl: queue bandwidth must be larger than 123.77Kb
+cbq: queue root_lo0 is too slow!
+pfctl: queue bandwidth must be larger than 123.77Kb
+cbq: queue eins is too slow!
+pfctl: queue bandwidth must be larger than 123.77Kb
+cbq: queue zwei is too slow!
+Queue zwei already exists on interface lo0
+pfctl: Syntax error in file: pf rules not loaded
+altq on lo0 cbq bandwidth 100Kb tbrsize 33224 queue { eins zwei }
+queue eins cbq( default ) { zwei }
+queue zwei