From cc57c8493ff57162c690cf861f086699301cb01e Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sat, 29 May 2004 00:56:08 +0000
Subject: [PATCH] Back out IPSEC 2.6 partial

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1376 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall2/firewall | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/Shorewall2/firewall b/Shorewall2/firewall
index 0dc299a1f..57ffca50a 100755
--- a/Shorewall2/firewall
+++ b/Shorewall2/firewall
@@ -1418,20 +1418,9 @@ setup_tunnels() # $1 = name of tunnels file
 
     setup_one_ipsec() # $1 = gateway $2 = Tunnel Kind $3 = gateway zones
     {
-    	local kind=$2 noah= markval=
-
-	case $kind in 
-	    *:*:*)
-		markval=${kind#*}
-		kind=${kind%%:*}
-		;;
-	esac
+    	local kind=$2 noah= 
 
 	case $kind in
-	    *:[1-9]*)
-		markval=${kind#*}
-		kind=${kind%:*}
-		;;		
 	    *:*)
 	    	noah=${kind#*:}
 		[ $noah = noah -o $noah = NOAH ] || fatal_error "Invalid IPSEC modifier $noah in tunnel \"$tunnel\""
@@ -2129,9 +2118,9 @@ setup_tc1() {
     # Link to the TC mangle chains from the main chains
     #
 
-    run_iptables -t mangle -A FORWARD -m mark --mark 0 -j tcfor
-    run_iptables -t mangle -A PREROUTING               -j tcpre
-    run_iptables -t mangle -A OUTPUT                   -j tcout
+    run_iptables -t mangle -A FORWARD    -j tcfor
+    run_iptables -t mangle -A PREROUTING -j tcpre
+    run_iptables -t mangle -A OUTPUT     -j tcout
 
     run_user_exit tcstart