From 199416cbefbe5e13a914f884f2cdff5ab512841d Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Wed, 5 Jul 2006 15:12:02 +0000
Subject: [PATCH] Cleaner fix for extraneous quote problem

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4192 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/functions        | 29 ++++++++++-------------------
 Shorewall/releasenotes.txt |  6 ++++--
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/Shorewall/functions b/Shorewall/functions
index 560774552..44703f4b9 100644
--- a/Shorewall/functions
+++ b/Shorewall/functions
@@ -1478,25 +1478,16 @@ log_rule_limit() # $1 = log level, $2 = chain, $3 = display Chain $4 = dispositi
 	error_message "WARNING: Log Prefix shortened to \"$prefix\""
     fi
 
-    if [ "$COMMAND" = compile ]; then
-	case $level in
-	    ULOG)
-		run_iptables $command $chain $@ $limit -j ULOG $LOGPARMS --ulog-prefix \"$prefix\"
-		;;
-	    *)
-		run_iptables $command $chain $@ $limit -j LOG $LOGPARMS --log-level $level --log-prefix \"$prefix\"
-		;;
-	esac
-    else
-	case $level in
-	    ULOG)
-		run_iptables $command $chain $@ $limit -j ULOG $LOGPARMS --ulog-prefix "$prefix"
-		;;
-	    *)
-		run_iptables $command $chain $@ $limit -j LOG $LOGPARMS --log-level $level --log-prefix "$prefix"
-		;;
-	esac
-    fi
+    [ "$COMMAND" = compile ] && prefix="\"$prefix\""
+
+    case $level in
+	ULOG)
+	    run_iptables $command $chain $@ $limit -j ULOG $LOGPARMS --ulog-prefix "$prefix"
+	    ;;
+	*)
+	    run_iptables $command $chain $@ $limit -j LOG $LOGPARMS --log-level $level --log-prefix "$prefix"
+	    ;;
+    esac
 
     if [ $? -ne 0 ] ; then
 	[ -z "$STOPPING" ] && { stop_firewall; exit 2; }
diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt
index ac89426b8..faf630167 100644
--- a/Shorewall/releasenotes.txt
+++ b/Shorewall/releasenotes.txt
@@ -33,8 +33,10 @@ Note to users upgrading from Shorewall 2.x or 3.0
 
 Problems Corrected in 3.2.0 Final
 
-1)  Logging rules generated at run-time (such as smurf rules) contained
-    extraneous double quotes around the log prefix.
+1)  Logging rules generated at run-time (such as smurf rules associated
+    with interfaces with 'detect' in the BROADCAST column of
+    /etc/shorewall/interfaces) contained extraneous double quotes
+    around the log prefix.
 
 Other changes in 3.2.0 Final