forked from extern/shorewall_code
Fix BLACKLIST_LOGLEVEL
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6108 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
bb6476ba07
commit
558343be7d
@ -522,7 +522,7 @@ sub default_log_level( $$ ) {
|
|||||||
|
|
||||||
my $value = $config{$level};
|
my $value = $config{$level};
|
||||||
|
|
||||||
unless ( defined $value ) {
|
unless ( defined $value && $value ne '' ) {
|
||||||
$config{$level} = $default;
|
$config{$level} = $default;
|
||||||
} else {
|
} else {
|
||||||
$config{$level} = validate_level $value;
|
$config{$level} = validate_level $value;
|
||||||
@ -935,7 +935,7 @@ sub get_configuration( $ ) {
|
|||||||
default_log_level 'BLACKLIST_LOGLEVEL', '';
|
default_log_level 'BLACKLIST_LOGLEVEL', '';
|
||||||
default_log_level 'MACLIST_LOG_LEVEL', '';
|
default_log_level 'MACLIST_LOG_LEVEL', '';
|
||||||
default_log_level 'TCP_FLAGS_LOG_LEVEL', '';
|
default_log_level 'TCP_FLAGS_LOG_LEVEL', '';
|
||||||
default_log_level 'RFC1918_LOG_LEVEL', 6;
|
default_log_level 'RFC1918_LOG_LEVEL', 6;
|
||||||
default_log_level 'SMURF_LOG_LEVEL', '';
|
default_log_level 'SMURF_LOG_LEVEL', '';
|
||||||
default_log_level 'LOGALLNEW', '';
|
default_log_level 'LOGALLNEW', '';
|
||||||
|
|
||||||
|
@ -337,7 +337,7 @@ sub complete_standard_chain ( $$$ ) {
|
|||||||
run_user_exit $stdchainref;
|
run_user_exit $stdchainref;
|
||||||
|
|
||||||
my $ruleschainref = $filter_table->{"${zone}2${zone2}"};
|
my $ruleschainref = $filter_table->{"${zone}2${zone2}"};
|
||||||
my ( $policy, $loglevel, $default ) = ( 'DROP', 'info', $config{DROP_DEFAULT} );
|
my ( $policy, $loglevel, $default ) = ( 'DROP', 6, $config{DROP_DEFAULT} );
|
||||||
my $policychainref;
|
my $policychainref;
|
||||||
|
|
||||||
$policychainref = $ruleschainref->{policychain} if $ruleschainref;
|
$policychainref = $ruleschainref->{policychain} if $ruleschainref;
|
||||||
|
@ -475,7 +475,7 @@ sub add_common_rules() {
|
|||||||
|
|
||||||
my $rejectref = new_standard_chain 'reject';
|
my $rejectref = new_standard_chain 'reject';
|
||||||
|
|
||||||
$level = $globals{BLACKLIST_LOG_LEVEL} || 'info';
|
$level = $config{BLACKLIST_LOGLEVEL};
|
||||||
|
|
||||||
add_rule_pair new_standard_chain( 'logdrop' ), ' ' , 'DROP' , $level ;
|
add_rule_pair new_standard_chain( 'logdrop' ), ' ' , 'DROP' , $level ;
|
||||||
add_rule_pair new_standard_chain( 'logreject' ), ' ' , 'REJECT' , $level ;
|
add_rule_pair new_standard_chain( 'logreject' ), ' ' , 'REJECT' , $level ;
|
||||||
|
Loading…
Reference in New Issue
Block a user