mirror of
https://gitlab.com/shorewall/code.git
synced 2025-02-23 05:01:34 +01:00
Don't call compile_stop_firewall() during 'check'; call process_routestopped() instead
This commit is contained in:
parent
fefff9fd83
commit
5655dbb01b
@ -795,9 +795,7 @@ sub compiler {
|
|||||||
# (Produces setup_netfilter(), chainlist_reload() and define_firewall() )
|
# (Produces setup_netfilter(), chainlist_reload() and define_firewall() )
|
||||||
#
|
#
|
||||||
generate_script_3( $chains );
|
generate_script_3( $chains );
|
||||||
} else {
|
}
|
||||||
enable_object;
|
|
||||||
}
|
|
||||||
# S T O P _ F I R E W A L L
|
# S T O P _ F I R E W A L L
|
||||||
# (Writes the stop_firewall() function to the compiled script)
|
# (Writes the stop_firewall() function to the compiled script)
|
||||||
#
|
#
|
||||||
@ -806,9 +804,9 @@ sub compiler {
|
|||||||
#
|
#
|
||||||
Shorewall::Chains::initialize( $family );
|
Shorewall::Chains::initialize( $family );
|
||||||
initialize_chain_table;
|
initialize_chain_table;
|
||||||
compile_stop_firewall( $test );
|
|
||||||
|
|
||||||
if ( $objectfile ) {
|
if ( $objectfile ) {
|
||||||
|
compile_stop_firewall( $test );
|
||||||
#
|
#
|
||||||
# Copy the footer to the object
|
# Copy the footer to the object
|
||||||
#
|
#
|
||||||
@ -830,6 +828,8 @@ sub compiler {
|
|||||||
#
|
#
|
||||||
enable_object, generate_aux_config if $export;
|
enable_object, generate_aux_config if $export;
|
||||||
} else {
|
} else {
|
||||||
|
process_routestopped;
|
||||||
|
|
||||||
if ( $family == F_IPV4 ) {
|
if ( $family == F_IPV4 ) {
|
||||||
progress_message3 "Shorewall configuration verified";
|
progress_message3 "Shorewall configuration verified";
|
||||||
} else {
|
} else {
|
||||||
|
@ -40,6 +40,7 @@ our @EXPORT = qw( process_tos
|
|||||||
add_common_rules
|
add_common_rules
|
||||||
setup_mac_lists
|
setup_mac_lists
|
||||||
process_rules
|
process_rules
|
||||||
|
process_routestopped
|
||||||
generate_matrix
|
generate_matrix
|
||||||
compile_stop_firewall
|
compile_stop_firewall
|
||||||
);
|
);
|
||||||
|
Loading…
Reference in New Issue
Block a user