summaryrefslogtreecommitdiff
path: root/regress/sbin/pfctl
diff options
context:
space:
mode:
authorMarco Pfatschbacher <mpf@cvs.openbsd.org>2005-05-28 19:36:01 +0000
committerMarco Pfatschbacher <mpf@cvs.openbsd.org>2005-05-28 19:36:01 +0000
commit1c897daf810cf36fbcd51de5e5452240bf8ef9c5 (patch)
treed10fd604693979de9f1e8d47256a8203b667300e /regress/sbin/pfctl
parent156c4abbf680251e38e196855edea29b127d5956 (diff)
change "log-all" to "log (all)"
ok dhartmei@
Diffstat (limited to 'regress/sbin/pfctl')
-rw-r--r--regress/sbin/pfctl/pf28.in12
-rw-r--r--regress/sbin/pfctl/pf28.loaded6
-rw-r--r--regress/sbin/pfctl/pf28.ok3
-rw-r--r--regress/sbin/pfctl/pf28.optimized6
-rw-r--r--regress/sbin/pfctl/pf80.in6
-rw-r--r--regress/sbin/pfctl/pf80.loaded6
-rw-r--r--regress/sbin/pfctl/pf80.ok3
-rw-r--r--regress/sbin/pfctl/pf80.optimized6
8 files changed, 27 insertions, 21 deletions
diff --git a/regress/sbin/pfctl/pf28.in b/regress/sbin/pfctl/pf28.in
index f2d67a2105b..cfcc0b95220 100644
--- a/regress/sbin/pfctl/pf28.in
+++ b/regress/sbin/pfctl/pf28.in
@@ -1,7 +1,7 @@
# test logging keywords, and log quick/quick log order
-block in log-all quick on lo0 all
-block in quick log on lo0 all
-block in quick log-all on lo0 all
-block in log quick on lo0 all
-block in log on lo0 all
-block in log-all on lo0 all
+block in log (all) quick on lo0 all
+block in quick log on lo0 all
+block in quick log (all) on lo0 all
+block in log quick on lo0 all
+block in log on lo0 all
+block in log (all) on lo0 all
diff --git a/regress/sbin/pfctl/pf28.loaded b/regress/sbin/pfctl/pf28.loaded
index ec72ec92ace..116076ae840 100644
--- a/regress/sbin/pfctl/pf28.loaded
+++ b/regress/sbin/pfctl/pf28.loaded
@@ -1,4 +1,4 @@
-@0 block drop in log-all quick on lo0 all
+@0 block drop in log (all) quick on lo0 all
[ 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 ]
@@ -6,7 +6,7 @@
[ 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 ]
-@2 block drop in log-all quick on lo0 all
+@2 block drop in log (all) quick on lo0 all
[ 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 ]
@@ -18,7 +18,7 @@
[ 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 ]
-@5 block drop in log-all on lo0 all
+@5 block drop in log (all) on lo0 all
[ 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/pf28.ok b/regress/sbin/pfctl/pf28.ok
index 282eb39f96e..ff6ca332dff 100644
--- a/regress/sbin/pfctl/pf28.ok
+++ b/regress/sbin/pfctl/pf28.ok
@@ -1,3 +1,6 @@
+block drop in log (all) quick on lo0 all
block drop in log quick on lo0 all
+block drop in log (all) quick on lo0 all
block drop in log quick on lo0 all
block drop in log on lo0 all
+block drop in log (all) on lo0 all
diff --git a/regress/sbin/pfctl/pf28.optimized b/regress/sbin/pfctl/pf28.optimized
index ec72ec92ace..116076ae840 100644
--- a/regress/sbin/pfctl/pf28.optimized
+++ b/regress/sbin/pfctl/pf28.optimized
@@ -1,4 +1,4 @@
-@0 block drop in log-all quick on lo0 all
+@0 block drop in log (all) quick on lo0 all
[ 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 ]
@@ -6,7 +6,7 @@
[ 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 ]
-@2 block drop in log-all quick on lo0 all
+@2 block drop in log (all) quick on lo0 all
[ 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 ]
@@ -18,7 +18,7 @@
[ 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 ]
-@5 block drop in log-all on lo0 all
+@5 block drop in log (all) on lo0 all
[ 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/pf80.in b/regress/sbin/pfctl/pf80.in
index a4471b8c193..4a12835b8da 100644
--- a/regress/sbin/pfctl/pf80.in
+++ b/regress/sbin/pfctl/pf80.in
@@ -6,6 +6,6 @@ nat pass log on lo0 from 10/8 to 172.16/16 -> 172.16.0.1
rdr pass log on lo0 proto tcp from any to 1.2.3.4 port 80 -> 127.0.0.1 port 8080
binat pass log on lo0 from 10/8 to 11/8 -> 12/8
-nat pass log-all on lo0 from 10/8 to 172.16/16 -> 172.16.0.1
-rdr pass log-all on lo0 proto tcp from any to 1.2.3.4 port 80 -> 127.0.0.1 port 8080
-binat pass log-all on lo0 from 10/8 to 11/8 -> 12/8
+nat pass log (all) on lo0 from 10/8 to 172.16/16 -> 172.16.0.1
+rdr pass log (all) on lo0 proto tcp from any to 1.2.3.4 port 80 -> 127.0.0.1 port 8080
+binat pass log (all) on lo0 from 10/8 to 11/8 -> 12/8
diff --git a/regress/sbin/pfctl/pf80.loaded b/regress/sbin/pfctl/pf80.loaded
index cd48bc92f2e..48457ff1edd 100644
--- a/regress/sbin/pfctl/pf80.loaded
+++ b/regress/sbin/pfctl/pf80.loaded
@@ -6,7 +6,7 @@
[ 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 ]
-@2 nat pass log-all on lo0 inet from 10.0.0.0/8 to 172.16.0.0/16 -> 172.16.0.1
+@2 nat pass log (all) on lo0 inet from 10.0.0.0/8 to 172.16.0.0/16 -> 172.16.0.1
[ 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 ]
@@ -18,7 +18,7 @@
[ 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 ]
-@2 rdr pass log-all on lo0 inet proto tcp from any to 1.2.3.4 port = www -> 127.0.0.1 port 8080
+@2 rdr pass log (all) on lo0 inet proto tcp from any to 1.2.3.4 port = www -> 127.0.0.1 port 8080
[ 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 ]
@@ -30,7 +30,7 @@
[ 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 ]
-@2 binat pass log-all on lo0 inet from 10.0.0.0/8 to 11.0.0.0/8 -> 12.0.0.0/8
+@2 binat pass log (all) on lo0 inet from 10.0.0.0/8 to 11.0.0.0/8 -> 12.0.0.0/8
[ 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/pf80.ok b/regress/sbin/pfctl/pf80.ok
index 58318f9f613..b21bcca4b3f 100644
--- a/regress/sbin/pfctl/pf80.ok
+++ b/regress/sbin/pfctl/pf80.ok
@@ -4,3 +4,6 @@ binat pass on lo0 inet from 10.0.0.0/8 to 11.0.0.0/8 -> 12.0.0.0/8
nat pass log on lo0 inet from 10.0.0.0/8 to 172.16.0.0/16 -> 172.16.0.1
rdr pass log on lo0 inet proto tcp from any to 1.2.3.4 port = www -> 127.0.0.1 port 8080
binat pass log on lo0 inet from 10.0.0.0/8 to 11.0.0.0/8 -> 12.0.0.0/8
+nat pass log (all) on lo0 inet from 10.0.0.0/8 to 172.16.0.0/16 -> 172.16.0.1
+rdr pass log (all) on lo0 inet proto tcp from any to 1.2.3.4 port = www -> 127.0.0.1 port 8080
+binat pass log (all) on lo0 inet from 10.0.0.0/8 to 11.0.0.0/8 -> 12.0.0.0/8
diff --git a/regress/sbin/pfctl/pf80.optimized b/regress/sbin/pfctl/pf80.optimized
index cd48bc92f2e..48457ff1edd 100644
--- a/regress/sbin/pfctl/pf80.optimized
+++ b/regress/sbin/pfctl/pf80.optimized
@@ -6,7 +6,7 @@
[ 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 ]
-@2 nat pass log-all on lo0 inet from 10.0.0.0/8 to 172.16.0.0/16 -> 172.16.0.1
+@2 nat pass log (all) on lo0 inet from 10.0.0.0/8 to 172.16.0.0/16 -> 172.16.0.1
[ 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 ]
@@ -18,7 +18,7 @@
[ 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 ]
-@2 rdr pass log-all on lo0 inet proto tcp from any to 1.2.3.4 port = www -> 127.0.0.1 port 8080
+@2 rdr pass log (all) on lo0 inet proto tcp from any to 1.2.3.4 port = www -> 127.0.0.1 port 8080
[ 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 ]
@@ -30,7 +30,7 @@
[ 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 ]
-@2 binat pass log-all on lo0 inet from 10.0.0.0/8 to 11.0.0.0/8 -> 12.0.0.0/8
+@2 binat pass log (all) on lo0 inet from 10.0.0.0/8 to 11.0.0.0/8 -> 12.0.0.0/8
[ 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 ]