As I was committing the previous patch, I noticed there was some left-over cruft in two of the action files.
Patch attached. -Tom -- Tom Eastep \ When I die, I want to go like my Grandfather who Shoreline, \ died peacefully in his sleep. Not screaming like Washington, USA \ all of the passengers in his car http://shorewall.net \________________________________________________
diff --git a/Shorewall/action.New b/Shorewall/action.New
index 898bf4c..bbfcec3 100644
--- a/Shorewall/action.New
+++ b/Shorewall/action.New
@@ -40,10 +40,6 @@ use Shorewall::Rules;
my ( $action ) = get_action_params( 1 );
-my ( $level, $tag ) = get_action_logging;
-
-$action = join( ':', $action, $level, $tag ) if "${level}${tag}";
-
if ( my $check = check_state( 'NEW' ) ) {
perl_action_helper( $action, $check == 1 ? "$globals{STATEMATCH} NEW" : '' );
}
diff --git a/Shorewall/action.Untracked b/Shorewall/action.Untracked
index 0f1a1e2..dd8ab9e 100644
--- a/Shorewall/action.Untracked
+++ b/Shorewall/action.Untracked
@@ -40,16 +40,10 @@ use Shorewall::Rules;
my ( $action ) = get_action_params( 1 );
-my ( $level, $tag ) = get_action_logging;
-
-$action = join( ':', $action, $level, $tag ) if "${level}${tag}";
-
-if ( my $check = check_state( 'UNTRACKED' ) ) {
+if ( my $check = check_state( 'UNTRACKED' ) ){
perl_action_helper( $action, $check == 1 ? "$globals{STATEMATCH} UNTRACKED" : '' );
}
-allow_optimize( get_action_chain );
-
1;
?END PERL;
signature.asc
Description: OpenPGP digital signature
------------------------------------------------------------------------------ Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_d2d_jan
_______________________________________________ Shorewall-devel mailing list Shorewall-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/shorewall-devel
