From d9e2c5b97330d0cb07746f64918dbbf513f7ace0 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Tue, 25 Sep 2007 20:02:55 +0000
Subject: [PATCH] Update trunk with Macro REDIRECT fix

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@7387 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-perl/Shorewall/Rules.pm | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/Shorewall-perl/Shorewall/Rules.pm b/Shorewall-perl/Shorewall/Rules.pm
index af39e4677..dbc01623d 100644
--- a/Shorewall-perl/Shorewall/Rules.pm
+++ b/Shorewall-perl/Shorewall/Rules.pm
@@ -891,8 +891,6 @@ sub process_macro ( $$$$$$$$$$$$$ ) {
 	    $msource = '';
 	}
 
-	$msource = '' if $msource eq '-';
-
 	if ( $mdest ) {
 	    if ( ( $mdest eq '-' ) || ( $mdest eq 'DEST' ) ) {
 		$mdest = $dest || '';
@@ -905,8 +903,6 @@ sub process_macro ( $$$$$$$$$$$$$ ) {
 	    $mdest = '';
 	}
 
-	$mdest   = '' if $mdest   eq '-';
-
 	$mproto  = merge_macro_column $mproto,  $proto;
 	$mports  = merge_macro_column $mports,  $ports;
 	$msports = merge_macro_column $msports, $sports;
@@ -1000,7 +996,7 @@ sub process_rule1 ( $$$$$$$$$$$ ) {
     #
     if ( $actiontype & REDIRECT ) {
 	if ( $dest eq '-' ) {
-	    $dest = "firewall_zone";
+	    $dest = firewall_zone;
 	} else {
 	    $dest = join( '', firewall_zone, '::', $dest );
 	}