From a54f9650633d3177dcca7c29f75970365db6e3e0 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Wed, 18 Oct 2006 22:37:50 +0000
Subject: [PATCH] Tweak host file exclusion

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4700 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/compiler | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/Shorewall/compiler b/Shorewall/compiler
index 0b3d5dd49..0f2d16ffa 100755
--- a/Shorewall/compiler
+++ b/Shorewall/compiler
@@ -4113,8 +4113,8 @@ activate_rules()
 
 	    if [ -n "$exclusions" ]; then
 		local num=1
-		in_chain=${zone}_in
-		out_chain=${zone}_out
+		in_chain=${zone}_input
+		out_chain=${zone}_output
 		createchain $in_chain No
 		createchain $out_chain No
 
@@ -4176,7 +4176,6 @@ activate_rules()
 	fi
 
 	need_broadcast=
-
 	
 	if [ -n "$complex" ]; then
 	    frwd_chain=${zone}_frwd
@@ -4198,8 +4197,8 @@ activate_rules()
 
 	    if [ -n "$chain1" ]; then
 		if [ -n "$exclusions" ]; then
-		    run_iptables2 -A OUTPUT -o $interface $(match_dest_hosts $networks) $(match_ipsec_out $zone $host) -j ${zone}_out
-		    run_iptables -A ${zone}_out -j $chain1
+		    run_iptables2 -A OUTPUT -o $interface $(match_dest_hosts $networks) $(match_ipsec_out $zone $host) -j ${zone}_output
+		    run_iptables -A ${zone}_output -j $chain1
 		else
 		    run_iptables2 -A OUTPUT -o $interface $(match_dest_hosts $networks) $(match_ipsec_out $zone $host) -j $chain1
 		fi
@@ -4211,8 +4210,8 @@ activate_rules()
 
 	    if [ -n "$chain2" ]; then
 		if [ -n "$exclusions" ]; then
-		    run_iptables2 -A $(input_chain $interface) $(match_source_hosts $networks) $(match_ipsec_in $zone $host) -j ${zone}_in
-		    run_iptables -A ${zone}_in -j $chain2
+		    run_iptables2 -A $(input_chain $interface) $(match_source_hosts $networks) $(match_ipsec_in $zone $host) -j ${zone}_input
+		    run_iptables -A ${zone}_input -j $chain2
 		else		
 		    run_iptables2 -A $(input_chain $interface) $(match_source_hosts $networks) $(match_ipsec_in $zone $host) -j $chain2
 		fi