From 1759fc75b00ab0a3c326149d7ee92456b92a6d15 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Mon, 17 Feb 2014 14:10:17 -0800 Subject: [PATCH] Correctly handle alternate specification with ';' in 'update -t' Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Tc.pm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Shorewall/Perl/Shorewall/Tc.pm b/Shorewall/Perl/Shorewall/Tc.pm index 7e5635878..5391e16d6 100644 --- a/Shorewall/Perl/Shorewall/Tc.pm +++ b/Shorewall/Perl/Shorewall/Tc.pm @@ -950,7 +950,13 @@ sub process_tc_rule1( $$$$$$$$$$$$$$$$ ) { my $raw_matches = fetch_inline_matches; - $line .= join( '', ' ;', $raw_matches ) if $raw_matches ne ' '; + if ( $raw_matches ne ' ' ) { + if ( $command =~ /^INLINE/ || $config{INLINE_MATCHES} ) { + $line .= join( '', ' ;', $raw_matches );es + } else { + $line .= join( '', ' {', $raw_matches , ' }' ); + } + } print $mangle "$line\n"; } else {