extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-05-29 22:18:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix subtle bug introduced in last commit

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9842 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2009-04-10 20:36:09 +00:00
parent 20cfd0033c
commit b734d3af31
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2697,7 +2697,7 @@ sub expand_rule( $$$$$$$$$$ )
$source_match = match_source_net( $inet, $restriction ) unless $capabilities{KLUDGEFREE}; $source_match = match_source_net( $inet, $restriction ) unless $capabilities{KLUDGEFREE};
my $dest_match = match_dest_net( $dnet ); my $dest_match = match_dest_net( $dnet );
my $rule = join( '', $rule, $source_match, $dest_match, $onet ); my $predicates = join( '', $rule, $source_match, $dest_match, $onet );
if ( $loglevel ne '' ) { if ( $loglevel ne '' ) {
if ( $disposition ne 'LOG' ) { if ( $disposition ne 'LOG' ) {
@ -2708,9 +2708,9 @@ sub expand_rule( $$$$$$$$$$ )
# #
# Jump to the log chain if all of the rule's conditions are met # Jump to the log chain if all of the rule's conditions are met
# #
add_jump( $chainref, $logchainref, $builtin_target{$disposition}, $rule, 1 ); add_jump( $chainref, $logchainref, $builtin_target{$disposition}, $predicates, 1 );
$rule = ''; $predicates = '';
log_rule_limit( log_rule_limit(
$loglevel , $loglevel ,
@ -2730,13 +2730,13 @@ sub expand_rule( $$$$$$$$$$ )
'' , '' ,
$logtag , $logtag ,
'add' , 'add' ,
$rule $predicates
); );
} }
} }
unless ( $disposition eq 'LOG' ) { unless ( $disposition eq 'LOG' ) {
add_rule( $chainref, $rule . $target , 1 ); add_rule( $chainref, $predicates . $target , 1 );
} }
} }
} }