From 61d8f704f90c35413c03c1d9c38fcab464004b8a Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Tue, 29 Jan 2013 09:43:12 -0800 Subject: [PATCH] Correct rule-generation detection in perl_action_helper Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Rules.pm | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/Shorewall/Perl/Shorewall/Rules.pm b/Shorewall/Perl/Shorewall/Rules.pm index 65cb0142a..aa511bb78 100644 --- a/Shorewall/Perl/Shorewall/Rules.pm +++ b/Shorewall/Perl/Shorewall/Rules.pm @@ -2665,11 +2665,11 @@ sub perl_action_helper($$) { assert( $chainref ); if ( $inlines{$action} ) { - &process_rule1( $chainref, - $matches, - $target, - '', - @columns ); + $result = &process_rule1( $chainref, + $matches, + $target, + '', # CurrentParam + @columns ); } else { $result = process_rule1( $chainref, $matches, @@ -2692,7 +2692,9 @@ sub perl_action_helper($$) { 0, # Wildcard ); } - + # + # Record that we generated a rule to avoid bogus warning + # $actionresult ||= $result; } @@ -2742,7 +2744,9 @@ sub perl_action_tcp_helper($$) { 0, # Wildcard ); } - + # + # Record that we generated a rule to avoid bogus warning + # $actionresult ||= $result; }