From fcbe8768c39dd4cb8697206cc4e1abf52ac5f052 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Tue, 1 May 2007 23:04:30 +0000
Subject: [PATCH] Another round of Macro fiddling

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6185 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-perl/Shorewall/Macros.pm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Shorewall-perl/Shorewall/Macros.pm b/Shorewall-perl/Shorewall/Macros.pm
index 78b89db46..627259f76 100644
--- a/Shorewall-perl/Shorewall/Macros.pm
+++ b/Shorewall-perl/Shorewall/Macros.pm
@@ -112,9 +112,8 @@ sub merge_macro_source_dest( $$ ) {
 sub merge_macro_column( $$ ) {
     my ( $body, $invocation ) = @_;
 
-    if ( defined $invocation && $invocation ne '' ) {
-	return ( $body || '') if $invocation eq '-';
-	$invocation || '';
+    if ( defined $invocation && $invocation ne '' && $invocation ne '-' ) {
+	$invocation;
     } else {
 	$body || '';
     }