when you specify queues in a rule, make sure they have been defined.

DIOCADDRULE EBUSY turns into an error message that pfctl -n catches.
DIOCXCOMMIT EINVAL after the kernel rejected the rules was reported
to occur, possibly from hfsc.c: this should be fixed as well.

ok henning mikeb sthen

3 files changed, 6 insertions, 2 deletions

diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile
index a8c365ebf30..56ab9f909d5 100644
--- a/regress/sbin/pfctl/Makefile
+++ b/regress/sbin/pfctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.219 2014/04/18 10:48:23 henning Exp $
+# $OpenBSD: Makefile,v 1.220 2014/08/23 00:11:03 pelikan Exp $
 
 # TARGETS
 # pf: feed pfNN.in through pfctl and check whether the output matches pfNN.ok
@@ -18,7 +18,7 @@ PFTESTS+=52 53 54 55 56 57 60 61 65 66 67 68 69 70 71 72 73
 PFTESTS+=74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96
 PFTESTS+=97 98 99 100 101
 PFFAIL=1 2 3 4 5 6 7 8 11 12 13 14 15 16 17 19 20 23 25 27
-PFFAIL+=30 37 38 39 40 41 42 43 47 48 49 50 51 52 53
+PFFAIL+=30 37 38 39 40 41 42 43 47 48 49 50 51 52 53 54
 PFSIMPLE=1 2
 PFSETUP=1 4
 PFLOAD=1 2 3 4 5 7 8 9 10 11 12 13 14 15 16 17 18 19 20 23 24 25 26 27 28 29
diff --git a/regress/sbin/pfctl/pfail54.in b/regress/sbin/pfctl/pfail54.in
new file mode 100644
index 00000000000..6cfa5da97e0
--- /dev/null
+++ b/regress/sbin/pfctl/pfail54.in
@@ -0,0 +1,3 @@
+queue root on lo1000000 bandwidth 1G
+queue def on lo1000000 parent root bandwidth 1M default
+pass set queue x
diff --git a/regress/sbin/pfctl/pfail54.ok b/regress/sbin/pfctl/pfail54.ok
new file mode 100644
index 00000000000..075eb1a507c
--- /dev/null
+++ b/regress/sbin/pfctl/pfail54.ok
@@ -0,0 +1 @@
+stdin:3: queue x is not defined