From 8cdc83638e46e0e8cb659f6ee47570fd7cdcd35a Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Wed, 28 Dec 2011 14:07:12 -0800
Subject: [PATCH] Don't allow PREROUTING CLASSIFY rules.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall/Perl/Shorewall/Tc.pm   |  3 +--
 manpages/shorewall-tcrules.xml   | 12 ++----------
 manpages6/shorewall6-tcrules.xml | 10 +---------
 3 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/Shorewall/Perl/Shorewall/Tc.pm b/Shorewall/Perl/Shorewall/Tc.pm
index f36e703eb..df7c7e17f 100644
--- a/Shorewall/Perl/Shorewall/Tc.pm
+++ b/Shorewall/Perl/Shorewall/Tc.pm
@@ -104,8 +104,7 @@ my  %flow_keys = ( 'src'            => 1,
 		   'sk-gid'         => 1,
 		   'vlan-tag'       => 1 );
 
-my %designator = ( P => 'tcpre' ,
-		   F => 'tcfor' ,
+my %designator = ( F => 'tcfor' ,
 		   T => 'tcpost' );
 
 my  %tosoptions = ( 'tos-minimize-delay'       => '0x10/0x10' ,
diff --git a/manpages/shorewall-tcrules.xml b/manpages/shorewall-tcrules.xml
index 75c6dc590..cf433474d 100644
--- a/manpages/shorewall-tcrules.xml
+++ b/manpages/shorewall-tcrules.xml
@@ -205,7 +205,7 @@
 
               <para>Beginning with Shorewall 4.4.27, the classid may be
               optionally followed by ':' and a capital letter designating the
-              chain where classification is to occur. </para>
+              chain where classification is to occur.</para>
 
               <variablelist>
                 <varlistentry>
@@ -216,19 +216,11 @@
                   </listitem>
                 </varlistentry>
 
-                <varlistentry>
-                  <term>P</term>
-
-                  <listitem>
-                    <para>PREROUTING chain.</para>
-                  </listitem>
-                </varlistentry>
-
                 <varlistentry>
                   <term>T</term>
 
                   <listitem>
-                    <para>POSTROUTING chain.</para>
+                    <para>POSTROUTING chain (default).</para>
                   </listitem>
                 </varlistentry>
               </variablelist>
diff --git a/manpages6/shorewall6-tcrules.xml b/manpages6/shorewall6-tcrules.xml
index fa3a1f932..125ed8fbd 100644
--- a/manpages6/shorewall6-tcrules.xml
+++ b/manpages6/shorewall6-tcrules.xml
@@ -216,19 +216,11 @@
                   </listitem>
                 </varlistentry>
 
-                <varlistentry>
-                  <term>P</term>
-
-                  <listitem>
-                    <para>PREROUTING chain.</para>
-                  </listitem>
-                </varlistentry>
-
                 <varlistentry>
                   <term>T</term>
 
                   <listitem>
-                    <para>POSTROUTING chain.</para>
+                    <para>POSTROUTING chain (default).</para>
                   </listitem>
                 </varlistentry>
               </variablelist>