From 0890e124468c173b61cafc4a4f7bc2b9dcb157ef Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sun, 10 Dec 2006 04:12:28 +0000
Subject: [PATCH] Back out part of SHOREWALL_DIR patch

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5078 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/lib.config |  3 +--
 Shorewall/shorewall  | 24 ++++++++++++++----------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/Shorewall/lib.config b/Shorewall/lib.config
index 6c8a1cba6..39097e20c 100644
--- a/Shorewall/lib.config
+++ b/Shorewall/lib.config
@@ -1713,7 +1713,6 @@ added_param_value_no() # $1 = Parameter Name, $2 = Parameter value
 #
 do_initialize() {
 
-    local config_path=$CONFIG_PATH
     # Run all utility programs using the C locale
     #
     # Thanks to Vincent Planchenault for this tip #
@@ -1881,7 +1880,7 @@ do_initialize() {
 
     [ -n "${MODULE_SUFFIX:=o gz ko o.gz ko.gz}" ]
 
-    [ -n "$config_path" ] && CONFIG_PATH=$config_path
+    [ -n "$SHOREWALL_DIR" ] && CONFIG_PATH=$SHOREWALL_DIR:$CONFIG_PATH
 
     if [ -z "$EXPORT" -a "$(whoami)" = root ]; then
 
diff --git a/Shorewall/shorewall b/Shorewall/shorewall
index 7428b90fe..09726d826 100755
--- a/Shorewall/shorewall
+++ b/Shorewall/shorewall
@@ -124,7 +124,6 @@ get_config() {
 	#
 	# This block is avoided for compile for export and when the user isn't root
 	#
-	[ -n "$SHOREWALL_DIR" ] && CONFIG_PATH=$SHOREWALL_DIR:CONFIG_PATH
 	export CONFIG_PATH
 
 	[ -z "$LOGFILE" ] && LOGFILE=/var/log/messages
@@ -294,7 +293,8 @@ start_command() {
 		fi
 	    fi
 
-	    CONFIG_PATH=$1:$CONFIG_PATH
+	    SHOREWALL_DIR=$1
+	    export SHOREWALL_DIR
 	    ;;
 	*)
 	    usage 1
@@ -397,7 +397,8 @@ compile_command() {
 		fi
 	    fi
 
-	    CONFIG_PATH=$1:$CONFIG_PATH
+	    SHOREWALL_DIR=$1
+	    export SHOREWALL_DIR
 	    file=$2
 	    ;;
 	*)
@@ -461,7 +462,8 @@ check_command() {
 		fi
 	    fi
 
-	    CONFIG_PATH=$1:$CONFIG_PATH
+	    SHOREWALL_DIR=$1
+	    export SHOREWALL_DIR
 	    ;;
 	*)
 	    usage 1
@@ -524,7 +526,8 @@ restart_command() {
 		fi
 	    fi
 
-	    CONFIG_PATH=$1:$CONFIG_PATH
+	    SHOREWALL_DIR=$1
+	    export SHOREWALL_DIR
 	    ;;
 	*)
 	    usage 1
@@ -671,7 +674,8 @@ safe_commands() {
 		fi
 	    fi
 
-	    CONFIG_PATH=$1:$CONFIG_PATH
+	    SHOREWALL_DIR=$1
+	    export SHOREWALL_DIR
 	    ;;
 	*)
 	    usage 1
@@ -767,7 +771,8 @@ try_command() {
 	    fi
 	fi
 	
-	CONFIG_PATH=$1:$CONFIG_PATH
+	SHOREWALL_DIR=$1
+	export SHOREWALL_DIR
     }
 
     while [ $finished -eq 0 -a $# -gt 0 ]; do
@@ -929,7 +934,7 @@ reload_command() # $* = original arguments less the command.
     esac
 
     if [ -z "$getcaps" ]; then
-	CONFIG_PATH=$directory:$CONFIG_PATH
+	SHOREWALL_DIR=$directory
 	capabilities=$(find_file capabilities)
 	[ -f $capabilities ] || getcaps=Yes
     fi
@@ -1173,12 +1178,11 @@ while [ $finished -eq 0 ]; do
     esac
 done
 
-
-
 if [ $# -eq 0 ]; then
     usage 1
 fi
 
+[ -n "$SHOREWALL_DIR" ] && export SHOREWALL_DIR
 PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin
 MUTEX_TIMEOUT=