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

Cleanup of rewritten validate_level()

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2011-11-13 05:58:59 -08:00
parent 73ed66b9b9
commit 28a1087cd4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2159,7 +2159,7 @@ sub validate_level( $ ) {
# #
level_error( $rawlevel ) if supplied $qualifier; level_error( $rawlevel ) if supplied $qualifier;
require_capability ( 'LOG_TARGET' , "Log level $level", 's' ) unless $value eq ''; require_capability ( 'LOG_TARGET' , "Log level $level", 's' );
return $value; return $value;
} }
@ -2188,6 +2188,8 @@ sub validate_level( $ ) {
} elsif ( $qualifier =~ /^ --/ ) { } elsif ( $qualifier =~ /^ --/ ) {
return $rawlevel; return $rawlevel;
} else {
level_error( $rawlevel ) if $qualifier;
} }
return $olevel; return $olevel;
@ -2196,9 +2198,7 @@ sub validate_level( $ ) {
# #
# Must be LOGMARK # Must be LOGMARK
# #
if ( $qualifier =~ /^ --/ ) { return $rawlevel if $qualifier =~ /^ --/;
return $rawlevel;
}
my $sublevel; my $sublevel;