diff --git a/Shorewall-perl/Shorewall/Actions.pm b/Shorewall-perl/Shorewall/Actions.pm index f9525ac63..ea98214aa 100644 --- a/Shorewall-perl/Shorewall/Actions.pm +++ b/Shorewall-perl/Shorewall/Actions.pm @@ -101,7 +101,7 @@ sub merge_levels ($$) { return "$target:none!:$tag" if $level eq 'none!'; return "$target:$level:$tag" if $level =~ /!$/; return $subordinate if $subparts >= 2; - return "$target:$level"; + return "$target:$level:$tag"; } if ( @supparts == 2 ) { diff --git a/Shorewall-perl/Shorewall/Chains.pm b/Shorewall-perl/Shorewall/Chains.pm index 975071a0d..859b286b7 100644 --- a/Shorewall-perl/Shorewall/Chains.pm +++ b/Shorewall-perl/Shorewall/Chains.pm @@ -1541,7 +1541,7 @@ sub expand_rule( $$$$$$$$$$ ) for my $inet ( mysplit $inets ) { $inet = match_source_net $inet; for my $dnet ( mysplit $dnets ) { - if ( $loglevel ) { + if ( $loglevel ne '' ) { log_rule_limit $loglevel , $chainref ,