From 37a5edb43a660fad8cf2dfe1b9e06c060a5dee6c Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Mon, 14 May 2007 22:07:36 +0000
Subject: [PATCH] More rational approach to leading '+' removal

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6351 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-common/lib.dynamiczones | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Shorewall-common/lib.dynamiczones b/Shorewall-common/lib.dynamiczones
index 7b6b3c3bf..a46b0cf90 100644
--- a/Shorewall-common/lib.dynamiczones
+++ b/Shorewall-common/lib.dynamiczones
@@ -46,7 +46,7 @@ add_to_zone() # $1...${n-1} = <interface>[:<hosts>] $n = zone
 	[ -n "$IPRANGE_MATCH" ] && [ -f $TMP_DIR/iprange ] && rm -f $TMP_DIR/iprange
 
 	if ! $IPTABLES $@ ; then
-	    error_message "ERROR: Can't add ${newhost#+} to zone $zone"
+	    error_message "ERROR: Can't add $newhost to zone $zone"
 	fi
     }
 
@@ -154,11 +154,11 @@ add_to_zone() # $1...${n-1} = <interface>[:<hosts>] $n = zone
     # Create a new Zone state file
     #
     for newhost in $newhostlist; do
+	newhost=${newhost#+}
         #
         # Isolate interface and host parts
         #
 	interface=${newhost%%:*}
-	interface=${interface#+}
 	host=${newhost#*:}
         #
         # If the zone passed in the command has a dnat chain then insert a rule in
@@ -220,7 +220,7 @@ add_to_zone() # $1...${n-1} = <interface>[:<hosts>] $n = zone
 	    fi
 	done < ${VARDIR}/chains
 
-	progress_message "${newhost#+} added to zone $zone"
+	progress_message "$newhost added to zone $zone"
 
     done