From 33f7822df9283a5889b7f2739c9a12d503f26bdc Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Mon, 25 Jul 2011 09:16:22 -0700 Subject: [PATCH] Correct 'action' editing RE in parameterized actions Signed-off-by: Tom Eastep --- Shorewall/action.Broadcast | 2 +- Shorewall/action.Invalid | 2 +- Shorewall/action.NotSyn | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Shorewall/action.Broadcast b/Shorewall/action.Broadcast index 7c85a0723..38fe75d0d 100644 --- a/Shorewall/action.Broadcast +++ b/Shorewall/action.Broadcast @@ -40,7 +40,7 @@ use Shorewall::Chains; my ( $action, $audit ) = get_action_params( 2 ); fatal_error "Invalid parameter ($audit) to action Broadcast" if supplied $audit && $audit ne 'audit'; -fatal_error "Invalid parameter ($action) to action Broadcast" unless $action =~ /^ACCEPT|DROP|REJECT$/; +fatal_error "Invalid parameter ($action) to action Broadcast" unless $action =~ /^(?:ACCEPT|DROP|REJECT)$/; my $chainref = get_action_chain; my ( $level, $tag ) = get_action_logging; diff --git a/Shorewall/action.Invalid b/Shorewall/action.Invalid index a8aabbbe8..7cae452a3 100644 --- a/Shorewall/action.Invalid +++ b/Shorewall/action.Invalid @@ -40,7 +40,7 @@ use Shorewall::Chains; my ( $action, $audit ) = get_action_params( 2 ); fatal_error "Invalid parameter ($audit) to action Invalid" if supplied $audit && $audit ne 'audit'; -fatal_error "Invalid parameter ($action) to action Invalid" unless $action =~ /^ACCEPT|DROP|REJECT$/; +fatal_error "Invalid parameter ($action) to action Invalid" unless $action =~ /^(?:ACCEPT|DROP|REJECT)$/; my $chainref = get_action_chain; my ( $level, $tag ) = get_action_logging; diff --git a/Shorewall/action.NotSyn b/Shorewall/action.NotSyn index ae2226f16..afd778d25 100644 --- a/Shorewall/action.NotSyn +++ b/Shorewall/action.NotSyn @@ -40,7 +40,7 @@ use Shorewall::Chains; my ( $action, $audit ) = get_action_params( 2 ); fatal_error "Invalid parameter ($audit) to action NotSyn" if supplied $audit && $audit ne 'audit'; -fatal_error "Invalid parameter ($action) to action NotSyn" unless $action =~ /^ACCEPT|DROP|REJECT$/; +fatal_error "Invalid parameter ($action) to action NotSyn" unless $action =~ /^(?:ACCEPT|DROP|REJECT)$/; my $chainref = get_action_chain; my ( $level, $tag ) = get_action_logging;