extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-02-19 11:11:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Report normalized action names in recursive call message

Browse Source
This commit is contained in:
Tom Eastep 2011-01-01 09:06:11 -08:00
parent 4da682365d
commit d71c11791f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Shorewall/Perl/Shorewall/Rules.pm
View File

@ -679,7 +679,7 @@ sub process_action( $) {
my $oldparms = push_params( $param ); my $oldparms = push_params( $param );
$active{$wholeaction}++; $active{$wholeaction}++;
push @actionstack, $action; push @actionstack, $wholeaction;
while ( read_a_line ) { while ( read_a_line ) {
@ -964,7 +964,7 @@ sub process_rule1 ( $$$$$$$$$$$$$$$$ ) {
# #
$normalized_target = normalize_action( $basictarget, $loglevel, $param ); $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 ) ) { if ( my $ref = use_action( $normalized_target ) ) {
# #