Explicitely specify address family when translation pool may contain

addresses of different address families.

5 files changed, 8 insertions, 8 deletions

diff --git a/regress/sbin/pfctl/pf48.in b/regress/sbin/pfctl/pf48.in
index 540711adf78..a0dd143c8dd 100644
--- a/regress/sbin/pfctl/pf48.in
+++ b/regress/sbin/pfctl/pf48.in
@@ -1,10 +1,10 @@
 table < regress > { 1.2.3.4 !5.6.7.8 10/8 lo0 }
 table <regress.1> const { ::1 fe80::/64 }
 table <regress.a> { 1.2.3.4 !5.6.7.8 } { ::1 ::2 ::3 } file "/dev/null" const { 4.3.2.1 }
-match out on lo0 from < regress.1> to <regress.2> nat-to lo0:0
+match out on lo0 inet from < regress.1> to <regress.2> nat-to lo0:0
 match out on !lo0 inet from !<regress.1 > to <regress.2> nat-to lo0:0
 match in on lo0 inet6 from <regress.1> to <regress.2> rdr-to lo0:0
-match in on !lo0 from !< regress.1 > to <regress.2> rdr-to lo0:0
+match in on !lo0 inet6 from !< regress.1 > to <regress.2> rdr-to lo0:0
 match in from { <regress.1> !<regress.2> } to any
 match out from any to { !<regress.1>, <regress.2> }
 pass in from <regress> to any
diff --git a/regress/sbin/pfctl/pf48.loaded b/regress/sbin/pfctl/pf48.loaded
index 68b98549d8b..cfdc8a23920 100644
--- a/regress/sbin/pfctl/pf48.loaded
+++ b/regress/sbin/pfctl/pf48.loaded
@@ -1,5 +1,5 @@
-@0 match out on lo0 inet6 from <regress.1:2> to <regress.2:*> nat-to ::1
-  [ Skip steps: d=2 p=end da=4 sp=end dp=end ]
+@0 match out on lo0 inet from <regress.1:2> to <regress.2:*> nat-to 127.0.0.1
+  [ Skip steps: d=2 f=2 p=end da=4 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 match out on ! lo0 inet from ! <regress.1:2> to <regress.2:*> nat-to 127.0.0.1
diff --git a/regress/sbin/pfctl/pf48.ok b/regress/sbin/pfctl/pf48.ok
index 5f6e6ab7f2f..aeccfcf7f8a 100644
--- a/regress/sbin/pfctl/pf48.ok
+++ b/regress/sbin/pfctl/pf48.ok
@@ -1,7 +1,7 @@
 table <regress> { 1.2.3.4 !5.6.7.8 10.0.0.0/8 ::1 fe80::1 127.0.0.1 }
 table <regress.1> const { ::1 fe80::/64 }
 table <regress.a> const { 1.2.3.4 !5.6.7.8 ::1 ::2 ::3 } file "/dev/null" { 4.3.2.1 }
-match out on lo0 inet6 from <regress.1> to <regress.2> nat-to ::1
+match out on lo0 inet from <regress.1> to <regress.2> nat-to 127.0.0.1
 match out on ! lo0 inet from ! <regress.1> to <regress.2> nat-to 127.0.0.1
 match in on lo0 inet6 from <regress.1> to <regress.2> rdr-to ::1
 match in on ! lo0 inet6 from ! <regress.1> to <regress.2> rdr-to ::1
diff --git a/regress/sbin/pfctl/pf48.optimized b/regress/sbin/pfctl/pf48.optimized
index 63309a74488..90e2036913e 100644
--- a/regress/sbin/pfctl/pf48.optimized
+++ b/regress/sbin/pfctl/pf48.optimized
@@ -1,5 +1,5 @@
-@0 match out on lo0 inet6 from <regress.1:2> to <regress.2:*> nat-to ::1
-  [ Skip steps: d=2 p=end da=4 sp=end dp=end ]
+@0 match out on lo0 inet from <regress.1:2> to <regress.2:*> nat-to 127.0.0.1
+  [ Skip steps: d=2 f=2 p=end da=4 sp=end dp=end ]
   [ queue: qname= qid=0 pqname= pqid=0 ]
   [ Evaluations: 0         Packets: 0         Bytes: 0           States: 0     ]
 @1 match out on ! lo0 inet from ! <regress.1:2> to <regress.2:*> nat-to 127.0.0.1
diff --git a/regress/sbin/pfctl/pf98.in b/regress/sbin/pfctl/pf98.in
index a18a4916caa..a224f9e2886 100644
--- a/regress/sbin/pfctl/pf98.in
+++ b/regress/sbin/pfctl/pf98.in
@@ -1,4 +1,4 @@
 # Test rule order processing should pass (require-order no longer required)
 pass in on lo1000000 all
-match out on lo0 all nat-to lo0
+match out on lo0 inet6 all nat-to lo0