From b5d3078fa6bf79416db2369d44c279a7d08803a6 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Mon, 24 Mar 2003 21:02:29 +0000
Subject: [PATCH] Add intermediate input chain for complex zones

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@524 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/firewall | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Shorewall/firewall b/Shorewall/firewall
index 5f1775b12..8708a6b8f 100755
--- a/Shorewall/firewall
+++ b/Shorewall/firewall
@@ -544,7 +544,7 @@ determine_hosts() {
 	    fi
 
 	    [ "${host#*:}" = "0.0.0.0/0" ] || \
-		eval ${zone}_is_constrained=Yes
+		eval ${zone}_is_complex=Yes
 	done
 
 	eval ${zone}_interfaces="\$interfaces"
@@ -3664,9 +3664,9 @@ activate_rules()
 	chain1=`rules_chain $FW $zone`
 	chain2=`rules_chain $zone $FW`
 
-	eval constrained=\$${zone}_is_constrained
+	eval complex=\$${zone}_is_complex
 
-	if [ -n "$constrained" ]; then
+	if [ -n "$complex" ]; then
 	    frwd_chain=${zone}_frwd
 	    createchain $frwd_chain No
 	fi
@@ -3688,7 +3688,7 @@ activate_rules()
 
 	    run_iptables -A `input_chain $interface` -s $subnet -j $chain2
 
-	    [ -n "$constrained" ] && \
+	    [ -n "$complex" ] && \
 		run_iptables -A `forward_chain $interface` -s $subnet -j $frwd_chain
 	done
 
@@ -3707,7 +3707,7 @@ activate_rules()
 	    for host in $source_hosts; do
 		interface=${host%:*}
 
-		if [ -n "$constrained" ]; then
+		if [ -n "$complex" ]; then
 		    chain1=$frwd_chain
 		    subnet=
 		else