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

Delete support for single semicolon in INLINE and IP[6]TABLES rules

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2018-02-12 19:12:03 -08:00
parent 3402b1efb6
commit 5e3795b5a4
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10
1 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2425,7 +2425,7 @@ sub split_line2( $$;$$$ ) {
} }
} }
# #
# Next, see if there is a semicolon on the line; what follows will be column/value pairs or raw iptables input # Next, see if there is a single semicolon on the line; what follows will be column/value pairs
# #
( $columns, $pairs, $rest ) = split( ';', $currline ); ( $columns, $pairs, $rest ) = split( ';', $currline );
@ -2434,25 +2434,6 @@ sub split_line2( $$;$$$ ) {
# Found it -- be sure there wasn't more than one. # Found it -- be sure there wasn't more than one.
# #
fatal_error "Only one semicolon (';') allowed on a line" if defined $rest; fatal_error "Only one semicolon (';') allowed on a line" if defined $rest;
if ( $inline ) {
#
# This file supports INLINE or IPTABLES
#
if ( $currline =~ /^\s*INLINE(?:\(.*\)(:.*)?|:.*)?\s/ || $currline =~ /^\s*IP6?TABLES(?:\(.*\)|:.*)?\s/ ) {
$inline_matches = $pairs;
if ( $columns =~ /^(\s*|.*[^&@%])\{(.*)\}\s*$/ ) {
#
# Pairs are enclosed in curly brackets.
#
$columns = $1;
$pairs = $2;
} else {
$pairs = '';
}
}
}
} elsif ( $currline =~ /^(\s*|.*[^&@%])\{(.*)\}$/ ) { } elsif ( $currline =~ /^(\s*|.*[^&@%])\{(.*)\}$/ ) {
# #
# Pairs are enclosed in curly brackets. # Pairs are enclosed in curly brackets.