From 7689b1e84be8024c1fb4423275b1da2c74f6eb29 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Fri, 3 Aug 2012 06:39:58 -0700
Subject: [PATCH] Remove the 'zone' helper option for now.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall/Perl/Shorewall/Raw.pm              | 3 ---
 Shorewall/manpages/shorewall-conntrack.xml   | 8 --------
 Shorewall6/manpages/shorewall6-conntrack.xml | 8 --------
 3 files changed, 19 deletions(-)

diff --git a/Shorewall/Perl/Shorewall/Raw.pm b/Shorewall/Perl/Shorewall/Raw.pm
index d468dd031..b3bd52b4e 100644
--- a/Shorewall/Perl/Shorewall/Raw.pm
+++ b/Shorewall/Perl/Shorewall/Raw.pm
@@ -101,9 +101,6 @@ sub process_notrack_rule( $$$$$$$ ) {
 		    } elsif ( $mod eq 'expevents' ) {
 			fatal_error "Invalid expevent argument ($args)" unless $args eq 'new';
 			$action .= ' --expevents new';
-		    } elsif ( $mod eq 'zone' ) {
-			fatal_error "Invalid zone id ($args)" unless $args =~ /^\d+$/;
-			$action .= " --zone $args";
 		    } else {
 			fatal_error "Invalid helper option ($mod)";
 		    }
diff --git a/Shorewall/manpages/shorewall-conntrack.xml b/Shorewall/manpages/shorewall-conntrack.xml
index b401e1a5a..a3b716476 100644
--- a/Shorewall/manpages/shorewall-conntrack.xml
+++ b/Shorewall/manpages/shorewall-conntrack.xml
@@ -201,14 +201,6 @@
                   <para>Only generate a <emphasis role="bold">new</emphasis>
                   expectation events for this connection.</para>
                 </listitem>
-
-                <listitem>
-                  <para><option>zone</option>=<replaceable>id</replaceable></para>
-
-                  <para>Assign this packet to Netfilter security zone
-                  <replaceable>id</replaceable> and only have lookups done in
-                  that zone. By default, packets have zone 0.</para>
-                </listitem>
               </itemizedlist>
             </listitem>
           </itemizedlist>
diff --git a/Shorewall6/manpages/shorewall6-conntrack.xml b/Shorewall6/manpages/shorewall6-conntrack.xml
index a31ab7992..a29824ec7 100644
--- a/Shorewall6/manpages/shorewall6-conntrack.xml
+++ b/Shorewall6/manpages/shorewall6-conntrack.xml
@@ -104,14 +104,6 @@
                   <para>Only generate a <emphasis role="bold">new</emphasis>
                   expectation events for this connection.</para>
                 </listitem>
-
-                <listitem>
-                  <para><option>zone</option>=<replaceable>id</replaceable></para>
-
-                  <para>Assign this packet to Netfilter security zone
-                  <replaceable>id</replaceable> and only have lookups done in
-                  that zone. By default, packets have zone 0.</para>
-                </listitem>
               </itemizedlist>
             </listitem>
           </itemizedlist>