From d71c11791f540c8e441540f8aee8f82608e7e480 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sat, 1 Jan 2011 09:06:11 -0800 Subject: [PATCH] Report normalized action names in recursive call message --- Shorewall/Perl/Shorewall/Rules.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Shorewall/Perl/Shorewall/Rules.pm b/Shorewall/Perl/Shorewall/Rules.pm index eb711f588..c5c71d508 100644 --- a/Shorewall/Perl/Shorewall/Rules.pm +++ b/Shorewall/Perl/Shorewall/Rules.pm @@ -679,7 +679,7 @@ sub process_action( $) { my $oldparms = push_params( $param ); $active{$wholeaction}++; - push @actionstack, $action; + push @actionstack, $wholeaction; while ( read_a_line ) { @@ -964,7 +964,7 @@ sub process_rule1 ( $$$$$$$$$$$$$$$$ ) { # $normalized_target = normalize_action( $basictarget, $loglevel, $param ); - fatal_error( "Action $basictarget invoked Recursively (" . join( '->', @actionstack , $basictarget ) . ')' ) if $active{$normalized_target}; + fatal_error( "Action $basictarget invoked Recursively (" . join( '->', @actionstack , $normalized_target ) . ')' ) if $active{$normalized_target}; if ( my $ref = use_action( $normalized_target ) ) { #