From e35f0fe95dd51b2704f35becc63d3b7dd3fcaf03 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Mon, 9 Feb 2009 16:39:17 +0000
Subject: [PATCH] Apply 4.2.5.3 patch to trunk

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9428 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-perl/Shorewall/Compiler.pm | 8 --------
 Shorewall-perl/Shorewall/Config.pm   | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/Shorewall-perl/Shorewall/Compiler.pm b/Shorewall-perl/Shorewall/Compiler.pm
index 12dffdb18..b911e3c0b 100644
--- a/Shorewall-perl/Shorewall/Compiler.pm
+++ b/Shorewall-perl/Shorewall/Compiler.pm
@@ -52,10 +52,6 @@ our $reused = 0;
 
 our $family = F_IPV4;
 
-use constant { EXPORT => 0x01 ,
-	       TIMESTAMP => 0x02 ,
-	       DEBUG => 0x04 };
-
 #
 # Reinitilize the package-globals in the other modules
 #
@@ -257,10 +253,6 @@ EOF
 	do_iptables -X
     }
 
-    setcontinue() {
-	do_iptables -A $1 -m state --state ESTABLISHED,RELATED -j ACCEPT
-    }
-
     delete_nat() {
 	do_iptables -t nat -F
 	do_iptables -t nat -X
diff --git a/Shorewall-perl/Shorewall/Config.pm b/Shorewall-perl/Shorewall/Config.pm
index fd190478b..19ede128f 100644
--- a/Shorewall-perl/Shorewall/Config.pm
+++ b/Shorewall-perl/Shorewall/Config.pm
@@ -1775,7 +1775,7 @@ sub determine_capabilities( $ ) {
 
     if ( $capabilities{CONNTRACK_MATCH} ) {
 	$capabilities{NEW_CONNTRACK_MATCH} = qt1( "$iptables -A $sillyname -m conntrack -p tcp --ctorigdstport 22 -j ACCEPT" );
-	$capabilities{OLD_CONNTRACK_MATCH} = ! qt1( "$iptables -A $sillyname -m conntrack ! --ctorigdstport 1.2.3.4" );
+	$capabilities{OLD_CONNTRACK_MATCH} = ! qt1( "$iptables -A $sillyname -m conntrack ! --ctorigdst 1.2.3.4" );
     }
     
     if ( qt1( "$iptables -A $sillyname -p tcp -m multiport --dports 21,22 -j ACCEPT" ) ) {