From e79944b2c6f8d6a41255e79ab1cf28b78ab7f2d0 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sun, 13 May 2007 15:39:20 +0000
Subject: [PATCH] Name macro file in 'End Macro' progress message

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6335 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-perl/Shorewall/Rules.pm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Shorewall-perl/Shorewall/Rules.pm b/Shorewall-perl/Shorewall/Rules.pm
index 435125c58..19651e306 100644
--- a/Shorewall-perl/Shorewall/Rules.pm
+++ b/Shorewall-perl/Shorewall/Rules.pm
@@ -804,9 +804,7 @@ sub process_macro ( $$$$$$$$$$$$ ) {
 	my $action     = isolate_basic_target $mtarget;
 	my $actiontype = $targets{$action} || find_macro( $action );
 
-	unless ( $actiontype & ACTION ) {
-	    fatal_error "Invalid Action ($mtarget) in macro"  unless $actiontype & ( STANDARD + NATRULE + MACRO );
-	}
+	fatal_error "Invalid Action ($mtarget) in macro" unless $actiontype & ( ACTION +  STANDARD + NATRULE + MACRO );
 
 	if ( $msource ) {
 	    if ( ( $msource eq '-' ) || ( $msource eq 'SOURCE' ) ) {
@@ -849,7 +847,7 @@ sub process_macro ( $$$$$$$$$$$$ ) {
 
     pop_open;
 
-    progress_message '..End Macro'
+    progress_message "..End Macro $macrofile"
 }
 
 my $macro_nest_level = 0;