From ea038bcecb5d300c401eee0819cee671549a4d58 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Tue, 28 Jun 2011 06:42:41 -0700 Subject: [PATCH] Correct regular expression in process_shorewall_conf() Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Config.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm index 743009b62..22dabf7a4 100644 --- a/Shorewall/Perl/Shorewall/Config.pm +++ b/Shorewall/Perl/Shorewall/Config.pm @@ -3061,7 +3061,7 @@ sub process_shorewall_conf( $$ ) { # for ( values %config ) { if ( supplied $_ ) { - expand_variables( $_ ) unless /$'(.+)'$/; + expand_variables( $_ ) unless /^'(.+)'$/; } } } @@ -3085,7 +3085,8 @@ sub read_capabilities() { } if ( $capabilities{CAPVERSION} ) { - warning_message "Your capabilities file is out of date -- it does not contain all of the capabilities defined by $Product version $globals{VERSION}" unless $capabilities{CAPVERSION} >= $globals{CAPVERSION}; + warning_message "Your capabilities file is out of date -- it does not contain all of the capabilities defined by $Product version $globals{VERSION}" + unless $capabilities{CAPVERSION} >= $globals{CAPVERSION}; } else { warning_message "Your capabilities file may not contain all of the capabilities defined by $Product version $globals{VERSION}"; }