'flags S/SA' not implicit if the rule is stateless.

15 files changed, 22 insertions, 22 deletions

diff --git a/regress/sbin/pfctl/pf1.loaded b/regress/sbin/pfctl/pf1.loaded
index acd8619ae06..2d7d41d54ee 100644
--- a/regress/sbin/pfctl/pf1.loaded
+++ b/regress/sbin/pfctl/pf1.loaded
@@ -2,7 +2,7 @@
   [ Skip steps: i=end d=end f=4 p=2 sa=4 sp=2 da=4 dp=3 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@1 pass in all flags S/SA no state
+@1 pass in all no state
   [ Skip steps: i=end d=end f=4 sa=4 da=4 dp=3 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf1.ok b/regress/sbin/pfctl/pf1.ok
index 0e9d2b37054..10fb28bb33d 100644
--- a/regress/sbin/pfctl/pf1.ok
+++ b/regress/sbin/pfctl/pf1.ok
@@ -1,5 +1,5 @@
 pass in all flags S/SA keep state
-pass in all flags S/SA no state
+pass in all no state
 pass in proto tcp from any port <= 1024 to any flags S/SA keep state label "foo_bar"
 pass in proto tcp from any to any port = smtp flags S/SA keep state
 pass in inet proto tcp from 10.0.0.0/8 port > 1024 to ! 10.1.2.3 port != ssh flags S/SA keep state
diff --git a/regress/sbin/pfctl/pf1.optimized b/regress/sbin/pfctl/pf1.optimized
index acd8619ae06..2d7d41d54ee 100644
--- a/regress/sbin/pfctl/pf1.optimized
+++ b/regress/sbin/pfctl/pf1.optimized
@@ -2,7 +2,7 @@
   [ Skip steps: i=end d=end f=4 p=2 sa=4 sp=2 da=4 dp=3 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@1 pass in all flags S/SA no state
+@1 pass in all no state
   [ Skip steps: i=end d=end f=4 sa=4 da=4 dp=3 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf12.loaded b/regress/sbin/pfctl/pf12.loaded
index f2125b2f885..9a3c77fc37a 100644
--- a/regress/sbin/pfctl/pf12.loaded
+++ b/regress/sbin/pfctl/pf12.loaded
@@ -1,8 +1,8 @@
-@0 pass in inet from 127.0.0.1 to 127.0.0.0/8 flags S/SA no state
+@0 pass in inet from 127.0.0.1 to 127.0.0.0/8 no state
   [ Skip steps: i=end d=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@1 pass in inet from 127.0.0.0/16 to 127.0.0.0/24 flags S/SA no state
+@1 pass in inet from 127.0.0.0/16 to 127.0.0.0/24 no state
   [ Skip steps: i=end d=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf12.ok b/regress/sbin/pfctl/pf12.ok
index 1b7d3a82baf..4ca6765f377 100644
--- a/regress/sbin/pfctl/pf12.ok
+++ b/regress/sbin/pfctl/pf12.ok
@@ -1,5 +1,5 @@
-pass in inet from 127.0.0.1 to 127.0.0.0/8 flags S/SA no state
-pass in inet from 127.0.0.0/16 to 127.0.0.0/24 flags S/SA no state
+pass in inet from 127.0.0.1 to 127.0.0.0/8 no state
+pass in inet from 127.0.0.0/16 to 127.0.0.0/24 no state
 pass in inet from 127.0.0.0/25 to ! 127.0.0.0/26 flags S/SA keep state
 pass in inet from ! 127.0.0.1 to 127.0.0.0/16 flags S/SA keep state
 pass in inet from ! 127.0.0.1 to ! 127.0.0.0/8 flags S/SA keep state
diff --git a/regress/sbin/pfctl/pf12.optimized b/regress/sbin/pfctl/pf12.optimized
index bba18e5ef35..faf666d78e4 100644
--- a/regress/sbin/pfctl/pf12.optimized
+++ b/regress/sbin/pfctl/pf12.optimized
@@ -1,8 +1,8 @@
-@0 pass in inet from 127.0.0.1 to 127.0.0.0/8 flags S/SA no state
+@0 pass in inet from 127.0.0.1 to 127.0.0.0/8 no state
   [ Skip steps: i=end d=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@1 pass in inet from 127.0.0.0/16 to 127.0.0.0/24 flags S/SA no state
+@1 pass in inet from 127.0.0.0/16 to 127.0.0.0/24 no state
   [ Skip steps: i=end d=end f=end p=end sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf16.loaded b/regress/sbin/pfctl/pf16.loaded
index 915a3ee228a..927c2045491 100644
--- a/regress/sbin/pfctl/pf16.loaded
+++ b/regress/sbin/pfctl/pf16.loaded
@@ -14,7 +14,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     ]
-@0 pass in on lo1000000 all flags S/SA no state
+@0 pass in on lo1000000 all no state
   [ 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/pf16.ok b/regress/sbin/pfctl/pf16.ok
index 972804396c2..6c7bfae0d5a 100644
--- a/regress/sbin/pfctl/pf16.ok
+++ b/regress/sbin/pfctl/pf16.ok
@@ -2,4 +2,4 @@ scrub in on lo0 all fragment reassemble
 nat on lo0 inet from 192.168.1.1 to any -> 10.0.0.1
 rdr on lo0 inet proto tcp from any to 1.2.3.4 port = 2222 -> 10.0.0.10 port 22
 binat on lo0 inet from 192.168.1.1 to any -> 10.0.0.1
-pass in on lo1000000 all flags S/SA no state
+pass in on lo1000000 all no state
diff --git a/regress/sbin/pfctl/pf16.optimized b/regress/sbin/pfctl/pf16.optimized
index 915a3ee228a..927c2045491 100644
--- a/regress/sbin/pfctl/pf16.optimized
+++ b/regress/sbin/pfctl/pf16.optimized
@@ -14,7 +14,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     ]
-@0 pass in on lo1000000 all flags S/SA no state
+@0 pass in on lo1000000 all no state
   [ 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/pf3.loaded b/regress/sbin/pfctl/pf3.loaded
index b6e523fab9f..dbeea3c5f17 100644
--- a/regress/sbin/pfctl/pf3.loaded
+++ b/regress/sbin/pfctl/pf3.loaded
@@ -34,7 +34,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     ]
-@9 pass in all flags any no state
+@9 pass in all no state
   [ 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/pf3.ok b/regress/sbin/pfctl/pf3.ok
index 0de07584bbb..1d9432f9d6c 100644
--- a/regress/sbin/pfctl/pf3.ok
+++ b/regress/sbin/pfctl/pf3.ok
@@ -7,7 +7,7 @@ pass in proto udp all keep state
 pass in proto icmp all keep state
 pass in proto tcp all flags S/SA keep state
 pass in all flags S/SA no state
-pass in all flags any no state
+pass in all no state
 pass in all flags any keep state
 pass in all flags S/SA keep state
 pass in all flags S/SA keep state
diff --git a/regress/sbin/pfctl/pf3.optimized b/regress/sbin/pfctl/pf3.optimized
index ddaffc46e0a..e7b9eb09fe7 100644
--- a/regress/sbin/pfctl/pf3.optimized
+++ b/regress/sbin/pfctl/pf3.optimized
@@ -26,7 +26,7 @@
   [ Skip steps: i=end d=end f=end sa=end sp=end da=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@7 pass in all flags any no state
+@7 pass in all no state
   [ 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/pf40.loaded b/regress/sbin/pfctl/pf40.loaded
index 9929d68dc69..d7a6fa0e4c8 100644
--- a/regress/sbin/pfctl/pf40.loaded
+++ b/regress/sbin/pfctl/pf40.loaded
@@ -38,15 +38,15 @@
   [ Skip steps: i=12 f=end p=15 sa=end sp=end da=end dp=19 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@4 pass in all flags S/SA no state
+@4 pass in all no state
   [ Skip steps: i=12 f=end p=15 sa=end sp=end da=end dp=19 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@5 pass out all flags S/SA no state
+@5 pass out all no state
   [ Skip steps: i=12 f=end p=15 sa=end sp=end da=end dp=19 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@6 pass all flags S/SA no state
+@6 pass all no state
   [ Skip steps: i=12 f=end p=15 sa=end sp=end da=end dp=19 ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
diff --git a/regress/sbin/pfctl/pf40.ok b/regress/sbin/pfctl/pf40.ok
index 114b7c8ee24..104b81e2a4c 100644
--- a/regress/sbin/pfctl/pf40.ok
+++ b/regress/sbin/pfctl/pf40.ok
@@ -8,9 +8,9 @@ block drop all
 block return all
 block return-rst proto tcp all
 pass all flags S/SA keep state
-pass in all flags S/SA no state
-pass out all flags S/SA no state
-pass all flags S/SA no state
+pass in all no state
+pass out all no state
+pass all no state
 block drop in all
 block drop out all
 block drop all
diff --git a/regress/sbin/pfctl/pf40.optimized b/regress/sbin/pfctl/pf40.optimized
index 3c86abfc69b..77060a6a764 100644
--- a/regress/sbin/pfctl/pf40.optimized
+++ b/regress/sbin/pfctl/pf40.optimized
@@ -38,7 +38,7 @@
   [ Skip steps: i=8 d=6 f=end p=11 sa=end sp=end da=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
-@4 pass all flags S/SA no state
+@4 pass all no state
   [ Skip steps: i=8 d=6 f=end p=11 sa=end sp=end da=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]