From 2a9272ccd1e4f8ffe569c1743639d019f496eb2a Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Tue, 14 Nov 2017 08:26:17 -0800 Subject: [PATCH] Clean up RAs involving "|" Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Rules.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Shorewall/Perl/Shorewall/Rules.pm b/Shorewall/Perl/Shorewall/Rules.pm index 45d1af5e5..3d2dd0508 100644 --- a/Shorewall/Perl/Shorewall/Rules.pm +++ b/Shorewall/Perl/Shorewall/Rules.pm @@ -1641,7 +1641,7 @@ sub merge_inline_source_dest( $$ ) { return join( ':', $invocation, $body ); } } 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 =~ /:\[|:\+/ ) { $invocation =~ s/:.*//; @@ -5436,7 +5436,7 @@ sub process_snat1( $$$$$$$$$$$$ ) { # if ( $inaction ) { $destnets = $dest; - assert( $param =~ /^(.*)|/ ); + assert( $param =~ /^(.*)\|/ ); $interfaces=$1; } elsif ( $family == F_IPV4 ) { if ( $dest =~ /^([^:]+)::([^:]*)$/ ) {