holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Don't call compile_stop_firewall() during 'check'; call process_routestopped() instead - comments

Browse Source
This commit is contained in:
Tom Eastep 2009-09-08 13:04:34 -07:00
parent bb83db3eb9
commit b4712a93fa
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -786,8 +786,8 @@ sub compiler {
enable_object; enable_object;
# #
# I N I T I A L I Z E # I N I T I A L I Z E
# (Writes the initialize() function to the compiled script) # (Writes the initialize() function to the compiled script)
# #
generate_script_2; generate_script_2;
# #
@ -795,10 +795,8 @@ 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 );
} }
# S T O P _ F I R E W A L L
# (Writes the stop_firewall() function to the compiled script)
#
# We must reinitialize Shorewall::Chains before generating the iptables-restore input # We must reinitialize Shorewall::Chains before generating the iptables-restore input
# for stopping the firewall # for stopping the firewall
# #
@ -806,6 +804,9 @@ sub compiler {
initialize_chain_table; initialize_chain_table;
if ( $objectfile ) { if ( $objectfile ) {
# S T O P _ F I R E W A L L
# (Writes the stop_firewall() function to the compiled script)
#
compile_stop_firewall( $test ); compile_stop_firewall( $test );
# #
# Copy the footer to the object # Copy the footer to the object
@ -828,6 +829,10 @@ sub compiler {
# #
enable_object, generate_aux_config if $export; enable_object, generate_aux_config if $export;
} else { } else {
#
# compile_stop_firewall() also validates the routestopped file. Since we don't
# call that function during 'check', we must validate routestopped here.
#
process_routestopped; process_routestopped;
if ( $family == F_IPV4 ) { if ( $family == F_IPV4 ) {