Update trunk with Macro REDIRECT fix

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@7387 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-09-25 20:02:55 +00:00
parent 900a40b9d1
commit d9e2c5b973

View File

@ -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 );
}