we decided numbers used as strings is wrong

3 files changed, 36 insertions, 3 deletions

diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile
index e206bb68acc..3a9d39192c1 100644
--- a/regress/sbin/pfctl/Makefile
+++ b/regress/sbin/pfctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.199 2007/09/23 21:00:00 mpf Exp $
+# $OpenBSD: Makefile,v 1.200 2007/10/13 16:54:43 deraadt Exp $
 
 # TARGETS
 # pf: feed pfNN.in through pfctl and check wether the output matches pfNN.ok
@@ -14,9 +14,9 @@
 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 60 61 62 63 64 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
+PFTESTS+=74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94
 PFFAIL=1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 23 24 25 27
-PFFAIL+=28 29 30 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52
+PFFAIL+=28 29 30 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53
 PFSIMPLE=1 2
 PFSETUP=1 2 3 4
 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/pfail53.in b/regress/sbin/pfctl/pfail53.in
new file mode 100644
index 00000000000..049e68fedce
--- /dev/null
+++ b/regress/sbin/pfctl/pfail53.in
@@ -0,0 +1,24 @@
+set require-order no
+
+# varset allows concatenated strings as numbers
+myports = 55 66
+pass in proto tcp from any to any port { $myports }
+
+# queuenames can be numbers
+altq on lo0 tbrsize 1824 bandwidth 10Mb priq queue 80
+queue 80 priority 2 priq(default)
+
+# tablenames can be numbers
+table <444> { 1.2.3.4 }
+pass in on lo1000000 proto tcp to 10.0.0.1 port 80 flags S/SA modulate state \
+        (max-src-conn 100, max-src-conn-rate 10/5, overload <444> flush)
+
+# filename can be a number
+# XXX not easy to test
+#table <filetest> file 666
+
+# labels, tags, anchors can be numbers
+pass in on lo0 from 1.2.3.4 keep state label 88
+pass in on lo0 from 1.2.3.4 keep state tag 57
+pass in on lo0 from 1.2.3.4 keep state tagged 57
+anchor 23 on lo0
diff --git a/regress/sbin/pfctl/pfail53.ok b/regress/sbin/pfctl/pfail53.ok
new file mode 100644
index 00000000000..2012a135ee9
--- /dev/null
+++ b/regress/sbin/pfctl/pfail53.ok
@@ -0,0 +1,9 @@
+stdin:4: syntax error
+stdin:5: macro 'myports' not defined
+stdin:5: syntax error
+stdin:8: syntax error
+stdin:21: syntax error
+stdin:22: syntax error
+stdin:23: syntax error
+set require-order no
+table <444> { 1.2.3.4 }