From d01fbf61a33808aabe2b537a28de3c519bd27c8c Mon Sep 17 00:00:00 2001 From: teastep Date: Fri, 9 Feb 2007 17:57:56 +0000 Subject: [PATCH] Don't tie EXPORTPARAMS to -e git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5386 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall/compiler | 2 +- Shorewall/releasenotes.txt | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Shorewall/compiler b/Shorewall/compiler index c08b962e7..b2933cddc 100755 --- a/Shorewall/compiler +++ b/Shorewall/compiler @@ -5092,7 +5092,7 @@ __EOF__ __EOF__ fi - [ -n "$EXPORTPARAMS" -o -z "$EXPORT" ] && append_file params + [ -n "$EXPORTPARAMS" ] && append_file params cat >&3 << __EOF__ diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index 44c093819..fc76b0b17 100644 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -38,8 +38,7 @@ Problems Corrected in 3.4.0 RC2 than constant values such that it works correctly with Shorewall Lite. To work around this problem, a new EXPORTPARAMS option has been added to shorewall.conf. When EXPORTPARAMS=No, the - 'params' file is no longer copied to the compiler output when the - '-e' flag is present. + 'params' file is no longer copied to the compiler output. With EXPORTPARAMS=No, uf you need to set environmental variables on the firewall system for use by your extension scripts, then do so