From 1f4e3572d95f5616d08de7f02eac01bf4cab64b4 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sat, 24 Dec 2005 15:39:58 +0000
Subject: [PATCH] Fix logging with mapped standard actions

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3194 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/changelog.txt    | 2 ++
 Shorewall/firewall         | 1 +
 Shorewall/releasenotes.txt | 3 +++
 3 files changed, 6 insertions(+)

diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt
index df088dd2d..a5be37feb 100755
--- a/Shorewall/changelog.txt
+++ b/Shorewall/changelog.txt
@@ -14,6 +14,8 @@ Changes in 3.0.4
 
 7)  Wildcard port support.
 
+8)  Fix logging of old mapped standard actions.
+
 Changes in 3.0.3
 
 1) Implement "shorewall show macros"
diff --git a/Shorewall/firewall b/Shorewall/firewall
index 4d0422d1e..a06e4e79a 100755
--- a/Shorewall/firewall
+++ b/Shorewall/firewall
@@ -4886,6 +4886,7 @@ map_old_action() # $1 = Potential Old Action
 
 	if [ -f $(find_file macro.$macro) ]; then
 	    echo $macro/$aktion
+	    return
 	fi
     fi
 
diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt
index 45b8649c2..1b144dd3d 100755
--- a/Shorewall/releasenotes.txt
+++ b/Shorewall/releasenotes.txt
@@ -70,6 +70,9 @@ Problems Corrected in 3.0.4
 	    reboot
 	    shorewall -f start (which is the default during boot up)
 
+5)  When a 2.x standard action is invoked with a log level (example
+    "AllowPing:info"), logging does not occur.
+
 New Features in 3.0.4
 
 1)  By popular demand, the 'Limit' action described at