From 2157327399b5b3846a52892c5b08c4bcb2730435 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Mon, 23 Oct 2006 15:44:59 +0000
Subject: [PATCH] Minor changes in rules activation; document single release
 notes

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4725 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/compiler         | 15 ++++++---------
 Shorewall/releasenotes.txt |  3 +++
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Shorewall/compiler b/Shorewall/compiler
index 6965a1ead..2b7e010b0 100755
--- a/Shorewall/compiler
+++ b/Shorewall/compiler
@@ -4048,7 +4048,7 @@ activate_rules()
     }
 
     #
-    # Jump to a RULES chain from one of the builtin nat chains. These jumps are
+    # Jump to a RULES chain from one of the builtin nat chains. These jumps
     # are inserted before jumps to one-to-one NAT chains.
     #
     addrulejump() # $1 = BUILTIN chain, $2 = user chain, $3 - * other arguments
@@ -4081,7 +4081,7 @@ activate_rules()
     #
     insert_exclusions() # $1 = table $2 = chain name, $3 - $n = exclusions
     {
-	local t=$1 c=$2 num=0
+	local t=$1 c=$2 num=0 host1 interface1 networks1
 
 	shift 2
 
@@ -4097,18 +4097,19 @@ activate_rules()
     #
     add_exclusions() # $1 = table $2 = chain name, $3 - $n = exclusions
     {
-	local t=$1 c=$2
+	local t=$1 c=$2 host1 interface1 networks1
 
 	shift 2
 
 	for host1 in $*; do
 	    interface1=${host1%%:*}
 	    networks1=${host1#*:}
-	    num=$(($num + 1))
 	    run_iptables -t $t -A $c -o $interface1 -d $networks1 -j RETURN
 	done
     }
     #
+    #                E x e c u t i o n   S t a r t s   H e r e
+    #
     # Add jumps to early SNAT chains
     #
     for interface in $ALL_INTERFACES; do
@@ -4356,22 +4357,18 @@ activate_rules()
 		    ;;
 	    esac
 	done
+
 	#
 	# $dest_zones is now the (possibly condensed) list of destination zones that we need to handle from this source zone
 	#
 	for zone1 in $dest_zones; do
 
 	    eval policy=\$${zone}2${zone1}_policy
-
-	    [ "$policy" = NONE ] && continue
-
 	    eval dest_hosts=\$${zone1}_hosts
 	    eval exclusions1=\"\$${zone1}_exclusions\"
 
 	    chain="$(rules_chain $zone $zone1)"
 
-	    [ -z "$chain" ] && continue # CONTINUE policy and there is no canonical chain.
-
 	    [ -n "$DYNAMIC_ZONES" ] && echo "$zone $zone1 $chain" >> $STATEDIR/chains
 
 	    if [ $zone = $zone1 ]; then
diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt
index f69a184e3..30f44d225 100644
--- a/Shorewall/releasenotes.txt
+++ b/Shorewall/releasenotes.txt
@@ -42,6 +42,9 @@ Other Changes in 3.3.4.
     addr ls". The second produces a report about your routing rules and
     tables.
 
+2)  Beginning with this release, Shorewall and Shorewall Lite will
+    share common change logs and release notes.
+
 Migration Considerations:
 
 1)  Shorewall supports the notion of "default actions". A default