forked from extern/shorewall_code
Fix tag handling with macros
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6191 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
2243553b28
commit
3d4900ef9e
@ -101,7 +101,7 @@ sub merge_levels ($$) {
|
|||||||
return "$target:none!:$tag" if $level eq 'none!';
|
return "$target:none!:$tag" if $level eq 'none!';
|
||||||
return "$target:$level:$tag" if $level =~ /!$/;
|
return "$target:$level:$tag" if $level =~ /!$/;
|
||||||
return $subordinate if $subparts >= 2;
|
return $subordinate if $subparts >= 2;
|
||||||
return "$target:$level";
|
return "$target:$level:$tag";
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( @supparts == 2 ) {
|
if ( @supparts == 2 ) {
|
||||||
|
@ -1541,7 +1541,7 @@ sub expand_rule( $$$$$$$$$$ )
|
|||||||
for my $inet ( mysplit $inets ) {
|
for my $inet ( mysplit $inets ) {
|
||||||
$inet = match_source_net $inet;
|
$inet = match_source_net $inet;
|
||||||
for my $dnet ( mysplit $dnets ) {
|
for my $dnet ( mysplit $dnets ) {
|
||||||
if ( $loglevel ) {
|
if ( $loglevel ne '' ) {
|
||||||
log_rule_limit
|
log_rule_limit
|
||||||
$loglevel ,
|
$loglevel ,
|
||||||
$chainref ,
|
$chainref ,
|
||||||
|
Loading…
Reference in New Issue
Block a user