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

Rename IGNOREOLDCAPVERSIONS to WARNOLDCAPVERSION

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-12-27 09:58:45 -08:00
parent 8b92a59821
commit ebe4267c49
13 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Shorewall/Perl/Shorewall/Config.pm
View File

@ -762,7 +762,7 @@ sub initialize( $;$$) {
AUTOHELPERS => undef, AUTOHELPERS => undef,
RESTORE_ROUTEMARKS => undef, RESTORE_ROUTEMARKS => undef,
IGNOREUNKNOWNVARIABLES => undef, IGNOREUNKNOWNVARIABLES => undef,
IGNOREOLDCAPS => undef, WARNOLDCAPVERSION => undef,
# #
# Packet Disposition # Packet Disposition
# #
@ -5038,7 +5038,7 @@ sub get_configuration( $$$$ ) {
default_yes_no 'AUTOHELPERS' , 'Yes'; default_yes_no 'AUTOHELPERS' , 'Yes';
default_yes_no 'RESTORE_ROUTEMARKS' , 'Yes'; default_yes_no 'RESTORE_ROUTEMARKS' , 'Yes';
default_yes_no 'IGNOREUNKNOWNVARIABLES' , 'Yes'; default_yes_no 'IGNOREUNKNOWNVARIABLES' , 'Yes';
default_yes_no 'IGNOREOLDCAPS' , ''; default_yes_no 'WARNOLDCAPVERSION' , 'Yes';
$config{IPSET} = '' if supplied $config{IPSET} && $config{IPSET} eq 'ipset'; $config{IPSET} = '' if supplied $config{IPSET} && $config{IPSET} eq 'ipset';
@ -5314,7 +5314,7 @@ sub get_configuration( $$$$ ) {
require_capability( 'XCONNMARK' , 'HIGH_ROUTE_MARKS=Yes' , 's' ) if $config{PROVIDER_OFFSET} > 0; require_capability( 'XCONNMARK' , 'HIGH_ROUTE_MARKS=Yes' , 's' ) if $config{PROVIDER_OFFSET} > 0;
require_capability( 'MANGLE_ENABLED' , 'Traffic Shaping' , 's' ) if $config{TC_ENABLED}; require_capability( 'MANGLE_ENABLED' , 'Traffic Shaping' , 's' ) if $config{TC_ENABLED};
unless ( $config{IGNOREOLDCAPS} ) { if ( $config{WARNOLDCAPVERSION} ) {
if ( $capabilities{CAPVERSION} ) { if ( $capabilities{CAPVERSION} ) {
warning_message "Your capabilities file is out of date -- it does not contain all of the capabilities defined by $Product version $globals{VERSION}" warning_message "Your capabilities file is out of date -- it does not contain all of the capabilities defined by $Product version $globals{VERSION}"
unless $capabilities{CAPVERSION} >= $globals{CAPVERSION}; unless $capabilities{CAPVERSION} >= $globals{CAPVERSION};

4
Shorewall/Samples/Universal/shorewall.conf
View File

@ -114,8 +114,6 @@ ADD_SNAT_ALIASES=No
ADMINISABSENTMINDED=Yes ADMINISABSENTMINDED=Yes
IGNOREOLDCAPVERSIONS=No
IGNOREUNKNOWNVARIABLES=No IGNOREUNKNOWNVARIABLES=No
AUTOCOMMENT=Yes AUTOCOMMENT=Yes
@ -210,6 +208,8 @@ USE_DEFAULT_RT=No
USE_PHYSICAL_NAMES=No USE_PHYSICAL_NAMES=No
WARNOLDCAPVERSION=Yes
ZONE2ZONE=2 ZONE2ZONE=2
############################################################################### ###############################################################################

4
Shorewall/Samples/one-interface/shorewall.conf
View File

@ -125,8 +125,6 @@ ADD_SNAT_ALIASES=No
ADMINISABSENTMINDED=Yes ADMINISABSENTMINDED=Yes
IGNOREOLDCAPVERSIONS=No
IGNOREUNKNOWNVARIABLES=No IGNOREUNKNOWNVARIABLES=No
AUTOCOMMENT=Yes AUTOCOMMENT=Yes
@ -221,6 +219,8 @@ USE_DEFAULT_RT=No
USE_PHYSICAL_NAMES=No USE_PHYSICAL_NAMES=No
WARNOLDCAPVERSION=Yes
ZONE2ZONE=2 ZONE2ZONE=2
############################################################################### ###############################################################################

4
Shorewall/Samples/three-interfaces/shorewall.conf
View File

@ -123,8 +123,6 @@ ADD_SNAT_ALIASES=No
ADMINISABSENTMINDED=Yes ADMINISABSENTMINDED=Yes
IGNOREOLDCAPVERSIONS=No
IGNOREUNKNOWNVARIABLES=No IGNOREUNKNOWNVARIABLES=No
AUTOCOMMENT=Yes AUTOCOMMENT=Yes
@ -219,6 +217,8 @@ USE_DEFAULT_RT=No
USE_PHYSICAL_NAMES=No USE_PHYSICAL_NAMES=No
WARNOLDCAPVERSION=Yes
ZONE2ZONE=2 ZONE2ZONE=2
############################################################################### ###############################################################################

4
Shorewall/Samples/two-interfaces/shorewall.conf
View File

@ -126,8 +126,6 @@ ADD_SNAT_ALIASES=No
ADMINISABSENTMINDED=Yes ADMINISABSENTMINDED=Yes
IGNOREOLDCAPVERSIONS=No
IGNOREUNKNOWNVARIABLES=No IGNOREUNKNOWNVARIABLES=No
AUTOCOMMENT=Yes AUTOCOMMENT=Yes
@ -222,6 +220,8 @@ USE_DEFAULT_RT=No
USE_PHYSICAL_NAMES=No USE_PHYSICAL_NAMES=No
WARNOLDCAPVERSION=Yes
ZONE2ZONE=2 ZONE2ZONE=2
############################################################################### ###############################################################################

4
Shorewall/configfiles/shorewall.conf
View File

@ -114,8 +114,6 @@ ADD_SNAT_ALIASES=No
ADMINISABSENTMINDED=Yes ADMINISABSENTMINDED=Yes
IGNOREOLDCAPVERSIONS=No
IGNOREUNKNOWNVARIABLES=No IGNOREUNKNOWNVARIABLES=No
AUTOCOMMENT=Yes AUTOCOMMENT=Yes
@ -210,6 +208,8 @@ USE_DEFAULT_RT=No
USE_PHYSICAL_NAMES=No USE_PHYSICAL_NAMES=No
WARNOLDCAPVERSION=Yes
ZONE2ZONE=2 ZONE2ZONE=2
############################################################################### ###############################################################################

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

@ -280,20 +280,6 @@
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term><emphasis role="bold">IGNOREOLDCAPVERSIONS=</emphasis>[<emphasis
role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>]</term>
<listitem>
<para>Added in Shorewall 4.5.12. When set to <emphasis
role="bold">No</emphasis> (the default), the compiler issues a
warning when it finds a capabilities file that doesn't specify all
of the capabilities supported by the compiler. When
IGNOREOLDCAPVERSIONS is set to <emphasis role="bold">Yes</emphasis>,
no warning is issued.</para>
</listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term><emphasis <term><emphasis
role="bold">IGNOREUNKNOWNVARIABLES=</emphasis>[<emphasis role="bold">IGNOREUNKNOWNVARIABLES=</emphasis>[<emphasis
@ -2469,6 +2455,20 @@ net all DROP info</programlisting>then the chain name is 'net2all'
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term><emphasis role="bold">WARNOLDCAPVERSION=</emphasis>[<emphasis
role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>]</term>
<listitem>
<para>Added in Shorewall 4.5.12. When set to <emphasis
role="bold">Yes</emphasis> (the default), the compiler issues a
warning when it finds a capabilities file that doesn't specify all
of the capabilities supported by the compiler. When
WARNOLDCAPVERSION is set to <emphasis role="bold">No</emphasis>, no
warning is issued.</para>
</listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term><emphasis role="bold">WIDE_TC_MARKS=</emphasis>{<emphasis <term><emphasis role="bold">WIDE_TC_MARKS=</emphasis>{<emphasis
role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>}</term> role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>}</term>

4
Shorewall6/Samples6/Universal/shorewall6.conf
View File

@ -109,8 +109,6 @@ ACCOUNTING_TABLE=filter
ADMINISABSENTMINDED=Yes ADMINISABSENTMINDED=Yes
IGNOREOLDCAPVERSIONS=No
IGNOREUNKNOWNVARIABLES=No IGNOREUNKNOWNVARIABLES=No
AUTOCOMMENT=Yes AUTOCOMMENT=Yes
@ -187,6 +185,8 @@ USE_DEFAULT_RT=No
USE_PHYSICAL_NAMES=No USE_PHYSICAL_NAMES=No
WARNOLDCAPVERSION=Yes
ZONE2ZONE=2 ZONE2ZONE=2
############################################################################### ###############################################################################

4
Shorewall6/Samples6/one-interface/shorewall6.conf
View File

@ -109,8 +109,6 @@ ACCOUNTING_TABLE=filter
ADMINISABSENTMINDED=Yes ADMINISABSENTMINDED=Yes
IGNOREOLDCAPVERSIONS=No
IGNOREUNKNOWNVARIABLES=No IGNOREUNKNOWNVARIABLES=No
AUTOCOMMENT=Yes AUTOCOMMENT=Yes
@ -187,6 +185,8 @@ USE_DEFAULT_RT=No
USE_PHYSICAL_NAMES=No USE_PHYSICAL_NAMES=No
WARNOLDCAPVERSION=Yes
ZONE2ZONE=2 ZONE2ZONE=2
############################################################################### ###############################################################################

4
Shorewall6/Samples6/three-interfaces/shorewall6.conf
View File

@ -109,8 +109,6 @@ ACCOUNTING_TABLE=filter
ADMINISABSENTMINDED=Yes ADMINISABSENTMINDED=Yes
IGNOREOLDCAPVERSIONS=No
IGNOREUNKNOWNVARIABLES=No IGNOREUNKNOWNVARIABLES=No
AUTOCOMMENT=Yes AUTOCOMMENT=Yes
@ -187,6 +185,8 @@ USE_DEFAULT_RT=No
USE_PHYSICAL_NAMES=No USE_PHYSICAL_NAMES=No
WARNOLDCAPVERSION=Yes
ZONE2ZONE=2 ZONE2ZONE=2
############################################################################### ###############################################################################

4
Shorewall6/Samples6/two-interfaces/shorewall6.conf
View File

@ -109,8 +109,6 @@ ACCOUNTING_TABLE=filter
ADMINISABSENTMINDED=Yes ADMINISABSENTMINDED=Yes
IGNOREOLDCAPVERSIONS=No
IGNOREUNKNOWNVARIABLES=No IGNOREUNKNOWNVARIABLES=No
AUTOCOMMENT=Yes AUTOCOMMENT=Yes
@ -187,6 +185,8 @@ USE_DEFAULT_RT=No
USE_PHYSICAL_NAMES=No USE_PHYSICAL_NAMES=No
WARNOLDCAPVERSION=Yes
ZONE2ZONE=2 ZONE2ZONE=2
############################################################################### ###############################################################################

4
Shorewall6/configfiles/shorewall6.conf
View File

@ -109,8 +109,6 @@ ACCOUNTING_TABLE=filter
ADMINISABSENTMINDED=Yes ADMINISABSENTMINDED=Yes
IGNOREOLDCAPVERSIONS=No
IGNOREUNKNOWNVARIABLES=No IGNOREUNKNOWNVARIABLES=No
AUTOCOMMENT=Yes AUTOCOMMENT=Yes
@ -187,6 +185,8 @@ USE_DEFAULT_RT=No
USE_PHYSICAL_NAMES=No USE_PHYSICAL_NAMES=No
WARNOLDCAPVERSION=Yes
ZONE2ZONE=2 ZONE2ZONE=2
############################################################################### ###############################################################################

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

@ -217,20 +217,6 @@
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term><emphasis role="bold">IGNOREOLDCAPVERSIONS=</emphasis>[<emphasis
role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>]</term>
<listitem>
<para>Added in Shorewall 4.5.12. When set to <emphasis
role="bold">No</emphasis> (the default), the compiler issues a
warning when it finds a capabilities file that doesn't specify all
of the capabilities supported by the compiler. When
IGNOREOLDCAPVERSIONS is set to <emphasis role="bold">Yes</emphasis>,
no warning is issued.</para>
</listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term><emphasis <term><emphasis
role="bold">IGNOREUNKNOWNVARIABLES=</emphasis>[<emphasis role="bold">IGNOREUNKNOWNVARIABLES=</emphasis>[<emphasis
@ -2185,6 +2171,20 @@ net all DROP info</programlisting>then the chain name is 'net2all'
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term><emphasis role="bold">WARNOLDCAPVERSION=</emphasis>[<emphasis
role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>]</term>
<listitem>
<para>Added in Shorewall 4.5.12. When set to <emphasis
role="bold">Yes</emphasis> (the default), the compiler issues a
warning when it finds a capabilities file that doesn't specify all
of the capabilities supported by the compiler. When
WARNOLDCAPVERSION is set to <emphasis role="bold">No</emphasis>, no
warning is issued.</para>
</listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term><emphasis role="bold">WIDE_TC_MARKS=</emphasis>{<emphasis <term><emphasis role="bold">WIDE_TC_MARKS=</emphasis>{<emphasis
role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>}</term> role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>}</term>