holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Revert change to macro level merging.

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-11-26 13:41:12 -08:00
parent 78ba8bac50
commit a4dcd1071a
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

@ -1672,11 +1672,7 @@ sub process_macro ($$$$$$$$$$$$$$$$$$$) {
next; next;
} }
unless ( $section eq 'DEFAULTACTION' ) { $mtarget = merge_levels $target, $mtarget;
$mtarget = merge_levels $target, $mtarget;
} else {
$mtarget = merge_levels( $target, $mtarget ) if $mtarget eq 'LOG';
}
if ( $mtarget =~ /^PARAM(:.*)?$/ ) { if ( $mtarget =~ /^PARAM(:.*)?$/ ) {
fatal_error 'PARAM requires a parameter to be supplied in macro invocation' unless $param ne ''; fatal_error 'PARAM requires a parameter to be supplied in macro invocation' unless $param ne '';