extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-19 17:28:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update trunk with Macro REDIRECT fix

Browse Source 
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
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Shorewall-perl/Shorewall/Rules.pm
View File

@ -891,8 +891,6 @@ sub process_macro ( $$$$$$$$$$$$$ ) {
$msource = ''; $msource = '';
} }
$msource = '' if $msource eq '-';
if ( $mdest ) { if ( $mdest ) {
if ( ( $mdest eq '-' ) || ( $mdest eq 'DEST' ) ) { if ( ( $mdest eq '-' ) || ( $mdest eq 'DEST' ) ) {
$mdest = $dest || ''; $mdest = $dest || '';
@ -905,8 +903,6 @@ sub process_macro ( $$$$$$$$$$$$$ ) {
$mdest = ''; $mdest = '';
} }
$mdest = '' if $mdest eq '-';
$mproto = merge_macro_column $mproto, $proto; $mproto = merge_macro_column $mproto, $proto;
$mports = merge_macro_column $mports, $ports; $mports = merge_macro_column $mports, $ports;
$msports = merge_macro_column $msports, $sports; $msports = merge_macro_column $msports, $sports;
@ -1000,7 +996,7 @@ sub process_rule1 ( $$$$$$$$$$$ ) {
# #
if ( $actiontype & REDIRECT ) { if ( $actiontype & REDIRECT ) {
if ( $dest eq '-' ) { if ( $dest eq '-' ) {
$dest = "firewall_zone"; $dest = firewall_zone;
} else { } else {
$dest = join( '', firewall_zone, '::', $dest ); $dest = join( '', firewall_zone, '::', $dest );
} }