sync with output format changes (pfctl)

7 files changed, 108 insertions, 108 deletions

diff --git a/regress/sbin/pfctl/pf1.ok b/regress/sbin/pfctl/pf1.ok
index 746117aefb7..dd6719b7a3a 100644
--- a/regress/sbin/pfctl/pf1.ok
+++ b/regress/sbin/pfctl/pf1.ok
@@ -1,5 +1,5 @@
-@1 pass in all 
-@1 pass in all 
-@1 pass in proto tcp from any port <= 1024 to any 
-@1 pass in proto tcp from any to any port = smtp 
-@1 pass in proto tcp from 10.0.0.0/255.0.0.0 port > 1024 to ! 10.1.2.3 port != ssh 
+@0 pass in all 
+@0 pass in all 
+@0 pass in proto tcp from any port <= 1024 to any 
+@0 pass in proto tcp from any to any port = smtp 
+@0 pass in proto tcp from 10.0.0.0/255.0.0.0 port > 1024 to ! 10.1.2.3 port != ssh 
diff --git a/regress/sbin/pfctl/pf2.ok b/regress/sbin/pfctl/pf2.ok
index 29ae432136e..d4b2d22cc8c 100644
--- a/regress/sbin/pfctl/pf2.ok
+++ b/regress/sbin/pfctl/pf2.ok
@@ -1,21 +1,21 @@
-@1 block out log on kue0 all 
-@1 block in log on kue0 all 
-@1 block return-rst out log on kue0 proto tcp all 
-@1 block return-rst in log on kue0 proto tcp all 
-@1 block return-icmp out log on kue0 proto udp all 
-@1 block return-icmp in log on kue0 proto udp all 
-@1 block out log quick on kue0 from ! 157.161.48.183 to any 
-@1 block in quick on kue0 from any to 255.255.255.255 
-@1 block in log quick on kue0 from 10.0.0.0/255.0.0.0 to any 
-@1 block in log quick on kue0 from 172.16.0.0/255.240.0.0 to any 
-@1 block in log quick on kue0 from 192.168.0.0/255.255.0.0 to any 
-@1 block in log quick on kue0 from 255.255.255.255 to any 
-@1 pass out on kue0 proto icmp all icmp-type echoreq code 0 keep state 
-@1 pass in on kue0 proto icmp all icmp-type echoreq code 0 keep state 
-@1 pass out on kue0 proto udp all keep state 
-@1 pass in on kue0 proto udp from any to any port = domain keep state 
-@1 pass out on kue0 proto tcp all keep state 
-@1 pass in on kue0 proto tcp from any to any port = ssh keep state 
-@1 pass in on kue0 proto tcp from any to any port = smtp keep state 
-@1 pass in on kue0 proto tcp from any to any port = domain keep state 
-@1 pass in on kue0 proto tcp from any to any port = auth keep state 
+@0 block out log on kue0 all 
+@0 block in log on kue0 all 
+@0 block return-rst out log on kue0 proto tcp all 
+@0 block return-rst in log on kue0 proto tcp all 
+@0 block return-icmp out log on kue0 proto udp all 
+@0 block return-icmp in log on kue0 proto udp all 
+@0 block out log quick on kue0 from ! 157.161.48.183 to any 
+@0 block in quick on kue0 from any to 255.255.255.255 
+@0 block in log quick on kue0 from 10.0.0.0/255.0.0.0 to any 
+@0 block in log quick on kue0 from 172.16.0.0/255.240.0.0 to any 
+@0 block in log quick on kue0 from 192.168.0.0/255.255.0.0 to any 
+@0 block in log quick on kue0 from 255.255.255.255 to any 
+@0 pass out on kue0 proto icmp all icmp-type echoreq code 0 keep state 
+@0 pass in on kue0 proto icmp all icmp-type echoreq code 0 keep state 
+@0 pass out on kue0 proto udp all keep state 
+@0 pass in on kue0 proto udp from any to any port = domain keep state 
+@0 pass out on kue0 proto tcp all keep state 
+@0 pass in on kue0 proto tcp from any to any port = ssh keep state 
+@0 pass in on kue0 proto tcp from any to any port = smtp keep state 
+@0 pass in on kue0 proto tcp from any to any port = domain keep state 
+@0 pass in on kue0 proto tcp from any to any port = auth keep state 
diff --git a/regress/sbin/pfctl/pf3.ok b/regress/sbin/pfctl/pf3.ok
index ecaf8636412..0caf78f0176 100644
--- a/regress/sbin/pfctl/pf3.ok
+++ b/regress/sbin/pfctl/pf3.ok
@@ -1,5 +1,5 @@
-@1 pass in all 
-@1 pass in all 
-@1 block in proto tcp all flags FPU/FSRPAU 
-@1 block in proto tcp all flags FS/FSRA 
-@1 block in proto tcp all flags /FSRA 
+@0 pass in all 
+@0 pass in all 
+@0 block in proto tcp all flags FPU/FSRPAU 
+@0 block in proto tcp all flags FS/FSRA 
+@0 block in proto tcp all flags /FSRA 
diff --git a/regress/sbin/pfctl/pf4.ok b/regress/sbin/pfctl/pf4.ok
index d6cbcd0ea65..12ba48c1756 100644
--- a/regress/sbin/pfctl/pf4.ok
+++ b/regress/sbin/pfctl/pf4.ok
@@ -1,46 +1,46 @@
-@1 block in all 
-@1 block in proto tcp all 
-@1 block in proto udp all 
-@1 block in proto tcp all 
-@1 block in all 
-@1 block in from 10.0.0.0/255.0.0.0 to any 
-@1 block in from ! 10.0.0.0/255.0.0.0 to any 
-@1 block in from 172.16.0.0/255.240.0.0 to any 
-@1 block in from 10.0.0.0/255.0.0.0 to any 
-@1 block in proto tcp from any port = ssh to any 
-@1 block in proto tcp from any port >= 80 to any 
-@1 block in proto tcp from any port != 1234 to any 
-@1 block in proto tcp from any port 21 >< 2048 to any 
-@1 block in proto tcp from any port = ssh to any 
-@1 block in proto udp from 172.16.0.0/255.240.0.0 port = 21 to 12.34.56.78 port = 6668 keep state 
-@1 block in proto udp from 172.16.0.0/255.240.0.0 port = 21 to 12.34.56.78 port = 6667 keep state 
-@1 block in proto udp from 172.16.0.0/255.240.0.0 port = 21 to 192.168.0.0/255.255.0.0 port = 6668 keep state 
-@1 block in proto udp from 172.16.0.0/255.240.0.0 port = 21 to 192.168.0.0/255.255.0.0 port = 6667 keep state 
-@1 block in proto udp from 172.16.0.0/255.240.0.0 port = ssh to 12.34.56.78 port = 6668 keep state 
-@1 block in proto udp from 172.16.0.0/255.240.0.0 port = ssh to 12.34.56.78 port = 6667 keep state 
-@1 block in proto udp from 172.16.0.0/255.240.0.0 port = ssh to 192.168.0.0/255.255.0.0 port = 6668 keep state 
-@1 block in proto udp from 172.16.0.0/255.240.0.0 port = ssh to 192.168.0.0/255.255.0.0 port = 6667 keep state 
-@1 block in proto udp from 10.0.0.0/255.0.0.0 port = 21 to 12.34.56.78 port = 6668 keep state 
-@1 block in proto udp from 10.0.0.0/255.0.0.0 port = 21 to 12.34.56.78 port = 6667 keep state 
-@1 block in proto udp from 10.0.0.0/255.0.0.0 port = 21 to 192.168.0.0/255.255.0.0 port = 6668 keep state 
-@1 block in proto udp from 10.0.0.0/255.0.0.0 port = 21 to 192.168.0.0/255.255.0.0 port = 6667 keep state 
-@1 block in proto udp from 10.0.0.0/255.0.0.0 port = ssh to 12.34.56.78 port = 6668 keep state 
-@1 block in proto udp from 10.0.0.0/255.0.0.0 port = ssh to 12.34.56.78 port = 6667 keep state 
-@1 block in proto udp from 10.0.0.0/255.0.0.0 port = ssh to 192.168.0.0/255.255.0.0 port = 6668 keep state 
-@1 block in proto udp from 10.0.0.0/255.0.0.0 port = ssh to 192.168.0.0/255.255.0.0 port = 6667 keep state 
-@1 block in proto tcp from 172.16.0.0/255.240.0.0 port = ftp to 12.34.56.78 port = 6668 keep state 
-@1 block in proto tcp from 172.16.0.0/255.240.0.0 port = ftp to 12.34.56.78 port = 6667 keep state 
-@1 block in proto tcp from 172.16.0.0/255.240.0.0 port = ftp to 192.168.0.0/255.255.0.0 port = 6668 keep state 
-@1 block in proto tcp from 172.16.0.0/255.240.0.0 port = ftp to 192.168.0.0/255.255.0.0 port = 6667 keep state 
-@1 block in proto tcp from 172.16.0.0/255.240.0.0 port = ssh to 12.34.56.78 port = 6668 keep state 
-@1 block in proto tcp from 172.16.0.0/255.240.0.0 port = ssh to 12.34.56.78 port = 6667 keep state 
-@1 block in proto tcp from 172.16.0.0/255.240.0.0 port = ssh to 192.168.0.0/255.255.0.0 port = 6668 keep state 
-@1 block in proto tcp from 172.16.0.0/255.240.0.0 port = ssh to 192.168.0.0/255.255.0.0 port = 6667 keep state 
-@1 block in proto tcp from 10.0.0.0/255.0.0.0 port = ftp to 12.34.56.78 port = 6668 keep state 
-@1 block in proto tcp from 10.0.0.0/255.0.0.0 port = ftp to 12.34.56.78 port = 6667 keep state 
-@1 block in proto tcp from 10.0.0.0/255.0.0.0 port = ftp to 192.168.0.0/255.255.0.0 port = 6668 keep state 
-@1 block in proto tcp from 10.0.0.0/255.0.0.0 port = ftp to 192.168.0.0/255.255.0.0 port = 6667 keep state 
-@1 block in proto tcp from 10.0.0.0/255.0.0.0 port = ssh to 12.34.56.78 port = 6668 keep state 
-@1 block in proto tcp from 10.0.0.0/255.0.0.0 port = ssh to 12.34.56.78 port = 6667 keep state 
-@1 block in proto tcp from 10.0.0.0/255.0.0.0 port = ssh to 192.168.0.0/255.255.0.0 port = 6668 keep state 
-@1 block in proto tcp from 10.0.0.0/255.0.0.0 port = ssh to 192.168.0.0/255.255.0.0 port = 6667 keep state 
+@0 block in all 
+@0 block in proto tcp all 
+@0 block in proto udp all 
+@0 block in proto tcp all 
+@0 block in all 
+@0 block in from 10.0.0.0/255.0.0.0 to any 
+@0 block in from ! 10.0.0.0/255.0.0.0 to any 
+@0 block in from 172.16.0.0/255.240.0.0 to any 
+@0 block in from 10.0.0.0/255.0.0.0 to any 
+@0 block in proto tcp from any port = ssh to any 
+@0 block in proto tcp from any port >= 80 to any 
+@0 block in proto tcp from any port != 1234 to any 
+@0 block in proto tcp from any port 21 >< 2048 to any 
+@0 block in proto tcp from any port = ssh to any 
+@0 block in proto udp from 172.16.0.0/255.240.0.0 port = 21 to 12.34.56.78 port = 6668 keep state 
+@0 block in proto udp from 172.16.0.0/255.240.0.0 port = 21 to 12.34.56.78 port = 6667 keep state 
+@0 block in proto udp from 172.16.0.0/255.240.0.0 port = 21 to 192.168.0.0/255.255.0.0 port = 6668 keep state 
+@0 block in proto udp from 172.16.0.0/255.240.0.0 port = 21 to 192.168.0.0/255.255.0.0 port = 6667 keep state 
+@0 block in proto udp from 172.16.0.0/255.240.0.0 port = ssh to 12.34.56.78 port = 6668 keep state 
+@0 block in proto udp from 172.16.0.0/255.240.0.0 port = ssh to 12.34.56.78 port = 6667 keep state 
+@0 block in proto udp from 172.16.0.0/255.240.0.0 port = ssh to 192.168.0.0/255.255.0.0 port = 6668 keep state 
+@0 block in proto udp from 172.16.0.0/255.240.0.0 port = ssh to 192.168.0.0/255.255.0.0 port = 6667 keep state 
+@0 block in proto udp from 10.0.0.0/255.0.0.0 port = 21 to 12.34.56.78 port = 6668 keep state 
+@0 block in proto udp from 10.0.0.0/255.0.0.0 port = 21 to 12.34.56.78 port = 6667 keep state 
+@0 block in proto udp from 10.0.0.0/255.0.0.0 port = 21 to 192.168.0.0/255.255.0.0 port = 6668 keep state 
+@0 block in proto udp from 10.0.0.0/255.0.0.0 port = 21 to 192.168.0.0/255.255.0.0 port = 6667 keep state 
+@0 block in proto udp from 10.0.0.0/255.0.0.0 port = ssh to 12.34.56.78 port = 6668 keep state 
+@0 block in proto udp from 10.0.0.0/255.0.0.0 port = ssh to 12.34.56.78 port = 6667 keep state 
+@0 block in proto udp from 10.0.0.0/255.0.0.0 port = ssh to 192.168.0.0/255.255.0.0 port = 6668 keep state 
+@0 block in proto udp from 10.0.0.0/255.0.0.0 port = ssh to 192.168.0.0/255.255.0.0 port = 6667 keep state 
+@0 block in proto tcp from 172.16.0.0/255.240.0.0 port = ftp to 12.34.56.78 port = 6668 keep state 
+@0 block in proto tcp from 172.16.0.0/255.240.0.0 port = ftp to 12.34.56.78 port = 6667 keep state 
+@0 block in proto tcp from 172.16.0.0/255.240.0.0 port = ftp to 192.168.0.0/255.255.0.0 port = 6668 keep state 
+@0 block in proto tcp from 172.16.0.0/255.240.0.0 port = ftp to 192.168.0.0/255.255.0.0 port = 6667 keep state 
+@0 block in proto tcp from 172.16.0.0/255.240.0.0 port = ssh to 12.34.56.78 port = 6668 keep state 
+@0 block in proto tcp from 172.16.0.0/255.240.0.0 port = ssh to 12.34.56.78 port = 6667 keep state 
+@0 block in proto tcp from 172.16.0.0/255.240.0.0 port = ssh to 192.168.0.0/255.255.0.0 port = 6668 keep state 
+@0 block in proto tcp from 172.16.0.0/255.240.0.0 port = ssh to 192.168.0.0/255.255.0.0 port = 6667 keep state 
+@0 block in proto tcp from 10.0.0.0/255.0.0.0 port = ftp to 12.34.56.78 port = 6668 keep state 
+@0 block in proto tcp from 10.0.0.0/255.0.0.0 port = ftp to 12.34.56.78 port = 6667 keep state 
+@0 block in proto tcp from 10.0.0.0/255.0.0.0 port = ftp to 192.168.0.0/255.255.0.0 port = 6668 keep state 
+@0 block in proto tcp from 10.0.0.0/255.0.0.0 port = ftp to 192.168.0.0/255.255.0.0 port = 6667 keep state 
+@0 block in proto tcp from 10.0.0.0/255.0.0.0 port = ssh to 12.34.56.78 port = 6668 keep state 
+@0 block in proto tcp from 10.0.0.0/255.0.0.0 port = ssh to 12.34.56.78 port = 6667 keep state 
+@0 block in proto tcp from 10.0.0.0/255.0.0.0 port = ssh to 192.168.0.0/255.255.0.0 port = 6668 keep state 
+@0 block in proto tcp from 10.0.0.0/255.0.0.0 port = ssh to 192.168.0.0/255.255.0.0 port = 6667 keep state 
diff --git a/regress/sbin/pfctl/pf5.ok b/regress/sbin/pfctl/pf5.ok
index 4bebcdffdfa..1578a47c421 100644
--- a/regress/sbin/pfctl/pf5.ok
+++ b/regress/sbin/pfctl/pf5.ok
@@ -1,11 +1,11 @@
 foo = ssh, ftp
 bar = other thing
 inside = 10.0.0.0/8
-@1 block in proto udp from 10.0.0.0/255.0.0.0 port = 113 to 12.34.56.78 port = 16 keep state 
-@1 block in proto udp from 10.0.0.0/255.0.0.0 port = 113 to 12.34.56.78 port = 6667 keep state 
-@1 block in proto udp from 10.0.0.0/255.0.0.0 port = 21 to 12.34.56.78 port = 16 keep state 
-@1 block in proto udp from 10.0.0.0/255.0.0.0 port = 21 to 12.34.56.78 port = 6667 keep state 
-@1 block in proto udp from 10.0.0.0/255.0.0.0 port = ssh to 12.34.56.78 port = 16 keep state 
-@1 block in proto udp from 10.0.0.0/255.0.0.0 port = ssh to 12.34.56.78 port = 6667 keep state 
-@1 block in proto udp from 10.0.0.0/255.0.0.0 port = echo to 12.34.56.78 port = 16 keep state 
-@1 block in proto udp from 10.0.0.0/255.0.0.0 port = echo to 12.34.56.78 port = 6667 keep state 
+@0 block in proto udp from 10.0.0.0/255.0.0.0 port = 113 to 12.34.56.78 port = 16 keep state 
+@0 block in proto udp from 10.0.0.0/255.0.0.0 port = 113 to 12.34.56.78 port = 6667 keep state 
+@0 block in proto udp from 10.0.0.0/255.0.0.0 port = 21 to 12.34.56.78 port = 16 keep state 
+@0 block in proto udp from 10.0.0.0/255.0.0.0 port = 21 to 12.34.56.78 port = 6667 keep state 
+@0 block in proto udp from 10.0.0.0/255.0.0.0 port = ssh to 12.34.56.78 port = 16 keep state 
+@0 block in proto udp from 10.0.0.0/255.0.0.0 port = ssh to 12.34.56.78 port = 6667 keep state 
+@0 block in proto udp from 10.0.0.0/255.0.0.0 port = echo to 12.34.56.78 port = 16 keep state 
+@0 block in proto udp from 10.0.0.0/255.0.0.0 port = echo to 12.34.56.78 port = 6667 keep state 
diff --git a/regress/sbin/pfctl/pf7.ok b/regress/sbin/pfctl/pf7.ok
index 09739abe061..3e22e8d788a 100644
--- a/regress/sbin/pfctl/pf7.ok
+++ b/regress/sbin/pfctl/pf7.ok
@@ -1,21 +1,21 @@
-@1 block out log on kue0 all 
-@1 block in log on kue0 all 
-@1 block return-rst out log on kue0 proto tcp all 
-@1 block return-rst in log on kue0 proto tcp all 
-@1 block return-icmp out log on kue0 proto udp all 
-@1 block return-icmp in log on kue0 proto udp all 
-@1 block out log quick on kue0 from ! 157.161.48.183 to any 
-@1 block in quick on kue0 from any to 255.255.255.255 
-@1 block in log quick on kue0 from 10.0.0.0/255.0.0.0 to any 
-@1 block in log quick on kue0 from 172.16.0.0/255.240.0.0 to any 
-@1 block in log quick on kue0 from 192.168.0.0/255.255.0.0 to any 
-@1 block in log quick on kue0 from 255.255.255.255 to any 
-@1 pass out on kue0 proto icmp all icmp-type echoreq code 0 keep state 
-@1 pass in on kue0 proto icmp all icmp-type echoreq code 0 keep state 
-@1 pass out on kue0 proto udp all keep state 
-@1 pass in on kue0 proto udp from any to any port = domain keep state 
-@1 pass out on kue0 proto tcp all modulate state 
-@1 pass in on kue0 proto tcp from any to any port = ssh modulate state 
-@1 pass in on kue0 proto tcp from any to any port = smtp modulate state 
-@1 pass in on kue0 proto tcp from any to any port = domain modulate state 
-@1 pass in on kue0 proto tcp from any to any port = auth modulate state 
+@0 block out log on kue0 all 
+@0 block in log on kue0 all 
+@0 block return-rst out log on kue0 proto tcp all 
+@0 block return-rst in log on kue0 proto tcp all 
+@0 block return-icmp out log on kue0 proto udp all 
+@0 block return-icmp in log on kue0 proto udp all 
+@0 block out log quick on kue0 from ! 157.161.48.183 to any 
+@0 block in quick on kue0 from any to 255.255.255.255 
+@0 block in log quick on kue0 from 10.0.0.0/255.0.0.0 to any 
+@0 block in log quick on kue0 from 172.16.0.0/255.240.0.0 to any 
+@0 block in log quick on kue0 from 192.168.0.0/255.255.0.0 to any 
+@0 block in log quick on kue0 from 255.255.255.255 to any 
+@0 pass out on kue0 proto icmp all icmp-type echoreq code 0 keep state 
+@0 pass in on kue0 proto icmp all icmp-type echoreq code 0 keep state 
+@0 pass out on kue0 proto udp all keep state 
+@0 pass in on kue0 proto udp from any to any port = domain keep state 
+@0 pass out on kue0 proto tcp all modulate state 
+@0 pass in on kue0 proto tcp from any to any port = ssh modulate state 
+@0 pass in on kue0 proto tcp from any to any port = smtp modulate state 
+@0 pass in on kue0 proto tcp from any to any port = domain modulate state 
+@0 pass in on kue0 proto tcp from any to any port = auth modulate state 
diff --git a/regress/sbin/pfctl/pf8.ok b/regress/sbin/pfctl/pf8.ok
index 535f0e03b94..13e0710887f 100644
--- a/regress/sbin/pfctl/pf8.ok
+++ b/regress/sbin/pfctl/pf8.ok
@@ -1,3 +1,3 @@
 extern = { ! 10.0.0.0/8, 10.1.2.3  }
-@1 block out log on rl0 from 10.1.2.3 to any 
-@1 block out log on rl0 from ! 10.0.0.0/255.0.0.0 to any 
+@0 block out log on rl0 from 10.1.2.3 to any 
+@0 block out log on rl0 from ! 10.0.0.0/255.0.0.0 to any