From 4b2d48d621622b1680118322d339fdb359685005 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Mon, 13 Aug 2012 06:48:19 -0700
Subject: [PATCH] Hardwire AUTOHELPERS until 4.5.8.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall/Perl/Shorewall/Config.pm | 4 ++++
 Shorewall/configfiles/conntrack    | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm
index cdd28b30d..2adf5bccc 100644
--- a/Shorewall/Perl/Shorewall/Config.pm
+++ b/Shorewall/Perl/Shorewall/Config.pm
@@ -3982,6 +3982,10 @@ sub process_shorewall_conf( $$ ) {
 	    expand_variables( $_ ) unless /^'(.+)'$/;
 	}
     }
+    #
+    # Temporary -- set AUTOHELPERS until 4.5.8
+    #
+    $config{AUTOHELPERS} = 1;
 }
 
 #
diff --git a/Shorewall/configfiles/conntrack b/Shorewall/configfiles/conntrack
index 3ff7ec943..dbb55854d 100644
--- a/Shorewall/configfiles/conntrack
+++ b/Shorewall/configfiles/conntrack
@@ -7,7 +7,7 @@
 FORMAT 2
 #ACTION			SOURCE		DESTINATION	PROTO	DEST		SOURCE	USER/
 #								PORT(S)		PORT(S)	GROUP
-?IF __CT_TARGET
+?IF $AUTOHELPERS && __CT_TARGET
 
 ?IF __AMANDA_HELPER
 CT:helper:amanda	all		-		udp	10080