From f223e3584c1c4a1b90bda8a3db79f6955021ece2 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sun, 6 Jan 2013 07:37:11 -0800 Subject: [PATCH] Make '+' optional in the ADD and DEL statements. Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Rules.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Shorewall/Perl/Shorewall/Rules.pm b/Shorewall/Perl/Shorewall/Rules.pm index dfa22d248..3fff9d1e9 100644 --- a/Shorewall/Perl/Shorewall/Rules.pm +++ b/Shorewall/Perl/Shorewall/Rules.pm @@ -2096,7 +2096,8 @@ sub process_rule1 ( $$$$$$$$$$$$$$$$$$ ) { my ( $setname, $flags, $rest ) = split ':', $param, 3; fatal_error "Invalid ADD/DEL parameter ($param)" if $rest; - fatal_error "Expected ipset name ($setname)" unless $setname =~ s/^\+// && $setname =~ /^(6_)?[a-zA-Z][-\w]*$/; + $setname =~ s/^\+//; + fatal_error "Expected ipset name ($setname)" unless $setname =~ /^(6_)?[a-zA-Z][-\w]*$/; fatal_error "Invalid flags ($flags)" unless defined $flags && $flags =~ /^(dst|src)(,(dst|src)){0,5}$/; $action = join( ' ', 'SET --' . $xlate{$basictarget} , $setname , $flags ); }