From e0e00293fe5be491c48a84daef2d6293e6d3bc59 Mon Sep 17 00:00:00 2001 From: teastep Date: Sat, 10 Apr 2004 14:28:29 +0000 Subject: [PATCH] Apply Stijn Jonker's Fix for CONFIG_PATH git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1258 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall2/changelog.txt | 4 +++- Shorewall2/firewall | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Shorewall2/changelog.txt b/Shorewall2/changelog.txt index 3bf84b938..7b124ca79 100644 --- a/Shorewall2/changelog.txt +++ b/Shorewall2/changelog.txt @@ -6,4 +6,6 @@ Changes since 2.0.1 3) Tweak new dynamic zone implementation. -4) Implement CONFIG_PATH. \ No newline at end of file +4) Implement CONFIG_PATH. + +5) Apply Stijn Jonker's fix for CONFIG_PATH. diff --git a/Shorewall2/firewall b/Shorewall2/firewall index 4b9795d68..62f2dae91 100755 --- a/Shorewall2/firewall +++ b/Shorewall2/firewall @@ -5754,7 +5754,7 @@ do_initialize() { # # Restore CONFIG_PATH if the shorewall.conf file cleared it # - [ -n "$CONFIG_PATH"] || CONFIG_PATH=/etc/shorewall:/usr/share/shorewall + [ -n "$CONFIG_PATH" ] || CONFIG_PATH=/etc/shorewall:/usr/share/shorewall [ -n "$SHOREWALL_DIR" ] && CONFIG_PATH=$SHOREWALL_DIR:$CONFIG_PATH # # Determine the capabilities of the installed iptables/netfilter