summaryrefslogtreecommitdiff
path: root/regress/sbin
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2004-02-03 19:34:21 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2004-02-03 19:34:21 +0000
commit5260094632a7892b391cce5b69505dee01fdb0bd (patch)
treed70f10b13eee7f1400e5f13ee7cc51e4c6a9ebf5 /regress/sbin
parent03da1de98b14f9d54e5227b966599e0ad30b053f (diff)
you shall not forget committing regress fixes after fixing a bug
do not test for the questionable epxansion pfctl did with half IPs
Diffstat (limited to 'regress/sbin')
-rw-r--r--regress/sbin/pfctl/pf32.in1
-rw-r--r--regress/sbin/pfctl/pf32.loaded16
-rw-r--r--regress/sbin/pfctl/pf32.ok1
-rw-r--r--regress/sbin/pfctl/pfsimple2.in4
4 files changed, 8 insertions, 14 deletions
diff --git a/regress/sbin/pfctl/pf32.in b/regress/sbin/pfctl/pf32.in
index 535baee3156..333dafa72dd 100644
--- a/regress/sbin/pfctl/pf32.in
+++ b/regress/sbin/pfctl/pf32.in
@@ -1,5 +1,4 @@
pass in from 10/8 to any
-pass in from 10.1 to any
pass in from 10.1/8 to any
pass in from 192.168.37.29/25 to any
pass in from 192.168.37.29/24 to any
diff --git a/regress/sbin/pfctl/pf32.loaded b/regress/sbin/pfctl/pf32.loaded
index ba22d941533..8f597e5c5c2 100644
--- a/regress/sbin/pfctl/pf32.loaded
+++ b/regress/sbin/pfctl/pf32.loaded
@@ -1,28 +1,24 @@
@0 pass in inet from 10.0.0.0/8 to any
- [ Skip steps: i=end d=end f=end p=end sp=end da=end dp=end ]
- [ queue: qname= qid=0 pqname= pqid=0 ]
- [ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ]
-@1 pass in inet from 10.1.0.0/16 to any
- [ Skip steps: i=end d=end f=end p=end sp=end da=end dp=end ]
+ [ Skip steps: i=end d=end f=end p=end sa=2 sp=end da=end dp=end ]
[ queue: qname= qid=0 pqname= pqid=0 ]
[ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ]
-@2 pass in inet from 10.0.0.0/8 to any
+@1 pass in inet from 10.0.0.0/8 to any
[ Skip steps: i=end d=end f=end p=end sp=end da=end dp=end ]
[ queue: qname= qid=0 pqname= pqid=0 ]
[ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ]
-@3 pass in inet from 192.168.37.0/25 to any
+@2 pass in inet from 192.168.37.0/25 to any
[ Skip steps: i=end d=end f=end p=end sp=end da=end dp=end ]
[ queue: qname= qid=0 pqname= pqid=0 ]
[ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ]
-@4 pass in inet from 192.168.37.0/24 to any
+@3 pass in inet from 192.168.37.0/24 to any
[ Skip steps: i=end d=end f=end p=end sp=end da=end dp=end ]
[ queue: qname= qid=0 pqname= pqid=0 ]
[ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ]
-@5 pass in inet from 192.168.0.0/16 to any
+@4 pass in inet from 192.168.0.0/16 to any
[ Skip steps: i=end d=end f=end p=end sp=end da=end dp=end ]
[ queue: qname= qid=0 pqname= pqid=0 ]
[ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ]
-@6 pass in inet from 192.0.0.0/8 to any
+@5 pass in inet from 192.0.0.0/8 to any
[ Skip steps: i=end d=end f=end p=end sa=end sp=end da=end dp=end ]
[ queue: qname= qid=0 pqname= pqid=0 ]
[ Evaluations: 0 Packets: 0 Bytes: 0 States: 0 ]
diff --git a/regress/sbin/pfctl/pf32.ok b/regress/sbin/pfctl/pf32.ok
index d3c512f7c48..7274de9f47f 100644
--- a/regress/sbin/pfctl/pf32.ok
+++ b/regress/sbin/pfctl/pf32.ok
@@ -1,5 +1,4 @@
pass in inet from 10.0.0.0/8 to any
-pass in inet from 10.1.0.0/16 to any
pass in inet from 10.0.0.0/8 to any
pass in inet from 192.168.37.0/25 to any
pass in inet from 192.168.37.0/24 to any
diff --git a/regress/sbin/pfctl/pfsimple2.in b/regress/sbin/pfctl/pfsimple2.in
index 73e9e8b8135..4eda73ddc20 100644
--- a/regress/sbin/pfctl/pfsimple2.in
+++ b/regress/sbin/pfctl/pfsimple2.in
@@ -3,5 +3,5 @@ table <regress> persist file "/dev/null"
table <regress> persist file "/dev/null" file "/dev/null"
table <regress> persist { !127.0.0.1 } file "/dev/null"
table <regress> persist file "/dev/null" { 3.3.3.3 }
-table <regress> persist { 11 } file "/dev/null" { !12 }
-table <regress> { 10 } const file "/dev/null" persist
+table <regress> persist { 10.0.0.1 } file "/dev/null" { !10.0.0.12 }
+table <regress> { 10.0.0.1 } const file "/dev/null" persist