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

Name macro file in 'End Macro' progress message

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6335 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-05-13 15:39:20 +00:00
parent 95f4d6a006
commit e79944b2c6
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Shorewall-perl/Shorewall/Rules.pm
View File

@ -804,9 +804,7 @@ sub process_macro ( $$$$$$$$$$$$ ) {
my $action = isolate_basic_target $mtarget; my $action = isolate_basic_target $mtarget;
my $actiontype = $targets{$action} || find_macro( $action ); my $actiontype = $targets{$action} || find_macro( $action );
unless ( $actiontype & ACTION ) { fatal_error "Invalid Action ($mtarget) in macro" unless $actiontype & ( ACTION + STANDARD + NATRULE + MACRO );
fatal_error "Invalid Action ($mtarget) in macro" unless $actiontype & ( STANDARD + NATRULE + MACRO );
}
if ( $msource ) { if ( $msource ) {
if ( ( $msource eq '-' ) || ( $msource eq 'SOURCE' ) ) { if ( ( $msource eq '-' ) || ( $msource eq 'SOURCE' ) ) {
@ -849,7 +847,7 @@ sub process_macro ( $$$$$$$$$$$$ ) {
pop_open; pop_open;
progress_message '..End Macro' progress_message "..End Macro $macrofile"
} }
my $macro_nest_level = 0; my $macro_nest_level = 0;