Clean up RAs involving "|"

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2017-11-14 08:26:17 -08:00
parent 130ddff9de
commit 2a9272ccd1
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10

View File

@ -1641,7 +1641,7 @@ sub merge_inline_source_dest( $$ ) {
return join( ':', $invocation, $body ); return join( ':', $invocation, $body );
} }
} else { } else {
fatal_error 'Interface names cannot appear in the DEST column within an action body' if $body =~ /:\[|:\+|/; fatal_error 'Interface names cannot appear in the DEST column within an action body' if $body =~ /:\[|:\+/;
if ( $invocation =~ /:\[|:\+/ ) { if ( $invocation =~ /:\[|:\+/ ) {
$invocation =~ s/:.*//; $invocation =~ s/:.*//;
@ -5436,7 +5436,7 @@ sub process_snat1( $$$$$$$$$$$$ ) {
# #
if ( $inaction ) { if ( $inaction ) {
$destnets = $dest; $destnets = $dest;
assert( $param =~ /^(.*)|/ ); assert( $param =~ /^(.*)\|/ );
$interfaces=$1; $interfaces=$1;
} elsif ( $family == F_IPV4 ) { } elsif ( $family == F_IPV4 ) {
if ( $dest =~ /^([^:]+)::([^:]*)$/ ) { if ( $dest =~ /^([^:]+)::([^:]*)$/ ) {