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

Correct clearing of inline matches

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2016-03-28 15:48:59 -07:00
parent 89adc3ea68
commit 5b7a9db170
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2309,6 +2309,10 @@ sub process_macro ($$$$$$$$$$$$$$$$$$$$$) {
} }
pop_open; pop_open;
#
# Clear the inline matches if we are the lowest level macro/inline invocation
#
set_inline_matches( '' ) if $macro_nest_level == 1;
progress_message "..End Macro $macrofile"; progress_message "..End Macro $macrofile";
@ -2453,6 +2457,10 @@ sub process_inline ($$$$$$$$$$$$$$$$$$$$$$) {
progress_message "..End inline action $inlinefile"; progress_message "..End inline action $inlinefile";
pop_action_params( $oldparms ); pop_action_params( $oldparms );
#
# Clear the inline matches if we are the lowest level macro/inline invocation
#
set_inline_matches( '' ) if $macro_nest_level == 1;
return $generated; return $generated;
} }
@ -3662,10 +3670,6 @@ sub process_raw_rule ( ) {
$wild ) ) { $wild ) ) {
$generated = 1; $generated = 1;
} }
#
# Clear inline matches
#
set_inline_matches( '' );
} }
} }
} }