extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-23 19:21:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove silly logic in expand_rule()

Browse Source
This commit is contained in:
Tom Eastep 2009-12-10 08:00:18 -08:00
parent a150ed1a72
commit 9988cfb619
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2754,7 +2754,7 @@ sub expand_rule( $$$$$$$$$$;$ )
add_rule( $echainref, $exceptionrule . $target, 1 ) unless $disposition eq 'LOG'; add_rule( $echainref, $exceptionrule . $target, 1 ) unless $disposition eq 'LOG';
} else { } else {
# #
# No exclusions -- save original chain # No exclusions
# #
my $savechainref = $chainref; my $savechainref = $chainref;
@ -2766,11 +2766,6 @@ sub expand_rule( $$$$$$$$$$;$ )
$source_match = match_source_net( $inet, $restriction ) if $capabilities{KLUDGEFREE}; $source_match = match_source_net( $inet, $restriction ) if $capabilities{KLUDGEFREE};
for my $dnet ( mysplit $dnets ) { for my $dnet ( mysplit $dnets ) {
#
# Restore original Chain
#
$chainref = $savechainref;
$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 $predicates = join( '', $rule, $source_match, $dest_match, $onet ); my $predicates = join( '', $rule, $source_match, $dest_match, $onet );
@ -2791,7 +2786,7 @@ sub expand_rule( $$$$$$$$$$;$ )
# #
log_rule_limit( log_rule_limit(
$loglevel , $loglevel ,
$chainref = $logchainref , $logchainref ,
$chain , $chain ,
$disposition , $disposition ,
'', '',
@ -2799,7 +2794,7 @@ sub expand_rule( $$$$$$$$$$;$ )
'add', 'add',
'' ); '' );
add_rule( $chainref, $exceptionrule . $target ); add_rule( $logchainref, $exceptionrule . $target );
} else { } else {
log_rule_limit( log_rule_limit(
$loglevel , $loglevel ,

2
Shorewall/changelog.txt
View File

@ -26,6 +26,8 @@ Changes in Shorewall 4.4.5
13) Fix handling of SOURCE and DEST vs macros. 13) Fix handling of SOURCE and DEST vs macros.
14) Remove silly logic in expand_rule().
Changes in Shorewall 4.4.4 Changes in Shorewall 4.4.4
1) Change STARTUP_LOG and LOG_VERBOSITY in default shorewall6.conf. 1) Change STARTUP_LOG and LOG_VERBOSITY in default shorewall6.conf.