From ab4dd5452311a0ee7db364ca3d2741ac2efd2887 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Fri, 15 Feb 2013 06:46:14 -0800
Subject: [PATCH] Save/use local SHAREDIR in reload_command

- Remove SHAREDIR may differ from the local one

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall/lib.cli-std | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Shorewall/lib.cli-std b/Shorewall/lib.cli-std
index 3d696d790..c2416782e 100644
--- a/Shorewall/lib.cli-std
+++ b/Shorewall/lib.cli-std
@@ -1378,6 +1378,8 @@ reload_command() # $* = original arguments less the command.
     confdir=${CONFDIR}
     local sbindir
     sbindir=${SBINDIR}
+    local sharedir
+    sharedir=${SHAREDIR}
 
     litedir=${VARLIB}/${g_program}-lite
 
@@ -1443,7 +1445,7 @@ reload_command() # $* = original arguments less the command.
 	sbindir="$SBINDIR"
 	confdir="$CONFDIR"
 	libexec="$LIBEXECDIR"
-	. $SHAREDIR/shorewall/shorewallrc
+	. $sharedir/shorewall/shorewallrc
     else
 	error_message "   WARNING: $g_directory/shorewallrc does not exist; using settings from $SHAREDIR/shorewall" >&2
     fi