extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-11-30 11:33:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Correct order of optional interface and address variable handling"

Browse Source 
This reverts commit f4cae55c1e.
This commit is contained in:
Tom Eastep 2018-01-28 13:15:13 -08:00
parent f4cae55c1e
commit 40bcfd15e5
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Shorewall/Perl/Shorewall/Compiler.pm
View File

@ -312,8 +312,10 @@ sub generate_script_2() {
push_indent; push_indent;
if ( $global_variables == ( ALL_COMMANDS | NOT_RESTORE ) ) { if ( $global_variables == ( ALL_COMMANDS | NOT_RESTORE ) ) {
handle_optional_interfaces(0);
set_global_variables(0, 0); set_global_variables(0, 0);
handle_optional_interfaces(0);
} }
emit ';;'; emit ';;';
@ -325,14 +327,16 @@ sub generate_script_2() {
push_indent; push_indent;
} }
handle_optional_interfaces(1);
set_global_variables(1,1); set_global_variables(1,1);
if ( $global_variables & NOT_RESTORE ) { if ( $global_variables & NOT_RESTORE ) {
handle_optional_interfaces(1);
emit ';;'; emit ';;';
pop_indent; pop_indent;
pop_indent; pop_indent;
emit ( 'esac' ); emit ( 'esac' );
} else {
handle_optional_interfaces(1);
} }
} else { } else {
emit( 'true' ) unless handle_optional_interfaces(1); emit( 'true' ) unless handle_optional_interfaces(1);