From 7d41e4b38c178be422e36faadd2a0477c1c94980 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Tue, 28 Dec 2010 16:04:55 -0800 Subject: [PATCH] Restore level merge behavior with nested actions --- Shorewall/Perl/Shorewall/Rules.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Shorewall/Perl/Shorewall/Rules.pm b/Shorewall/Perl/Shorewall/Rules.pm index 64a03c622..b0e35ecd0 100644 --- a/Shorewall/Perl/Shorewall/Rules.pm +++ b/Shorewall/Perl/Shorewall/Rules.pm @@ -612,7 +612,7 @@ sub process_action3( $$$$$$ ) { next; } - process_rule_common( $chainref, $target, '', $source, $dest, $proto, $ports, $sports, $origdest, $rate, $user, $mark, $connlimit, $time, $headers, 0 ); + process_rule_common( $chainref, merge_levels( "$action:$level:$tag", $target ), '', $source, $dest, $proto, $ports, $sports, $origdest, $rate, $user, $mark, $connlimit, $time, $headers, 0 ); } clear_comment;