mirror of
https://gitlab.com/shorewall/code.git
synced 2024-11-15 04:04:10 +01:00
Another fix for NONE policy plus fix broken matrix generation in 6468
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6469 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
a8cb589333
commit
40f3593f69
@ -244,14 +244,13 @@ sub validate_policy()
|
||||
#
|
||||
sub policy_rules( $$$$ ) {
|
||||
my ( $chainref , $target, $loglevel, $default ) = @_;
|
||||
|
||||
add_rule $chainref, "-j $default" if $default && $default ne 'none';
|
||||
|
||||
log_rule $loglevel , $chainref , $target , '' if $loglevel ne '';
|
||||
|
||||
fatal_error "Null target in policy_rules()" unless $target;
|
||||
|
||||
add_rule $chainref , ( '-j ' . ( $target eq 'REJECT' ? 'reject' : $target ) ) unless $target eq 'CONTINUE';
|
||||
|
||||
unless ( $target eq 'NONE' ) {
|
||||
add_rule $chainref, "-j $default" if $default && $default ne 'none';
|
||||
log_rule $loglevel , $chainref , $target , '' if $loglevel ne '';
|
||||
fatal_error "Null target in policy_rules()" unless $target;
|
||||
add_rule $chainref , ( '-j ' . ( $target eq 'REJECT' ? 'reject' : $target ) ) unless $target eq 'CONTINUE';
|
||||
}
|
||||
}
|
||||
|
||||
sub report_syn_flood_protection() {
|
||||
|
@ -1726,7 +1726,7 @@ sub generate_matrix() {
|
||||
#
|
||||
add_rule(
|
||||
$chain3ref ,
|
||||
join( '', match_dest_dev($interface), match_source_net($net), match_dest_net($net1), $ipsec_out_match, "-j $chain" )
|
||||
join( '', match_dest_dev($interface1), match_source_net($net), match_dest_net($net1), $ipsec_out_match, "-j $chain" )
|
||||
);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user