From afa56a8cef32628425035feaf3358c77f3cf3f19 Mon Sep 17 00:00:00 2001
From: bbruns <bbruns@e5899ace-8841-11de-95b9-8f387cfb8bc3>
Date: Fri, 28 Oct 2011 21:36:20 +0000
Subject: [PATCH] Begin minor cleanup work for 1.0

---
 bin/firewall-sosdg | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/bin/firewall-sosdg b/bin/firewall-sosdg
index 4876d25..291c14e 100755
--- a/bin/firewall-sosdg
+++ b/bin/firewall-sosdg
@@ -56,7 +56,12 @@ else
 	exit 1
 fi
 
-. $BASEDIR/include/functions
+if [ -r $BASEDIR/include/functions ]; then
+	. $BASEDIR/include/functions
+else
+	echo -e "${RED}Error: Can not load functions library file.  There is no way to make this tool work without it."
+	exit 1
+fi
 
 while [ $# -gt 0 ]; do
 	case "$1" in
@@ -98,7 +103,7 @@ if [ "$UID" != "0" ]; then
 	exit 2
 fi
 
-if [ ! -x "$IPTABLES" ]; then
+if [ ! -x "${IPTABLES}" ]; then
 	display_c RED "iptables command not found.  Please make sure you have the iptables"
 	display_c RED "installed (package or source) and you have the IPTABLES option properly"
 	display_c RED "defined in the 'options' file."
@@ -106,7 +111,7 @@ if [ ! -x "$IPTABLES" ]; then
 fi
 
 
-if [ ! -x "$IP6TABLES" ] && [ $IPV6 == "1" ]; then
+if [ ! -x "${IP6TABLES}" ] && [ $IPV6 == "1" ]; then
 	display_c RED "ip6tables command not found.  Please make sure you have the iptables"
 	display_c RED "installed (package or source) and you have the IP6TABLES option properly"
 	display_c RED "defined in the 'options' file."
@@ -114,12 +119,12 @@ if [ ! -x "$IP6TABLES" ] && [ $IPV6 == "1" ]; then
 fi
 
 
-if [[ "$EXTIF" == "auto" ]]; then
+if [[ "${EXTIF}" == "auto" ]]; then
 	EXTIF=`$EXTIF_FIND`
 	display_c YELLOW "Found default interface at: ${BLUE}${EXTIF}${DEFAULT_COLOR}"
 fi
 
-if [[ "$EXTIP" == "auto" ]]; then
+if [[ "${EXTIP}" == "auto" ]]; then
 	EXTIP=`$EXTIP_FIND ${EXTIF}`
 	display_c YELLOW "Found default interface IP at: ${BLUE}${EXTIP}${DEFAULT_COLOR}"
 fi