From ebe4267c49b8d4dc39644ce837b8dc0e9dd298a6 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Thu, 27 Dec 2012 09:58:45 -0800 Subject: [PATCH] Rename IGNOREOLDCAPVERSIONS to WARNOLDCAPVERSION Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Config.pm | 6 ++-- Shorewall/Samples/Universal/shorewall.conf | 4 +-- .../Samples/one-interface/shorewall.conf | 4 +-- .../Samples/three-interfaces/shorewall.conf | 4 +-- .../Samples/two-interfaces/shorewall.conf | 4 +-- Shorewall/configfiles/shorewall.conf | 4 +-- Shorewall/manpages/shorewall.conf.xml | 28 +++++++++---------- Shorewall6/Samples6/Universal/shorewall6.conf | 4 +-- .../Samples6/one-interface/shorewall6.conf | 4 +-- .../Samples6/three-interfaces/shorewall6.conf | 4 +-- .../Samples6/two-interfaces/shorewall6.conf | 4 +-- Shorewall6/configfiles/shorewall6.conf | 4 +-- Shorewall6/manpages/shorewall6.conf.xml | 28 +++++++++---------- 13 files changed, 51 insertions(+), 51 deletions(-) diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm index 6cf5eeaa6..b472746b5 100644 --- a/Shorewall/Perl/Shorewall/Config.pm +++ b/Shorewall/Perl/Shorewall/Config.pm @@ -762,7 +762,7 @@ sub initialize( $;$$) { AUTOHELPERS => undef, RESTORE_ROUTEMARKS => undef, IGNOREUNKNOWNVARIABLES => undef, - IGNOREOLDCAPS => undef, + WARNOLDCAPVERSION => undef, # # Packet Disposition # @@ -5038,7 +5038,7 @@ sub get_configuration( $$$$ ) { default_yes_no 'AUTOHELPERS' , 'Yes'; default_yes_no 'RESTORE_ROUTEMARKS' , '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'; @@ -5314,7 +5314,7 @@ sub get_configuration( $$$$ ) { require_capability( 'XCONNMARK' , 'HIGH_ROUTE_MARKS=Yes' , 's' ) if $config{PROVIDER_OFFSET} > 0; require_capability( 'MANGLE_ENABLED' , 'Traffic Shaping' , 's' ) if $config{TC_ENABLED}; - unless ( $config{IGNOREOLDCAPS} ) { + if ( $config{WARNOLDCAPVERSION} ) { 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}" unless $capabilities{CAPVERSION} >= $globals{CAPVERSION}; diff --git a/Shorewall/Samples/Universal/shorewall.conf b/Shorewall/Samples/Universal/shorewall.conf index 15ec21f95..910cd391f 100644 --- a/Shorewall/Samples/Universal/shorewall.conf +++ b/Shorewall/Samples/Universal/shorewall.conf @@ -114,8 +114,6 @@ ADD_SNAT_ALIASES=No ADMINISABSENTMINDED=Yes -IGNOREOLDCAPVERSIONS=No - IGNOREUNKNOWNVARIABLES=No AUTOCOMMENT=Yes @@ -210,6 +208,8 @@ USE_DEFAULT_RT=No USE_PHYSICAL_NAMES=No +WARNOLDCAPVERSION=Yes + ZONE2ZONE=2 ############################################################################### diff --git a/Shorewall/Samples/one-interface/shorewall.conf b/Shorewall/Samples/one-interface/shorewall.conf index 57a61c733..7c06fcaad 100644 --- a/Shorewall/Samples/one-interface/shorewall.conf +++ b/Shorewall/Samples/one-interface/shorewall.conf @@ -125,8 +125,6 @@ ADD_SNAT_ALIASES=No ADMINISABSENTMINDED=Yes -IGNOREOLDCAPVERSIONS=No - IGNOREUNKNOWNVARIABLES=No AUTOCOMMENT=Yes @@ -221,6 +219,8 @@ USE_DEFAULT_RT=No USE_PHYSICAL_NAMES=No +WARNOLDCAPVERSION=Yes + ZONE2ZONE=2 ############################################################################### diff --git a/Shorewall/Samples/three-interfaces/shorewall.conf b/Shorewall/Samples/three-interfaces/shorewall.conf index b15cd5d82..a139d99d0 100644 --- a/Shorewall/Samples/three-interfaces/shorewall.conf +++ b/Shorewall/Samples/three-interfaces/shorewall.conf @@ -123,8 +123,6 @@ ADD_SNAT_ALIASES=No ADMINISABSENTMINDED=Yes -IGNOREOLDCAPVERSIONS=No - IGNOREUNKNOWNVARIABLES=No AUTOCOMMENT=Yes @@ -219,6 +217,8 @@ USE_DEFAULT_RT=No USE_PHYSICAL_NAMES=No +WARNOLDCAPVERSION=Yes + ZONE2ZONE=2 ############################################################################### diff --git a/Shorewall/Samples/two-interfaces/shorewall.conf b/Shorewall/Samples/two-interfaces/shorewall.conf index 83d7c1b05..d5d5ed571 100644 --- a/Shorewall/Samples/two-interfaces/shorewall.conf +++ b/Shorewall/Samples/two-interfaces/shorewall.conf @@ -126,8 +126,6 @@ ADD_SNAT_ALIASES=No ADMINISABSENTMINDED=Yes -IGNOREOLDCAPVERSIONS=No - IGNOREUNKNOWNVARIABLES=No AUTOCOMMENT=Yes @@ -222,6 +220,8 @@ USE_DEFAULT_RT=No USE_PHYSICAL_NAMES=No +WARNOLDCAPVERSION=Yes + ZONE2ZONE=2 ############################################################################### diff --git a/Shorewall/configfiles/shorewall.conf b/Shorewall/configfiles/shorewall.conf index c1ac63d26..3458af366 100644 --- a/Shorewall/configfiles/shorewall.conf +++ b/Shorewall/configfiles/shorewall.conf @@ -114,8 +114,6 @@ ADD_SNAT_ALIASES=No ADMINISABSENTMINDED=Yes -IGNOREOLDCAPVERSIONS=No - IGNOREUNKNOWNVARIABLES=No AUTOCOMMENT=Yes @@ -210,6 +208,8 @@ USE_DEFAULT_RT=No USE_PHYSICAL_NAMES=No +WARNOLDCAPVERSION=Yes + ZONE2ZONE=2 ############################################################################### diff --git a/Shorewall/manpages/shorewall.conf.xml b/Shorewall/manpages/shorewall.conf.xml index 51796f03b..6bc875b62 100644 --- a/Shorewall/manpages/shorewall.conf.xml +++ b/Shorewall/manpages/shorewall.conf.xml @@ -280,20 +280,6 @@ - - IGNOREOLDCAPVERSIONS=[Yes|No] - - - Added in Shorewall 4.5.12. When set to No (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 Yes, - no warning is issued. - - - IGNOREUNKNOWNVARIABLES=[then the chain name is 'net2all' + + WARNOLDCAPVERSION=[Yes|No] + + + Added in Shorewall 4.5.12. When set to Yes (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 No, no + warning is issued. + + + WIDE_TC_MARKS={Yes|No} diff --git a/Shorewall6/Samples6/Universal/shorewall6.conf b/Shorewall6/Samples6/Universal/shorewall6.conf index e9fcdb453..b0ad19f0f 100644 --- a/Shorewall6/Samples6/Universal/shorewall6.conf +++ b/Shorewall6/Samples6/Universal/shorewall6.conf @@ -109,8 +109,6 @@ ACCOUNTING_TABLE=filter ADMINISABSENTMINDED=Yes -IGNOREOLDCAPVERSIONS=No - IGNOREUNKNOWNVARIABLES=No AUTOCOMMENT=Yes @@ -187,6 +185,8 @@ USE_DEFAULT_RT=No USE_PHYSICAL_NAMES=No +WARNOLDCAPVERSION=Yes + ZONE2ZONE=2 ############################################################################### diff --git a/Shorewall6/Samples6/one-interface/shorewall6.conf b/Shorewall6/Samples6/one-interface/shorewall6.conf index 1ed7c9b8e..ba43a0e8f 100644 --- a/Shorewall6/Samples6/one-interface/shorewall6.conf +++ b/Shorewall6/Samples6/one-interface/shorewall6.conf @@ -109,8 +109,6 @@ ACCOUNTING_TABLE=filter ADMINISABSENTMINDED=Yes -IGNOREOLDCAPVERSIONS=No - IGNOREUNKNOWNVARIABLES=No AUTOCOMMENT=Yes @@ -187,6 +185,8 @@ USE_DEFAULT_RT=No USE_PHYSICAL_NAMES=No +WARNOLDCAPVERSION=Yes + ZONE2ZONE=2 ############################################################################### diff --git a/Shorewall6/Samples6/three-interfaces/shorewall6.conf b/Shorewall6/Samples6/three-interfaces/shorewall6.conf index 05961ca6f..c0edfa88e 100644 --- a/Shorewall6/Samples6/three-interfaces/shorewall6.conf +++ b/Shorewall6/Samples6/three-interfaces/shorewall6.conf @@ -109,8 +109,6 @@ ACCOUNTING_TABLE=filter ADMINISABSENTMINDED=Yes -IGNOREOLDCAPVERSIONS=No - IGNOREUNKNOWNVARIABLES=No AUTOCOMMENT=Yes @@ -187,6 +185,8 @@ USE_DEFAULT_RT=No USE_PHYSICAL_NAMES=No +WARNOLDCAPVERSION=Yes + ZONE2ZONE=2 ############################################################################### diff --git a/Shorewall6/Samples6/two-interfaces/shorewall6.conf b/Shorewall6/Samples6/two-interfaces/shorewall6.conf index 53b62ef99..b65becb9d 100644 --- a/Shorewall6/Samples6/two-interfaces/shorewall6.conf +++ b/Shorewall6/Samples6/two-interfaces/shorewall6.conf @@ -109,8 +109,6 @@ ACCOUNTING_TABLE=filter ADMINISABSENTMINDED=Yes -IGNOREOLDCAPVERSIONS=No - IGNOREUNKNOWNVARIABLES=No AUTOCOMMENT=Yes @@ -187,6 +185,8 @@ USE_DEFAULT_RT=No USE_PHYSICAL_NAMES=No +WARNOLDCAPVERSION=Yes + ZONE2ZONE=2 ############################################################################### diff --git a/Shorewall6/configfiles/shorewall6.conf b/Shorewall6/configfiles/shorewall6.conf index 63c1992f7..e9f4dcc3e 100644 --- a/Shorewall6/configfiles/shorewall6.conf +++ b/Shorewall6/configfiles/shorewall6.conf @@ -109,8 +109,6 @@ ACCOUNTING_TABLE=filter ADMINISABSENTMINDED=Yes -IGNOREOLDCAPVERSIONS=No - IGNOREUNKNOWNVARIABLES=No AUTOCOMMENT=Yes @@ -187,6 +185,8 @@ USE_DEFAULT_RT=No USE_PHYSICAL_NAMES=No +WARNOLDCAPVERSION=Yes + ZONE2ZONE=2 ############################################################################### diff --git a/Shorewall6/manpages/shorewall6.conf.xml b/Shorewall6/manpages/shorewall6.conf.xml index de5cb2066..31e7d3bc8 100644 --- a/Shorewall6/manpages/shorewall6.conf.xml +++ b/Shorewall6/manpages/shorewall6.conf.xml @@ -217,20 +217,6 @@ - - IGNOREOLDCAPVERSIONS=[Yes|No] - - - Added in Shorewall 4.5.12. When set to No (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 Yes, - no warning is issued. - - - IGNOREUNKNOWNVARIABLES=[then the chain name is 'net2all' + + WARNOLDCAPVERSION=[Yes|No] + + + Added in Shorewall 4.5.12. When set to Yes (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 No, no + warning is issued. + + + WIDE_TC_MARKS={Yes|No}