diff --git a/Shorewall-perl/Shorewall/Config.pm b/Shorewall-perl/Shorewall/Config.pm index 3fd588dc0..a160bc287 100644 --- a/Shorewall-perl/Shorewall/Config.pm +++ b/Shorewall-perl/Shorewall/Config.pm @@ -522,7 +522,7 @@ sub default_log_level( $$ ) { my $value = $config{$level}; - unless ( defined $value ) { + unless ( defined $value && $value ne '' ) { $config{$level} = $default; } else { $config{$level} = validate_level $value; @@ -935,7 +935,7 @@ sub get_configuration( $ ) { default_log_level 'BLACKLIST_LOGLEVEL', ''; default_log_level 'MACLIST_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 'LOGALLNEW', ''; diff --git a/Shorewall-perl/Shorewall/Policy.pm b/Shorewall-perl/Shorewall/Policy.pm index 5dda40504..0b29974b6 100644 --- a/Shorewall-perl/Shorewall/Policy.pm +++ b/Shorewall-perl/Shorewall/Policy.pm @@ -337,7 +337,7 @@ sub complete_standard_chain ( $$$ ) { run_user_exit $stdchainref; 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; $policychainref = $ruleschainref->{policychain} if $ruleschainref; diff --git a/Shorewall-perl/Shorewall/Rules.pm b/Shorewall-perl/Shorewall/Rules.pm index f0d3cba1e..a4b2f441a 100644 --- a/Shorewall-perl/Shorewall/Rules.pm +++ b/Shorewall-perl/Shorewall/Rules.pm @@ -475,7 +475,7 @@ sub add_common_rules() { 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( 'logreject' ), ' ' , 'REJECT' , $level ;