From 350c16a922bb093f0f147b084d5c361fd149659f Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Fri, 9 Feb 2007 17:56:09 +0000
Subject: [PATCH] Don't tie EXPORTPARAMS to -e

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5384 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 docs/CompiledPrograms.xml            |  6 ++---
 docs/configuration_file_basics.xml   |  5 ++--
 docs/shorewall_extension_scripts.xml | 35 ++++++++++++++--------------
 3 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/docs/CompiledPrograms.xml b/docs/CompiledPrograms.xml
index 6c72a5cd1..fc5de6d90 100644
--- a/docs/CompiledPrograms.xml
+++ b/docs/CompiledPrograms.xml
@@ -104,8 +104,7 @@
             <listitem>
               <para>Beginning with Shorewall 3.2.9 and 3.4.0 RC2, the
               <filename>params</filename> file is only processed at compile
-              time if the <link linkend="Compile">-e compiler option</link> is
-              given and you set EXPORTPARAMS=No in
+              time if you set EXPORTPARAMS=No in
               <filename>shorewall.conf</filename>. For run-time setting of
               shell variables, use the <filename>init</filename> extension
               script. Although the default setting is EXPORTPARAMS=Yes for
@@ -667,8 +666,7 @@ clean:
             <listitem>
               <para>Beginning with Shorewall 3.2.9 and 3.4.0 RC2, the
               <filename>params</filename> file is only processed at compile
-              time if the <link linkend="Compile">-e compiler option</link> is
-              given and you set EXPORTPARAMS=No in
+              time if you set EXPORTPARAMS=No in
               <filename>shorewall.conf</filename>. For run-time setting of
               shell variables, use the <filename>init</filename> extension
               script.</para>
diff --git a/docs/configuration_file_basics.xml b/docs/configuration_file_basics.xml
index 1270d764c..01f5b85cc 100644
--- a/docs/configuration_file_basics.xml
+++ b/docs/configuration_file_basics.xml
@@ -729,9 +729,8 @@ DNAT       net        loc:192.168.1.3 tcp       4000:4100</programlisting>
       <listitem>
         <para>The <filename>/etc/shorewall/params</filename> file is processed
         by the compiler at compile-time and by the compiled script at
-        run-time. Beginning with Shorewall 3.2.9 and 3.4.0 RC2, if the "-e"
-        flag is given to the compiler and you have set EXPORTPARAMS=No in
-        <filename>shorewall.conf</filename>, then the
+        run-time. Beginning with Shorewall 3.2.9 and 3.4.0 RC2, if you have
+        set EXPORTPARAMS=No in <filename>shorewall.conf</filename>, then the
         <filename><filename>params</filename></filename> file is only
         processed by the compiler; it is not run by the compiled
         script.</para>
diff --git a/docs/shorewall_extension_scripts.xml b/docs/shorewall_extension_scripts.xml
index 24aa1293c..8b0573cce 100644
--- a/docs/shorewall_extension_scripts.xml
+++ b/docs/shorewall_extension_scripts.xml
@@ -298,25 +298,24 @@
 
       <note>
         <para>The <filename>/etc/shorewall/params</filename> script is
-        processed only during compilation if the "-e" compiler flag is given
-        and EXPORTPARAMS=No in <filename>shorewall.conf</filename>. So shell
-        variables set in that file may be used in Shorewall configuration
-        files only. Any variables that your extension scripts require at
-        run-time on the firewall system should be set in the
-        <filename>init</filename> extension script.</para>
+        processed only during compilation if EXPORTPARAMS=No in
+        <filename>shorewall.conf</filename>. So shell variables set in that
+        file may be used in Shorewall configuration files only. Any variables
+        that your extension scripts require at run-time on the firewall system
+        should be set in the <filename>init</filename> extension
+        script.</para>
 
-        <para>When the "-e" flag is not given or when EXPORTPARAMS=Yes (the
-        default), the <filename>/etc/shorewall/params</filename> script is
-        processed during compilation <emphasis role="bold">and</emphasis>
-        copied into the compiled script as described above. So shell variables
-        set during compilation may be used in Shorewall configuration files
-        while those set at run-time are available to your other extension
-        scripts.Note that if you assign dynamic values to variables, there is
-        no guarantee that the value calculated at compile time will be the
-        same as what is calculated at run time. This is particularly true if
-        you use the <command>shorewall compile</command> command to compile a
-        program then run that program at a later time or if you use Shorewall
-        Lite.</para>
+        <para>When EXPORTPARAMS=Yes (the default), the
+        <filename>/etc/shorewall/params</filename> script is processed during
+        compilation <emphasis role="bold">and</emphasis> copied into the
+        compiled script as described above. So shell variables set during
+        compilation may be used in Shorewall configuration files while those
+        set at run-time are available to your other extension scripts.Note
+        that if you assign dynamic values to variables, there is no guarantee
+        that the value calculated at compile time will be the same as what is
+        calculated at run time. This is particularly true if you use the
+        <command>shorewall compile</command> command to compile a program then
+        run that program at a later time or if you use Shorewall Lite.</para>
       </note>
 
       <note>