The -R option was removed from pfctl in March, so we no longer need this

test.  The remaining pieces are all tested in other regress tests.

OK sthen@

4 files changed, 2 insertions, 39 deletions

diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile
index f6d743e0063..c64fd9b328d 100644
--- a/regress/sbin/pfctl/Makefile
+++ b/regress/sbin/pfctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.210 2010/05/10 02:00:50 krw Exp $
+# $OpenBSD: Makefile,v 1.211 2010/06/20 20:35:06 phessler Exp $
 
 # TARGETS
 # pf: feed pfNN.in through pfctl and check whether the output matches pfNN.ok
@@ -29,7 +29,7 @@ PFALTQ=1 2 3 4 5 6 7 8 9 10 11 12 13 14
 # only testing parser, load test would be useless
 # PFLOAD+=6 22 41 50 52 53 55 57 83 85 86
 PFTABLE=1 2 3 4 5 6 7 8 9 10 11 12 13
-PFOPT=1 2 3 5 6
+PFOPT=1 2 3 6
 PFIF2IP=1 2 3
 PFCHKSUM=1 2 3
 
diff --git a/regress/sbin/pfctl/pfopt5.in b/regress/sbin/pfctl/pfopt5.in
deleted file mode 100644
index f72b26ad088..00000000000
--- a/regress/sbin/pfctl/pfopt5.in
+++ /dev/null
@@ -1,25 +0,0 @@
-ext_if="lo0"
-
-# OPTIONS, -O
-set loginterface $ext_if
-set timeout tcp.established 3600
-set limit states 100
-set optimization normal
-set block-policy drop
-set require-order yes
-
-# QUEUEING, -A
-altq on $ext_if priq bandwidth 10Mb tbrsize 1824 \
-    queue { pri-low pri-med pri-high }
-queue pri-low priority 0
-queue pri-med priority 1 priq(default)
-queue pri-high priority 2
-
-# FILTER, -R
-match in on $ext_if inet from any to any rdr-to 127.0.0.1
-match out on $ext_if inet from any to any nat-to 127.0.0.1
-match on $ext_if inet from 192.168.0.0/24 to 192.168.0.1/24 binat-to 192.168.0.3/24 
-pass out on $ext_if proto tcp from any to any port 22 keep state \
-    queue(pri-med, pri-high)
-pass out on $ext_if proto tcp from any to any port 80 keep state queue pri-med
-pass in  on $ext_if proto tcp from any to any port 80 keep state queue pri-low
diff --git a/regress/sbin/pfctl/pfopt5.ok b/regress/sbin/pfctl/pfopt5.ok
deleted file mode 100644
index b3c26d3332f..00000000000
--- a/regress/sbin/pfctl/pfopt5.ok
+++ /dev/null
@@ -1,11 +0,0 @@
-ext_if = "lo0"
-set limit states 100
-set block-policy drop
-set require-order yes
-match in on lo0 inet all rdr-to 127.0.0.1
-match out on lo0 inet all nat-to 127.0.0.1
-match out on lo0 inet from 192.168.0.0/24 to 192.168.0.0/24 nat-to 192.168.0.0/24 static-port
-match in on lo0 inet from 192.168.0.0/24 to 192.168.0.0/24 rdr-to 192.168.0.0/24
-pass out on lo0 proto tcp from any to any port = ssh flags S/SA keep state queue(pri-med, pri-high)
-pass out on lo0 proto tcp from any to any port = www flags S/SA keep state queue pri-med
-pass in on lo0 proto tcp from any to any port = www flags S/SA keep state queue pri-low
diff --git a/regress/sbin/pfctl/pfopt5.opts b/regress/sbin/pfctl/pfopt5.opts
deleted file mode 100644
index 146803a2ea9..00000000000
--- a/regress/sbin/pfctl/pfopt5.opts
+++ /dev/null
@@ -1 +0,0 @@
--R