From 1b2428768e03a1ecee256366385ae7fad1483fb0 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Fri, 4 May 2007 15:38:32 +0000
Subject: [PATCH] Fix CONFDIR handling

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6232 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-perl/Shorewall/Config.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Shorewall-perl/Shorewall/Config.pm b/Shorewall-perl/Shorewall/Config.pm
index 692a96cba..d38206a6b 100644
--- a/Shorewall-perl/Shorewall/Config.pm
+++ b/Shorewall-perl/Shorewall/Config.pm
@@ -204,6 +204,9 @@ our %capabilities =
 our %protocols;
 our %services;
 
+#
+# Capabilities
+#
 my %capdesc = ( NAT_ENABLED     => 'NAT',
 		MANGLE_ENABLED  => 'Packet Mangling',
 		MULTIPORT       => 'Multi-port Match' ,
@@ -749,7 +752,7 @@ sub ensure_config_path( $ ) {
 
     my $f = "$globals{SHAREDIR}/configpath";
 
-    $ENV{CONFDIR} = $export ? '/usr/share/shorewall/configfiles/' : '/etc/shorewall/';
+    $globals{CONFDIR} = '/usr/share/shorewall/configfiles/' if $export;
 
     unless ( $config{CONFIG_PATH} ) {
 	fatal_error "$f does not exist" unless -f $f;