From 24dc05e6b7e62d1bd175f28436c2189631647118 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sun, 7 Aug 2005 00:17:29 +0000
Subject: [PATCH] Fix a couple of bugs

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

diff --git a/Shorewall/firewall b/Shorewall/firewall
index cd0737953..58cfbaf31 100755
--- a/Shorewall/firewall
+++ b/Shorewall/firewall
@@ -4093,7 +4093,7 @@ merge_levels() # $1=level at which superior action is called, $2=level at which
 #
 substitute_action() # $1 = parameter, $2 = action
 {
-    local logpart=${2%%:*}
+    local logpart=${2##*:}
 
     case $2 in
 	*:*)
@@ -4704,7 +4704,7 @@ add_nat_rule() {
 	    fi
 	else
 	    if [ -n "${excludezones}${excludedests}" ]; then
-		chain=$( build_exclusion_chain nat "" $excludedests
+		chain=$( build_exclusion_chain nat "" $excludedests )
 
 		for adr in $(separate_list $addr); do
 		    addnatrule $(dnat_chain $source) $cli $proto $multiport $sports $dports $(dest_ip_range $adr) -j $chain