A little cleanup

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5486 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-03-10 19:39:57 +00:00
parent 97fa1af237
commit aad98ecb30
2 changed files with 8 additions and 12 deletions

View File

@ -62,15 +62,11 @@ startup_error()
} }
# #
# Debug the compiler if first arg is "debug"
# #
# E X E C U T I O N B E G I N S H E R E debug="-w"
#
#
# Start trace if first arg is "debug"
#
debug=
[ $# -gt 1 ] && [ "$1" = "debug" ] && { debug="-d"; shift ; } [ $# -gt 1 ] && [ "$1" = "debug" ] && { debug="-dw"; shift ; }
SHAREDIR=/usr/share/shorewall SHAREDIR=/usr/share/shorewall
VARDIR=/var/lib/shorewall VARDIR=/var/lib/shorewall

View File

@ -5362,7 +5362,7 @@ sub compile_firewall( $ ) {
# #
# Setup Masquerading/SNAT # Setup Masquerading/SNAT
# #
progress_message2 "$doing Masq file..."; setup_masq; progress_message2 "$doing Masq file..."; setup_masq;
# #
# MACLIST Filtration # MACLIST Filtration
# #
@ -5370,7 +5370,7 @@ sub compile_firewall( $ ) {
# #
# Process the rules file. # Process the rules file.
# #
progress_message2 "$doing Rules..."; process_rules; progress_message2 "$doing Rules..."; process_rules;
# #
# Add Tunnel rules. # Add Tunnel rules.
# #
@ -5387,11 +5387,11 @@ sub compile_firewall( $ ) {
# #
# Apply Policies # Apply Policies
# #
progress_message 'Applying Policies...'; apply_policy_rules; dump_action_table if $ENV{DEBUG}; progress_message2 'Applying Policies...'; apply_policy_rules; dump_action_table if $ENV{DEBUG};
# #
# Setup Nat # Setup Nat
# #
progress_message2 "$doing one-to-one NAT..."; setup_nat; progress_message2 "$doing one-to-one NAT..."; setup_nat;
# #
# TCRules # TCRules
# #
@ -5408,7 +5408,7 @@ sub compile_firewall( $ ) {
# Create the script. # Create the script.
# #
unless ( $command eq 'check' ) { unless ( $command eq 'check' ) {
progress_message2 "Creating iptables-restore file..."; create_iptables_restore_file; progress_message2 "Creating iptables-restore input..."; create_iptables_restore_file;
} }
} }