holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Don't ask for script version when WORKAROUNDS=No

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2015-06-28 09:18:47 -07:00
parent a911ec318e
commit 7153146759
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Shorewall-core/lib.common
View File

@ -98,9 +98,10 @@ get_script_version() { # $1 = script
local digits
local verbosity
if [ "$g_compiled" = "$g_file" ]; then
if [ -z "$WORKAROUNDS" -o "$g_compiled" = "$g_file" ]; then
#
# Either this script was just compiled or AUTOMAKE determined that compilation wasn't needed
# Unless WORKAROUNDS=No, either this script was just compiled or AUTOMAKE
# determined that re-compilation wasn't needed
#
temp="$SHOREWALL_VERSION"
else

7
Shorewall/manpages/shorewall.conf.xml
View File

@ -2999,6 +2999,13 @@ INLINE - - - ; -j REJECT
are enabled; when WORKAROUNDS=No, they are disabled. If not
specified or if specified as empty, WORKAROUNDS=Yes is
assumed.</para>
<warning>
<para>Do not set WORKAROUNDS=Yes if you need to be able to use
Shorewall-generated scripts (such as created by the
<command>save</command> command) built by Shorewall 4.4.7 or
older.</para>
</warning>
</listitem>
</varlistentry>

7
Shorewall6/manpages/shorewall6.conf.xml
View File

@ -2648,6 +2648,13 @@ INLINE - - - ; -j REJECT
are enabled; when WORKAROUNDS=No, they are disabled. If not
specified or if specified as empty, WORKAROUNDS=Yes is
assumed.</para>
<warning>
<para>Do not set WORKAROUNDS=Yes if you need to be able to use
Shorewall-generated scripts (such as created by the
<command>save</command> command) built by Shorewall 4.4.7 or
older.</para>
</warning>
</listitem>
</varlistentry>