From a4dcd1071a17b3c1dec0cf17ea60676bcd7d7fea Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Mon, 26 Nov 2012 13:41:12 -0800 Subject: [PATCH] Revert change to macro level merging. Signed-off-by: Tom Eastep --- 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 8ac717069..1a9d23446 100644 --- a/Shorewall/Perl/Shorewall/Rules.pm +++ b/Shorewall/Perl/Shorewall/Rules.pm @@ -1672,11 +1672,7 @@ sub process_macro ($$$$$$$$$$$$$$$$$$$) { next; } - unless ( $section eq 'DEFAULTACTION' ) { - $mtarget = merge_levels $target, $mtarget; - } else { - $mtarget = merge_levels( $target, $mtarget ) if $mtarget eq 'LOG'; - } + $mtarget = merge_levels $target, $mtarget; if ( $mtarget =~ /^PARAM(:.*)?$/ ) { fatal_error 'PARAM requires a parameter to be supplied in macro invocation' unless $param ne '';