From 504728a0794836aa7ce4b706a9c0b8e7e194d1c9 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sat, 17 Sep 2005 22:37:32 +0000
Subject: [PATCH] More whitespace elimination; avoid stale lock file in some
 error cases

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@2702 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/firewall | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/Shorewall/firewall b/Shorewall/firewall
index 666d0b995..c34500b84 100755
--- a/Shorewall/firewall
+++ b/Shorewall/firewall
@@ -7615,7 +7615,7 @@ add_common_rules() {
     hosts=$(find_hosts_by_option nosmurfs)
 
     if [ -n "$hosts" ]; then
-	
+
 	echo "Adding Anti-smurf Rules"
 
 	for host in $hosts; do
@@ -7760,7 +7760,7 @@ add_common_rules() {
 	    log_rule $TCP_FLAGS_LOG_LEVEL logflags $TCP_FLAGS_DISPOSITION
 
 	    LOGPARMS="$savelogparms"
-	
+
 	    case $TCP_FLAGS_DISPOSITION in
 		REJECT)
 		    run_iptables -A logflags -j REJECT --reject-with tcp-reset
@@ -7950,7 +7950,7 @@ add_common_rules() {
 	echo "Setting up UPnP..."
 
 	createnatchain UPnP
-	
+
 	for interface in $interfaces; do
 	    run_iptables -t nat -A PREROUTING -i $interface -j UPnP
 	done
@@ -8212,7 +8212,7 @@ activate_rules()
 		routeback=
 		num_ifaces=0
 	    fi
-	
+
 	    if [ -n "$complex" ]; then
 		for host1 in $dest_hosts; do
 		    interface1=${host1%%:*}
@@ -8231,7 +8231,7 @@ activate_rules()
 		    networks=${host#*:}
 		
 		    chain3=$(forward_chain $interface)
-		
+
 		    for host1 in $dest_hosts; do
 			interface1=${host1%%:*}
 			networks1=${host1#*:}
@@ -9016,12 +9016,10 @@ do_initialize() {
 	    [ -n "$QUIET" ] || echo "Processing $config..."
 	    . $config
 	else
-	    echo "   ERROR: Cannot read $config (Hint: Are you root?)"
-	    exit 2
+	    startup_error "Cannot read $config (Hint: Are you root?)"
 	fi
     else
-	echo "$config does not exist!" >&2
-	exit 2
+	startup_error "$config does not exist!"
     fi
     #
     # Restore CONFIG_PATH if the shorewall.conf file cleared it