From 407bc8f8db2e3ad472e88efa1d9a8752d3c07de9 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sun, 13 Mar 2016 12:57:23 -0700 Subject: [PATCH] More prerule fixes in expand_rule() Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Chains.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Shorewall/Perl/Shorewall/Chains.pm b/Shorewall/Perl/Shorewall/Chains.pm index 4d9c013ca..24bac05a5 100644 --- a/Shorewall/Perl/Shorewall/Chains.pm +++ b/Shorewall/Perl/Shorewall/Chains.pm @@ -7762,7 +7762,7 @@ sub expand_rule( $$$$$$$$$$$$;$ ) '' , $logtag , 'add' , - $matches + $prerule . $matches ); } elsif ( $logname || $basictarget eq 'RETURN' ) { log_rule_limit( @@ -7773,7 +7773,7 @@ sub expand_rule( $$$$$$$$$$$$;$ ) '', $logtag, 'add', - $matches ); + $prerule . $matches ); if ( $targetref ) { add_expanded_jump( $chainref, $targetref, 0, $matches ); @@ -7793,7 +7793,7 @@ sub expand_rule( $$$$$$$$$$$$;$ ) $actparms{disposition} || $disposition, $target ), $terminating{$basictarget} || ( $targetref && $targetref->{complete} ), - $matches ); + $prerule . $matches ); } conditional_rule_end( $chainref ) if $cond3;