Update some scrub tests with the "log" keyword.

3 files changed, 21 insertions, 23 deletions

diff --git a/regress/sbin/pfctl/pf15.in b/regress/sbin/pfctl/pf15.in
index 4ffb63a4593..5554499f266 100644
--- a/regress/sbin/pfctl/pf15.in
+++ b/regress/sbin/pfctl/pf15.in
@@ -1,11 +1,9 @@
 scrub in on lo0 from any to any no-df
-scrub in on lo0 from any to any min-ttl 25
+scrub in log on lo0 from any to any min-ttl 25
+scrub on lo0 from any to any max-mss 224
+scrub out log on lo1 from any to 10.0.0.1 no-df max-mss 224
 scrub in on lo0 from any to any max-mss 224
-scrub out on lo1 from any to 10.0.0.1 no-df max-mss 224
-scrub in on lo0 from any to any max-mss 224
-scrub in on {lo0 lo1} from any to any
+scrub in log on {lo0 lo1} from any to any
 scrub in on lo0 inet from (lo0) to any
-scrub in on lo0 inet6 from { (lo1), (lo0) } to 2000::1
+scrub in log on lo0 inet6 from { (lo1), (lo0) } to 2000::1
 scrub in inet from { 10.0.0.1, 10.0.0.2 } to { 10.0.0.3, 10.0.0.4 }
-
-
diff --git a/regress/sbin/pfctl/pf15.loaded b/regress/sbin/pfctl/pf15.loaded
index fa8d8383dbb..99604ef2eb4 100644
--- a/regress/sbin/pfctl/pf15.loaded
+++ b/regress/sbin/pfctl/pf15.loaded
@@ -1,16 +1,16 @@
 @0 scrub in on lo0 all no-df fragment reassemble 
-[ Skip steps: a=end i=3 d=3 f=3 p=end sa=7 sp=end da=3 dp=end ]
+[ Skip steps: a=end i=3 d=2 f=3 p=end sa=7 sp=end da=3 dp=end ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
-@1 scrub in on lo0 all min-ttl 25 fragment reassemble 
-[ Skip steps: a=end i=3 d=3 f=3 p=end sa=7 sp=end da=3 dp=end ]
+@1 scrub in log on lo0 all min-ttl 25 fragment reassemble 
+[ Skip steps: a=end i=3 f=3 p=end sa=7 sp=end da=3 dp=end ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
-@2 scrub in on lo0 all max-mss 224 fragment reassemble 
+@2 scrub on lo0 all max-mss 224 fragment reassemble 
 [ Skip steps: a=end p=end sa=7 sp=end dp=end ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
-@3 scrub out on lo1 inet from any to 10.0.0.1 no-df max-mss 224 fragment reassemble 
+@3 scrub out log on lo1 inet from any to 10.0.0.1 no-df max-mss 224 fragment reassemble 
 [ Skip steps: a=end p=end sa=7 sp=end dp=end ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
@@ -18,11 +18,11 @@
 [ Skip steps: a=end i=6 d=end f=7 p=end sa=7 sp=end da=8 dp=end ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
-@5 scrub in on lo0 all fragment reassemble 
+@5 scrub in log on lo0 all fragment reassemble 
 [ Skip steps: a=end d=end f=7 p=end sa=7 sp=end da=8 dp=end ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
-@6 scrub in on lo1 all fragment reassemble 
+@6 scrub in log on lo1 all fragment reassemble 
 [ Skip steps: a=end d=end p=end sp=end da=8 dp=end ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
@@ -30,11 +30,11 @@
 [ Skip steps: a=end i=10 d=end p=end sp=end dp=end ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
-@8 scrub in on lo0 inet6 from (lo1) to 2000::1 fragment reassemble 
+@8 scrub in log on lo0 inet6 from (lo1) to 2000::1 fragment reassemble 
 [ Skip steps: a=end i=10 d=end f=10 p=end sp=end da=10 dp=end ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
-@9 scrub in on lo0 inet6 from (lo0) to 2000::1 fragment reassemble 
+@9 scrub in log on lo0 inet6 from (lo0) to 2000::1 fragment reassemble 
 [ Skip steps: a=end d=end p=end sp=end dp=end ]
 [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 
diff --git a/regress/sbin/pfctl/pf15.ok b/regress/sbin/pfctl/pf15.ok
index 8be94c974db..9e4680f18d5 100644
--- a/regress/sbin/pfctl/pf15.ok
+++ b/regress/sbin/pfctl/pf15.ok
@@ -1,13 +1,13 @@
 scrub in on lo0 all no-df fragment reassemble 
-scrub in on lo0 all min-ttl 25 fragment reassemble 
+scrub in log on lo0 all min-ttl 25 fragment reassemble 
+scrub on lo0 all max-mss 224 fragment reassemble 
+scrub out log on lo1 inet from any to 10.0.0.1 no-df max-mss 224 fragment reassemble 
 scrub in on lo0 all max-mss 224 fragment reassemble 
-scrub out on lo1 inet from any to 10.0.0.1 no-df max-mss 224 fragment reassemble 
-scrub in on lo0 all max-mss 224 fragment reassemble 
-scrub in on lo0 all fragment reassemble 
-scrub in on lo1 all fragment reassemble 
+scrub in log on lo0 all fragment reassemble 
+scrub in log on lo1 all fragment reassemble 
 scrub in on lo0 inet from (lo0) to any fragment reassemble 
-scrub in on lo0 inet6 from (lo1) to 2000::1 fragment reassemble 
-scrub in on lo0 inet6 from (lo0) to 2000::1 fragment reassemble 
+scrub in log on lo0 inet6 from (lo1) to 2000::1 fragment reassemble 
+scrub in log on lo0 inet6 from (lo0) to 2000::1 fragment reassemble 
 scrub in inet from 10.0.0.1 to 10.0.0.3 fragment reassemble 
 scrub in inet from 10.0.0.1 to 10.0.0.4 fragment reassemble 
 scrub in inet from 10.0.0.2 to 10.0.0.3 fragment reassemble