From d096b9399a853d03e3bb85b60cec43a1341d6d88 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Tue, 15 Nov 2011 16:41:32 -0800 Subject: [PATCH] Fix '\!' handling in validate_level() Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Config.pm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm index 3773166f3..48835900b 100644 --- a/Shorewall/Perl/Shorewall/Config.pm +++ b/Shorewall/Perl/Shorewall/Config.pm @@ -2143,13 +2143,12 @@ sub validate_level( $ ) { my $level = uc $rawlevel; if ( supplied ( $level ) ) { + $level =~ s/!$//; my $value = $level; my $qualifier; - $value =~ s/^!//; - unless ( $value =~ /^[0-7]$/ ) { - level_error( $level ) unless $level =~ /^!?([A-Za-z0-7]+)(.*)$/ && defined( $value = $validlevels{$1} ); + level_error( $level ) unless $level =~ /^([A-Za-z0-7]+)(.*)$/ && defined( $value = $validlevels{$1} ); $qualifier = $2; }