From 8d28c449465872e4ed94fb54912093a0cf22b957 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Wed, 30 Jan 2013 10:45:10 -0800 Subject: [PATCH] Remove 'audit' parameter handling from new state actions. Signed-off-by: Tom Eastep --- Shorewall/action.Established | 9 ++------- Shorewall/action.Related | 9 ++------- Shorewall/action.Untracked | 7 +------ 3 files changed, 5 insertions(+), 20 deletions(-) diff --git a/Shorewall/action.Established b/Shorewall/action.Established index d40963472..4d47cab17 100644 --- a/Shorewall/action.Established +++ b/Shorewall/action.Established @@ -29,7 +29,7 @@ ########################################################################################## ?FORMAT 2 -DEFAULTS DROP,- +DEFAULTS DROP ?BEGIN PERL; @@ -38,12 +38,7 @@ use Shorewall::Config; use Shorewall::Chains; use Shorewall::Rules qw( process_rule1 ); -my ( $action, $audit ) = get_action_params( 2 ); - -if ( supplied $audit ) { - fatal_error "Established parameter ($audit) to action Established" if $audit ne 'audit'; - $action = "A_$action"; -} +my ( $action ) = get_action_params( 1 ); my ( $level, $tag ) = get_action_logging; diff --git a/Shorewall/action.Related b/Shorewall/action.Related index 5fcfcb1da..98439f535 100644 --- a/Shorewall/action.Related +++ b/Shorewall/action.Related @@ -29,7 +29,7 @@ ########################################################################################## ?FORMAT 2 -DEFAULTS DROP,- +DEFAULTS DROP ?BEGIN PERL; @@ -39,12 +39,7 @@ use Shorewall::Config; use Shorewall::Chains; use Shorewall::Rules qw( process_rule1 ); -my ( $action, $audit ) = get_action_params( 2 ); - -if ( supplied $audit ) { - fatal_error "Related parameter ($audit) to action Related" if $audit ne 'audit'; - $action = "A_$action"; -} +my ( $action ) = get_action_params( 1 ); my ( $level, $tag ) = get_action_logging; diff --git a/Shorewall/action.Untracked b/Shorewall/action.Untracked index 6f235433d..28e7e56c9 100644 --- a/Shorewall/action.Untracked +++ b/Shorewall/action.Untracked @@ -38,12 +38,7 @@ use Shorewall::Config; use Shorewall::Chains; use Shorewall::Rules qw( process_rule1 ); -my ( $action, $audit ) = get_action_params( 2 ); - -if ( supplied $audit ) { - fatal_error "Untracked parameter ($audit) to action Untracked" if $audit ne 'audit'; - $action = "A_$action"; -} +my ( $action ) = get_action_params( 1 ); my ( $level, $tag ) = get_action_logging;