mirror of
https://gitlab.com/shorewall/code.git
synced 2024-11-26 17:43:15 +01:00
Avoid issues with Perl 5.30
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
parent
61b6898782
commit
f050fc6e05
@ -2344,7 +2344,7 @@ sub split_line2( $$;$$$ ) {
|
|||||||
|
|
||||||
$inline_matches = $pairs;
|
$inline_matches = $pairs;
|
||||||
|
|
||||||
if ( $columns =~ /^(\s*|.*[^&@%]){(.*)}\s*$/ ) {
|
if ( $columns =~ /^(\s*|.*[^&@%])\{(.*)\}\s*$/ ) {
|
||||||
#
|
#
|
||||||
# Pairs are enclosed in curly brackets.
|
# Pairs are enclosed in curly brackets.
|
||||||
#
|
#
|
||||||
@ -2360,7 +2360,7 @@ sub split_line2( $$;$$$ ) {
|
|||||||
if ( $currline =~ /^\s*INLINE(?:\(.*\)(:.*)?|:.*)?\s/ || $currline =~ /^\s*IP6?TABLES(?:\(.*\)|:.*)?\s/ ) {
|
if ( $currline =~ /^\s*INLINE(?:\(.*\)(:.*)?|:.*)?\s/ || $currline =~ /^\s*IP6?TABLES(?:\(.*\)|:.*)?\s/ ) {
|
||||||
$inline_matches = $pairs;
|
$inline_matches = $pairs;
|
||||||
|
|
||||||
if ( $columns =~ /^(\s*|.*[^&@%]){(.*)}\s*$/ ) {
|
if ( $columns =~ /^(\s*|.*[^&@%])\{(.*)\}\s*$/ ) {
|
||||||
#
|
#
|
||||||
# Pairs are enclosed in curly brackets.
|
# Pairs are enclosed in curly brackets.
|
||||||
#
|
#
|
||||||
@ -2374,7 +2374,7 @@ sub split_line2( $$;$$$ ) {
|
|||||||
} elsif ( $checkinline ) {
|
} elsif ( $checkinline ) {
|
||||||
warning_message "This entry needs to be changed before INLINE_MATCHES can be set to Yes";
|
warning_message "This entry needs to be changed before INLINE_MATCHES can be set to Yes";
|
||||||
}
|
}
|
||||||
} elsif ( $currline =~ /^(\s*|.*[^&@%]){(.*)}$/ ) {
|
} elsif ( $currline =~ /^(\s*|.*[^&@%])\{(.*)\}$/ ) {
|
||||||
#
|
#
|
||||||
# Pairs are enclosed in curly brackets.
|
# Pairs are enclosed in curly brackets.
|
||||||
#
|
#
|
||||||
|
Loading…
Reference in New Issue
Block a user