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

Add INLINE_MATCHES=Yes to deprecated option list

Browse Source 
- Issue a warning for each line requiring change.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2018-02-07 13:43:14 -08:00
parent 2e4af68b98
commit 91c76f7559
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -709,8 +709,8 @@ our %validlevels; # Valid log levels.
# #
# Deprecated options with their default values # Deprecated options with their default values
# #
our %deprecated = ( our %deprecated = ( LEGACY_RESTART => 'no' ,
LEGACY_RESTART => 'no' INLINE_MATCHES => 'no' ,
); );
# #
# Deprecated options that are eliminated via update # Deprecated options that are eliminated via update
@ -835,7 +835,7 @@ sub initialize( $;$$$) {
TC_SCRIPT => '', TC_SCRIPT => '',
EXPORT => 0, EXPORT => 0,
KLUDGEFREE => '', KLUDGEFREE => '',
VERSION => "5.1.12-Beta2", VERSION => "5.1.12",
CAPVERSION => 50112 , CAPVERSION => 50112 ,
BLACKLIST_LOG_TAG => '', BLACKLIST_LOG_TAG => '',
RELATED_LOG_TAG => '', RELATED_LOG_TAG => '',
@ -2439,6 +2439,8 @@ sub split_line2( $$;$$$ ) {
if ( $inlinematches ) { if ( $inlinematches ) {
fatal_error "The $description does not support inline matches (INLINE_MATCHES=Yes)" unless $inline; fatal_error "The $description does not support inline matches (INLINE_MATCHES=Yes)" unless $inline;
warning_message "This entry needs to be changed before the INLINE_MATCHES option is removed in Shorewall 5.2";
$inline_matches = $pairs; $inline_matches = $pairs;
if ( $columns =~ /^(\s*|.*[^&@%])\{(.*)\}\s*$/ ) { if ( $columns =~ /^(\s*|.*[^&@%])\{(.*)\}\s*$/ ) {