From 7036b48573bb20f6d249d9a1d4047976a72776cd Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Fri, 13 Apr 2007 19:36:34 +0000
Subject: [PATCH] Process shorewall.conf correctly during [re]load

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

diff --git a/Shorewall-common/shorewall b/Shorewall-common/shorewall
index 1c1f4ddfe..7772fa605 100755
--- a/Shorewall-common/shorewall
+++ b/Shorewall-common/shorewall
@@ -1103,12 +1103,7 @@ reload_command() # $* = original arguments less the command.
 
     if [ -n "$getcaps" ]; then
 	if [ -f $directory/shorewall.conf ]; then
-	    MODULESDIR=$(grep '^\s*MODULESDIR=' $directory/shorewall.conf | tail -n 1)
-	    MODULESDIR=${MODULESDIR#*=}
-	    IPTABLES=$(grep '^\s*MODULE_SUFFIX=' $directory/shorewall.conf | tail -n 1)
-	    IPTABLES=${MODULE_SUFFIX#*=}
-	    IPTABLES=$(grep '^\s*IPTABLES=' $directory/shorewall.conf | tail -n 1)
-	    IPTABLES=${IPTABLES#*=}
+	    . $directory/shorewall.conf
 	fi
 
 	progress_message "Getting Capabilities on system $system..."