holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Take care of '$LOG_LEVEL' during update

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2020-07-06 15:38:01 -07:00
parent 2f58d4e368
commit cd5409d633
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Shorewall/Perl/Shorewall/Config.pm
View File

@ -4413,7 +4413,9 @@ sub validate_level( $;$ ) {
sub default_log_level( $$ ) { sub default_log_level( $$ ) {
my ( $level, $default ) = @_; my ( $level, $default ) = @_;
my $value = $config{$level}; my $value = $config{$level} || '';
$value = $config{LOG_LEVEL} if $value eq '$LOG_LEVEL'; #This can happen during update
unless ( supplied $value ) { unless ( supplied $value ) {
$config{$level} = validate_level $default, $level; $config{$level} = validate_level $default, $level;
@ -6836,6 +6838,12 @@ sub get_configuration( $$$ ) {
require_capability 'AUDIT_TARGET', "SMURF_DISPOSITION=$val", 's' if $val =~ /^A_/; require_capability 'AUDIT_TARGET', "SMURF_DISPOSITION=$val", 's' if $val =~ /^A_/;
if ( supplied( $val = $config{LOG_LEVEL} ) ) {
validate_level( $val );
} else {
$config{LOG_LEVEL} = 'info';
}
default_log_level 'BLACKLIST_LOG_LEVEL', ''; default_log_level 'BLACKLIST_LOG_LEVEL', '';
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', '';
@ -6844,12 +6852,6 @@ sub get_configuration( $$$ ) {
default_log_level 'INVALID_LOG_LEVEL', ''; default_log_level 'INVALID_LOG_LEVEL', '';
default_log_level 'UNTRACKED_LOG_LEVEL', ''; default_log_level 'UNTRACKED_LOG_LEVEL', '';
if ( supplied( $val = $config{LOG_LEVEL} ) ) {
validate_level( $val );
} else {
$config{LOG_LEVEL} = 'info';
}
if ( supplied( $val = $config{LOG_BACKEND} ) ) { if ( supplied( $val = $config{LOG_BACKEND} ) ) {
if ( $family == F_IPV4 && $val eq 'ULOG' ) { if ( $family == F_IPV4 && $val eq 'ULOG' ) {
$val = 'ipt_ULOG'; $val = 'ipt_ULOG';