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

More prerule fixes in expand_rule()

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2016-03-13 12:57:23 -07:00
parent 2743a411ae
commit 407bc8f8db
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Shorewall/Perl/Shorewall/Chains.pm
View File

@ -7762,7 +7762,7 @@ sub expand_rule( $$$$$$$$$$$$;$ )
'' , '' ,
$logtag , $logtag ,
'add' , 'add' ,
$matches $prerule . $matches
); );
} elsif ( $logname || $basictarget eq 'RETURN' ) { } elsif ( $logname || $basictarget eq 'RETURN' ) {
log_rule_limit( log_rule_limit(
@ -7773,7 +7773,7 @@ sub expand_rule( $$$$$$$$$$$$;$ )
'', '',
$logtag, $logtag,
'add', 'add',
$matches ); $prerule . $matches );
if ( $targetref ) { if ( $targetref ) {
add_expanded_jump( $chainref, $targetref, 0, $matches ); add_expanded_jump( $chainref, $targetref, 0, $matches );
@ -7793,7 +7793,7 @@ sub expand_rule( $$$$$$$$$$$$;$ )
$actparms{disposition} || $disposition, $actparms{disposition} || $disposition,
$target ), $target ),
$terminating{$basictarget} || ( $targetref && $targetref->{complete} ), $terminating{$basictarget} || ( $targetref && $targetref->{complete} ),
$matches ); $prerule . $matches );
} }
conditional_rule_end( $chainref ) if $cond3; conditional_rule_end( $chainref ) if $cond3;