From 34507e4057fd4b17bcb61674d4c407e52b17df1b Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Tue, 19 Jun 2007 19:42:49 +0000
Subject: [PATCH] More BPORT/Dynamic Zone stuff

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6600 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-common/lib.config       | 4 +++-
 Shorewall-common/lib.dynamiczones | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Shorewall-common/lib.config b/Shorewall-common/lib.config
index 7a15f2b44..010f9a1d9 100644
--- a/Shorewall-common/lib.config
+++ b/Shorewall-common/lib.config
@@ -233,6 +233,7 @@ determine_zones()
     ZONES=
     IPV4_ZONES=
     IPSEC_ZONES=
+    BPORT_ZONES=
 
     [ "$IPSECFILE" = zones ] && new_zone_file=Yes || test -n "${FW:=fw}"
 
@@ -295,7 +296,8 @@ determine_zones()
 		    [ "$PROGRAM" = compiler ] && startup_error "Invalid Zone Type: $type"
 		    list_search $zone $ZONES $FW && startup_error "Zone $zone is defined more than once"
 		    merge_zone
-		    IPV4_ZONES="$IPV4_ZONES $zone"
+		    BPORT_ZONES="$BPORT_ZONES $zone"
+		    BRIDGING=Yes
 		    ;;
 		*)
 		    startup_error "Invalid Zone Type: $type"
diff --git a/Shorewall-common/lib.dynamiczones b/Shorewall-common/lib.dynamiczones
index 7785a610f..d31ef8fdc 100644
--- a/Shorewall-common/lib.dynamiczones
+++ b/Shorewall-common/lib.dynamiczones
@@ -174,6 +174,7 @@ add_to_zone() # $1...${n-1} = <interface>[:<hosts>] $n = zone
         # Insert new rules into the filter table for the passed interface
         #
 	while read z1 z2 chain; do
+	    [ -z "$chain" ] && continue
 	    [ "$z1" = "$z2" ] && op="-I" || op="-A"
 	    if [ "$z1" = "$zone" ]; then
 		if [ "$z2" = "$FW" ]; then