diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2009-09-03 12:23:18 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2009-09-03 12:23:18 +0000 |
| commit | 8dd157a434231d8008ff91c5a8f850bfbffc4bd8 (patch) | |
| tree | 16cce797821d730dea52bd8c053bf16c06458619 /regress/sbin | |
| parent | 7871912942b291a6935ab4c4c4cf10363bd4ea8e (diff) | |
adapt to new pf
ok henning
Diffstat (limited to 'regress/sbin')
| -rw-r--r-- | regress/sbin/pfctl/pfail12.in | 2 | ||||
| -rw-r--r-- | regress/sbin/pfctl/pfail12.ok | 3 | ||||
| -rw-r--r-- | regress/sbin/pfctl/pfail19.in | 12 | ||||
| -rw-r--r-- | regress/sbin/pfctl/pfail8.in | 4 |
4 files changed, 11 insertions, 10 deletions
diff --git a/regress/sbin/pfctl/pfail12.in b/regress/sbin/pfctl/pfail12.in index 785218620cb..e2e9378c36c 100644 --- a/regress/sbin/pfctl/pfail12.in +++ b/regress/sbin/pfctl/pfail12.in @@ -1,2 +1,2 @@ # ports are invalid for proto icmp -rdr on lo0 proto icmp from any to 11.1.1.1/32 port 12345 -> 172.17.0.2 port 69 +match in on lo0 proto icmp from any to 11.1.1.1/32 port 12345 rdr-to 172.17.0.2 port 69 diff --git a/regress/sbin/pfctl/pfail12.ok b/regress/sbin/pfctl/pfail12.ok index aaaadba0e3f..040b59b87d9 100644 --- a/regress/sbin/pfctl/pfail12.ok +++ b/regress/sbin/pfctl/pfail12.ok @@ -1,4 +1,3 @@ -stdin:2: dst port only applies to tcp/udp -stdin:2: rpool port only applies to tcp/udp +stdin:2: port only applies to tcp/udp stdin:2: skipping rule due to errors stdin:2: rule expands to no valid combination diff --git a/regress/sbin/pfctl/pfail19.in b/regress/sbin/pfctl/pfail19.in index 81da3eb6fa5..f9107c9fdf1 100644 --- a/regress/sbin/pfctl/pfail19.in +++ b/regress/sbin/pfctl/pfail19.in @@ -1,8 +1,10 @@ # invalid table constructs match in on lo0 from any to any rdr-to <sometable> match out on lo0 from any to any nat-to <sometable> -binat on lo0 from 1.1.1.1 to any -> <sometable> -binat on lo0 from <sometable> to any -> 1.1.1.1 -pass in dup-to (lo0 <sometable>) all -pass in route-to (lo0 <sometable>) all -pass in reply-to (lo0 <sometable>) all +match out on lo0 from 1.1.1.1 to any nat-to <sometable> static-port +match in on lo0 from any to <sometable> rdr-to 1.1.1.1 +match out on lo0 from <sometable> to any nat-to 1.1.1.1 static-port +match in on lo0 from any to 1.1.1.1 rdr-to <sometable> +pass in from any to any dup-to (lo0 <sometable>) +pass in from any to any route-to (lo0 <sometable>) +pass in from any to any reply-to (lo0 <sometable>) diff --git a/regress/sbin/pfctl/pfail8.in b/regress/sbin/pfctl/pfail8.in index da18e9509f2..09a0bee2fba 100644 --- a/regress/sbin/pfctl/pfail8.in +++ b/regress/sbin/pfctl/pfail8.in @@ -1,3 +1,3 @@ -block in quick on tun1000000 dup-to (tun1000001 fec0::1) from any to 192.168.1.0/24 -block in quick on tun1000000 dup-to (tun1000001 192.168.1.1) from any to fec0::1/128 +block in quick on tun1000000 from any to 192.168.1.0/24 dup-to (tun1000001 fec0::1) +block in quick on tun1000000 from any to fec0::1/128 dup-to (tun1000001 192.168.1.1) |