holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Be more agressive about detecting action recursion.

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-12-01 12:10:06 -08:00
parent cc657e571d
commit 6c1a5b8051
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1554,7 +1554,7 @@ sub process_action( $) {
my $oldparms = push_action_params( $chainref, $param );
$active{$wholeaction}++;
$active{$action}++;
push @actionstack, $wholeaction;
push_comment( '' );
@ -1612,7 +1612,7 @@ sub process_action( $) {
pop_comment;
$active{$wholeaction}--;
$active{$action}--;
pop @actionstack;
pop_open;
@ -2029,7 +2029,7 @@ sub process_rule1 ( $$$$$$$$$$$$$$$$$$ ) {
#
$normalized_target = normalize_action( $basictarget, $loglevel, $param );
fatal_error( "Action $basictarget invoked Recursively (" . join( '->', map( externalize( $_ ), @actionstack , $normalized_target ) ) . ')' ) if $active{$normalized_target};
fatal_error( "Action $basictarget invoked Recursively (" . join( '->', map( externalize( $_ ), @actionstack , $normalized_target ) ) . ')' ) if $active{$basictarget};
if ( my $ref = use_action( $normalized_target ) ) {
#