Expand {} lists from left to right, so 'pass in from { a, b } to any'

becomes '@0 pass in from a to any @1 pass in from b to any' instead of
the other way around. Patch from Camiel Dobbelaar.

10 files changed, 85 insertions, 85 deletions

diff --git a/regress/sbin/pfctl/pf1.ok b/regress/sbin/pfctl/pf1.ok
index f02e5704060..469b785af2a 100644
--- a/regress/sbin/pfctl/pf1.ok
+++ b/regress/sbin/pfctl/pf1.ok
@@ -4,5 +4,5 @@
 @3 pass in proto tcp from any to any port = smtp 
 @4 pass in inet proto tcp from 10.0.0.0/8 port > 1024 to ! 10.1.2.3 port != ssh 
 @5 pass in inet proto igmp from 10.0.0.0/8 to 10.1.1.1 allow-opts 
-@6 pass in inet proto tcp from 1.2.3.5 to any label 6:tcp:1.2.3.5::any:
-@7 pass in inet proto tcp from 1.2.3.4 to any label 7:tcp:1.2.3.4::any:
+@6 pass in inet proto tcp from 1.2.3.4 to any label 6:tcp:1.2.3.4::any:
+@7 pass in inet proto tcp from 1.2.3.5 to any label 7:tcp:1.2.3.5::any:
diff --git a/regress/sbin/pfctl/pf18.ok b/regress/sbin/pfctl/pf18.ok
index 5ce88f81143..5b1f25b665b 100644
--- a/regress/sbin/pfctl/pf18.ok
+++ b/regress/sbin/pfctl/pf18.ok
@@ -5,18 +5,18 @@ nat on lo0 inet from 192.168.1.1 to any -> 10.0.0.1
 nat on lo0 inet proto tcp from 192.168.1.2 to any -> 10.0.0.2
 nat on lo0 inet proto udp from 192.168.1.3 to any -> 10.0.0.3
 nat on lo0 inet proto icmp from 192.168.1.4 to any -> 10.0.0.4
-nat on lo0 inet from 192.168.1.7 to 172.16.2.0/24 -> 127.0.0.1
-nat on lo0 inet from 192.168.1.7 to 172.14.1.2 -> 127.0.0.1
-nat on lo0 inet from 192.168.1.7 to 172.6.1.1 -> 127.0.0.1
-nat on lo0 inet from 192.168.1.6 to 172.16.2.0/24 -> 127.0.0.1
-nat on lo0 inet from 192.168.1.6 to 172.14.1.2 -> 127.0.0.1
-nat on lo0 inet from 192.168.1.6 to 172.6.1.1 -> 127.0.0.1
-nat on lo0 inet from 192.168.1.5 to 172.16.2.0/24 -> 127.0.0.1
-nat on lo0 inet from 192.168.1.5 to 172.14.1.2 -> 127.0.0.1
 nat on lo0 inet from 192.168.1.5 to 172.6.1.1 -> 127.0.0.1
+nat on lo0 inet from 192.168.1.5 to 172.14.1.2 -> 127.0.0.1
+nat on lo0 inet from 192.168.1.5 to 172.16.2.0/24 -> 127.0.0.1
+nat on lo0 inet from 192.168.1.6 to 172.6.1.1 -> 127.0.0.1
+nat on lo0 inet from 192.168.1.6 to 172.14.1.2 -> 127.0.0.1
+nat on lo0 inet from 192.168.1.6 to 172.16.2.0/24 -> 127.0.0.1
+nat on lo0 inet from 192.168.1.7 to 172.6.1.1 -> 127.0.0.1
+nat on lo0 inet from 192.168.1.7 to 172.14.1.2 -> 127.0.0.1
+nat on lo0 inet from 192.168.1.7 to 172.16.2.0/24 -> 127.0.0.1
 nat on lo0 inet from 192.168.0.1/24 to any -> (lo0)
 nat on lo0 inet from 192.168.1.8 to ! 172.17.0.0/16 -> 10.0.0.8
-nat on ! lo0 inet proto tcp all -> 10.0.0.8
 nat on ! lo0 inet proto udp all -> 10.0.0.8
-nat on tun0 inet all -> 10.0.0.8
+nat on ! lo0 inet proto tcp all -> 10.0.0.8
 nat on lo0 inet all -> 10.0.0.8
+nat on tun0 inet all -> 10.0.0.8
diff --git a/regress/sbin/pfctl/pf19.ok b/regress/sbin/pfctl/pf19.ok
index 206b7492f33..b5f27565460 100644
--- a/regress/sbin/pfctl/pf19.ok
+++ b/regress/sbin/pfctl/pf19.ok
@@ -3,11 +3,11 @@ GOOD = { lo0, lo1 }
 GOOD_NET = { 127.0.0.0/24, 10.0.1.0/24 }
 DEST_NET = { 1.2.3.4/25, 2.4.6.8/30 }
 rdr on lo0 inet proto tcp from any to 1.2.3.4 port 2222 -> 10.0.0.10 port 22
-rdr on lo1 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port 21 -> 127.0.0.1 port 8021
-rdr on lo1 inet proto tcp from 10.0.1.0/24 to 1.2.3.4/25 port 21 -> 127.0.0.1 port 8021
-rdr on lo1 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port 21 -> 127.0.0.1 port 8021
-rdr on lo1 inet proto tcp from 127.0.0.0/24 to 1.2.3.4/25 port 21 -> 127.0.0.1 port 8021
-rdr on lo0 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port 21 -> 127.0.0.1 port 8021
-rdr on lo0 inet proto tcp from 10.0.1.0/24 to 1.2.3.4/25 port 21 -> 127.0.0.1 port 8021
-rdr on lo0 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port 21 -> 127.0.0.1 port 8021
 rdr on lo0 inet proto tcp from 127.0.0.0/24 to 1.2.3.4/25 port 21 -> 127.0.0.1 port 8021
+rdr on lo0 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port 21 -> 127.0.0.1 port 8021
+rdr on lo0 inet proto tcp from 10.0.1.0/24 to 1.2.3.4/25 port 21 -> 127.0.0.1 port 8021
+rdr on lo0 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port 21 -> 127.0.0.1 port 8021
+rdr on lo1 inet proto tcp from 127.0.0.0/24 to 1.2.3.4/25 port 21 -> 127.0.0.1 port 8021
+rdr on lo1 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port 21 -> 127.0.0.1 port 8021
+rdr on lo1 inet proto tcp from 10.0.1.0/24 to 1.2.3.4/25 port 21 -> 127.0.0.1 port 8021
+rdr on lo1 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port 21 -> 127.0.0.1 port 8021
diff --git a/regress/sbin/pfctl/pf20.ok b/regress/sbin/pfctl/pf20.ok
index 1981663a207..4910e3cc004 100644
--- a/regress/sbin/pfctl/pf20.ok
+++ b/regress/sbin/pfctl/pf20.ok
@@ -2,15 +2,15 @@ EVIL = lo0
 GOOD = { lo0, lo1 }
 GOOD_NET = { 127.0.0.0/24, 10.0.1.0/24 }
 DEST_NET = { 1.2.3.4/25, 2.4.6.8/30 }
-nat on lo0 inet from 10.0.1.0/24 to 2.4.6.8/30 -> 127.0.0.1
-nat on lo0 inet from 10.0.1.0/24 to 1.2.3.4/25 -> 127.0.0.1
-nat on lo0 inet from 127.0.0.0/24 to 2.4.6.8/30 -> 127.0.0.1
 nat on lo0 inet from 127.0.0.0/24 to 1.2.3.4/25 -> 127.0.0.1
-rdr on lo1 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port 21 -> 127.0.0.1 port 8021
-rdr on lo1 inet proto tcp from 10.0.1.0/24 to 1.2.3.4/25 port 21 -> 127.0.0.1 port 8021
-rdr on lo1 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port 21 -> 127.0.0.1 port 8021
-rdr on lo1 inet proto tcp from 127.0.0.0/24 to 1.2.3.4/25 port 21 -> 127.0.0.1 port 8021
-rdr on lo0 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port 21 -> 127.0.0.1 port 8021
-rdr on lo0 inet proto tcp from 10.0.1.0/24 to 1.2.3.4/25 port 21 -> 127.0.0.1 port 8021
-rdr on lo0 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port 21 -> 127.0.0.1 port 8021
+nat on lo0 inet from 127.0.0.0/24 to 2.4.6.8/30 -> 127.0.0.1
+nat on lo0 inet from 10.0.1.0/24 to 1.2.3.4/25 -> 127.0.0.1
+nat on lo0 inet from 10.0.1.0/24 to 2.4.6.8/30 -> 127.0.0.1
 rdr on lo0 inet proto tcp from 127.0.0.0/24 to 1.2.3.4/25 port 21 -> 127.0.0.1 port 8021
+rdr on lo0 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port 21 -> 127.0.0.1 port 8021
+rdr on lo0 inet proto tcp from 10.0.1.0/24 to 1.2.3.4/25 port 21 -> 127.0.0.1 port 8021
+rdr on lo0 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port 21 -> 127.0.0.1 port 8021
+rdr on lo1 inet proto tcp from 127.0.0.0/24 to 1.2.3.4/25 port 21 -> 127.0.0.1 port 8021
+rdr on lo1 inet proto tcp from 127.0.0.0/24 to 2.4.6.8/30 port 21 -> 127.0.0.1 port 8021
+rdr on lo1 inet proto tcp from 10.0.1.0/24 to 1.2.3.4/25 port 21 -> 127.0.0.1 port 8021
+rdr on lo1 inet proto tcp from 10.0.1.0/24 to 2.4.6.8/30 port 21 -> 127.0.0.1 port 8021
diff --git a/regress/sbin/pfctl/pf24.ok b/regress/sbin/pfctl/pf24.ok
index b3706bf7118..e4dd1868d87 100644
--- a/regress/sbin/pfctl/pf24.ok
+++ b/regress/sbin/pfctl/pf24.ok
@@ -3,5 +3,5 @@ b = ftp
 c = ssh ftp
 d = ssh ftp ssh ftp
 e = ssh ftp ftp test ssh ftp
-@0 pass in proto tcp from any to any port = ftp 
-@1 pass in proto tcp from any to any port = ssh 
+@0 pass in proto tcp from any to any port = ssh 
+@1 pass in proto tcp from any to any port = ftp 
diff --git a/regress/sbin/pfctl/pf3.ok b/regress/sbin/pfctl/pf3.ok
index bcb6c01e080..cde81a8ab5b 100644
--- a/regress/sbin/pfctl/pf3.ok
+++ b/regress/sbin/pfctl/pf3.ok
@@ -3,7 +3,7 @@
 @2 block in proto tcp all flags FPUEW/FSRPAUEW 
 @3 block in proto tcp all flags FS/FSRA 
 @4 block in proto tcp all flags /FSRAW 
-@5 pass in proto tcp all flags S/FSRPAUEW 
+@5 pass in proto udp all 
 @6 pass in proto icmp all 
-@7 pass in proto udp all 
+@7 pass in proto tcp all flags S/FSRPAUEW 
 @8 pass in all flags S/FSRPAUEW 
diff --git a/regress/sbin/pfctl/pf4.ok b/regress/sbin/pfctl/pf4.ok
index e47e076292a..4fd34997a31 100644
--- a/regress/sbin/pfctl/pf4.ok
+++ b/regress/sbin/pfctl/pf4.ok
@@ -1,46 +1,46 @@
 @0 block in all 
 @1 block in proto tcp all 
-@2 block in proto udp all 
-@3 block in proto tcp all 
+@2 block in proto tcp all 
+@3 block in proto udp all 
 @4 block in all 
 @5 block in inet from 10.0.0.0/8 to any 
 @6 block in inet from ! 10.0.0.0/8 to any 
-@7 block in inet from 172.16.0.0/12 to any 
-@8 block in inet from 10.0.0.0/8 to any 
+@7 block in inet from 10.0.0.0/8 to any 
+@8 block in inet from 172.16.0.0/12 to any 
 @9 block in proto tcp from any port = ssh to any 
-@10 block in proto tcp from any port >= 80 to any 
-@11 block in proto tcp from any port != 1234 to any 
-@12 block in proto tcp from any port 21 >< 2048 to any 
-@13 block in proto tcp from any port = ssh to any 
-@14 block in inet proto udp from 172.16.0.0/12 port = 21 to 12.34.56.78 port = 6668 
-@15 block in inet proto udp from 172.16.0.0/12 port = 21 to 12.34.56.78 port = 6667 
-@16 block in inet proto udp from 172.16.0.0/12 port = 21 to 192.168.0.0/16 port = 6668 
-@17 block in inet proto udp from 172.16.0.0/12 port = 21 to 192.168.0.0/16 port = 6667 
-@18 block in inet proto udp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6668 
-@19 block in inet proto udp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6667 
-@20 block in inet proto udp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6668 
-@21 block in inet proto udp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6667 
-@22 block in inet proto udp from 10.0.0.0/8 port = 21 to 12.34.56.78 port = 6668 
-@23 block in inet proto udp from 10.0.0.0/8 port = 21 to 12.34.56.78 port = 6667 
-@24 block in inet proto udp from 10.0.0.0/8 port = 21 to 192.168.0.0/16 port = 6668 
-@25 block in inet proto udp from 10.0.0.0/8 port = 21 to 192.168.0.0/16 port = 6667 
-@26 block in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6668 
-@27 block in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6667 
-@28 block in inet proto udp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = 6668 
-@29 block in inet proto udp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = 6667 
-@30 block in inet proto tcp from 172.16.0.0/12 port = ftp to 12.34.56.78 port = 6668 
-@31 block in inet proto tcp from 172.16.0.0/12 port = ftp to 12.34.56.78 port = 6667 
-@32 block in inet proto tcp from 172.16.0.0/12 port = ftp to 192.168.0.0/16 port = 6668 
-@33 block in inet proto tcp from 172.16.0.0/12 port = ftp to 192.168.0.0/16 port = 6667 
-@34 block in inet proto tcp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6668 
-@35 block in inet proto tcp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6667 
-@36 block in inet proto tcp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6668 
-@37 block in inet proto tcp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6667 
-@38 block in inet proto tcp from 10.0.0.0/8 port = ftp to 12.34.56.78 port = 6668 
-@39 block in inet proto tcp from 10.0.0.0/8 port = ftp to 12.34.56.78 port = 6667 
-@40 block in inet proto tcp from 10.0.0.0/8 port = ftp to 192.168.0.0/16 port = 6668 
-@41 block in inet proto tcp from 10.0.0.0/8 port = ftp to 192.168.0.0/16 port = 6667 
-@42 block in inet proto tcp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6668 
-@43 block in inet proto tcp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6667 
-@44 block in inet proto tcp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = 6668 
-@45 block in inet proto tcp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = 6667 
+@10 block in proto tcp from any port = ssh to any 
+@11 block in proto tcp from any port 21 >< 2048 to any 
+@12 block in proto tcp from any port != 1234 to any 
+@13 block in proto tcp from any port >= 80 to any 
+@14 block in inet proto tcp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = 6667 
+@15 block in inet proto tcp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = 6668 
+@16 block in inet proto tcp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6667 
+@17 block in inet proto tcp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6668 
+@18 block in inet proto tcp from 10.0.0.0/8 port = ftp to 192.168.0.0/16 port = 6667 
+@19 block in inet proto tcp from 10.0.0.0/8 port = ftp to 192.168.0.0/16 port = 6668 
+@20 block in inet proto tcp from 10.0.0.0/8 port = ftp to 12.34.56.78 port = 6667 
+@21 block in inet proto tcp from 10.0.0.0/8 port = ftp to 12.34.56.78 port = 6668 
+@22 block in inet proto tcp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6667 
+@23 block in inet proto tcp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6668 
+@24 block in inet proto tcp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6667 
+@25 block in inet proto tcp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6668 
+@26 block in inet proto tcp from 172.16.0.0/12 port = ftp to 192.168.0.0/16 port = 6667 
+@27 block in inet proto tcp from 172.16.0.0/12 port = ftp to 192.168.0.0/16 port = 6668 
+@28 block in inet proto tcp from 172.16.0.0/12 port = ftp to 12.34.56.78 port = 6667 
+@29 block in inet proto tcp from 172.16.0.0/12 port = ftp to 12.34.56.78 port = 6668 
+@30 block in inet proto udp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = 6667 
+@31 block in inet proto udp from 10.0.0.0/8 port = ssh to 192.168.0.0/16 port = 6668 
+@32 block in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6667 
+@33 block in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6668 
+@34 block in inet proto udp from 10.0.0.0/8 port = 21 to 192.168.0.0/16 port = 6667 
+@35 block in inet proto udp from 10.0.0.0/8 port = 21 to 192.168.0.0/16 port = 6668 
+@36 block in inet proto udp from 10.0.0.0/8 port = 21 to 12.34.56.78 port = 6667 
+@37 block in inet proto udp from 10.0.0.0/8 port = 21 to 12.34.56.78 port = 6668 
+@38 block in inet proto udp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6667 
+@39 block in inet proto udp from 172.16.0.0/12 port = ssh to 192.168.0.0/16 port = 6668 
+@40 block in inet proto udp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6667 
+@41 block in inet proto udp from 172.16.0.0/12 port = ssh to 12.34.56.78 port = 6668 
+@42 block in inet proto udp from 172.16.0.0/12 port = 21 to 192.168.0.0/16 port = 6667 
+@43 block in inet proto udp from 172.16.0.0/12 port = 21 to 192.168.0.0/16 port = 6668 
+@44 block in inet proto udp from 172.16.0.0/12 port = 21 to 12.34.56.78 port = 6667 
+@45 block in inet proto udp from 172.16.0.0/12 port = 21 to 12.34.56.78 port = 6668 
diff --git a/regress/sbin/pfctl/pf5.ok b/regress/sbin/pfctl/pf5.ok
index 94e1ad0d1d2..2b739cd4bdb 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
-@0 block in inet proto udp from 10.0.0.0/8 port = 113 to 12.34.56.78 port = 16 
-@1 block in inet proto udp from 10.0.0.0/8 port = 113 to 12.34.56.78 port = 6667 
-@2 block in inet proto udp from 10.0.0.0/8 port = 21 to 12.34.56.78 port = 16 
-@3 block in inet proto udp from 10.0.0.0/8 port = 21 to 12.34.56.78 port = 6667 
-@4 block in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 16 
-@5 block in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6667 
-@6 block in inet proto udp from 10.0.0.0/8 port = echo to 12.34.56.78 port = 16 
-@7 block in inet proto udp from 10.0.0.0/8 port = echo to 12.34.56.78 port = 6667 
+@0 block in inet proto udp from 10.0.0.0/8 port = echo to 12.34.56.78 port = 6667 
+@1 block in inet proto udp from 10.0.0.0/8 port = echo to 12.34.56.78 port = 16 
+@2 block in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 6667 
+@3 block in inet proto udp from 10.0.0.0/8 port = ssh to 12.34.56.78 port = 16 
+@4 block in inet proto udp from 10.0.0.0/8 port = 21 to 12.34.56.78 port = 6667 
+@5 block in inet proto udp from 10.0.0.0/8 port = 21 to 12.34.56.78 port = 16 
+@6 block in inet proto udp from 10.0.0.0/8 port = 113 to 12.34.56.78 port = 6667 
+@7 block in inet proto udp from 10.0.0.0/8 port = 113 to 12.34.56.78 port = 16 
diff --git a/regress/sbin/pfctl/pf8.ok b/regress/sbin/pfctl/pf8.ok
index 592182dfaeb..66f4e413394 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 }
-@0 block out log on tun1 inet from 10.1.2.3 to any 
-@1 block out log on tun1 inet from ! 10.0.0.0/8 to any 
+@0 block out log on tun1 inet from ! 10.0.0.0/8 to any 
+@1 block out log on tun1 inet from 10.1.2.3 to any 
diff --git a/regress/sbin/pfctl/pf9.ok b/regress/sbin/pfctl/pf9.ok
index 46cc3ff19a1..c2961fc3357 100644
--- a/regress/sbin/pfctl/pf9.ok
+++ b/regress/sbin/pfctl/pf9.ok
@@ -1,3 +1,3 @@
 interfaces = { enc0, tun0 }
-@0 block in on tun0 all 
-@1 block in on enc0 all 
+@0 block in on enc0 all 
+@1 block in on tun0 all