From e17c4ac8af2a05d8522143f0f4ceec5862e5fb4f Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Tue, 30 Jan 2018 11:25:04 -0800 Subject: [PATCH] Reorganize code around wait/Interface-variable fix Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Compiler.pm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Shorewall/Perl/Shorewall/Compiler.pm b/Shorewall/Perl/Shorewall/Compiler.pm index a3a08975d..903d26386 100644 --- a/Shorewall/Perl/Shorewall/Compiler.pm +++ b/Shorewall/Perl/Shorewall/Compiler.pm @@ -312,7 +312,6 @@ sub generate_script_2() { push_indent; if ( $global_variables == ( ALL_COMMANDS | NOT_RESTORE ) ) { - verify_required_interfaces(0); set_global_variables(0, 0); handle_optional_interfaces; @@ -329,15 +328,13 @@ sub generate_script_2() { verify_required_interfaces(1); set_global_variables(1,1); + handle_optional_interfaces; if ( $global_variables & NOT_RESTORE ) { - handle_optional_interfaces; emit ';;'; pop_indent; pop_indent; emit ( 'esac' ); - } else { - handle_optional_interfaces; } } else { verify_required_interfaces(1);