From 8a0abab4cc04fd21ae16719a36123faab5e7c957 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Wed, 12 Dec 2012 11:51:31 -0800 Subject: [PATCH] Rename 'ALLOWUNKNOWNVARIABLES' to 'IGNOREUNKNOWNVARIABLES' Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Config.pm | 8 ++++---- Shorewall/Samples/Universal/shorewall.conf | 2 +- Shorewall/Samples/one-interface/shorewall.conf | 2 +- Shorewall/Samples/three-interfaces/shorewall.conf | 2 +- Shorewall/Samples/two-interfaces/shorewall.conf | 2 +- Shorewall/configfiles/shorewall.conf | 2 +- Shorewall/manpages/shorewall.conf.xml | 4 ++-- Shorewall6/Samples6/Universal/shorewall6.conf | 2 +- Shorewall6/Samples6/one-interface/shorewall6.conf | 2 +- Shorewall6/Samples6/three-interfaces/shorewall6.conf | 2 +- Shorewall6/Samples6/two-interfaces/shorewall6.conf | 2 +- Shorewall6/configfiles/shorewall6.conf | 2 +- Shorewall6/manpages/shorewall6.conf.xml | 4 ++-- 13 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm index 95d9f5335..b9419aaff 100644 --- a/Shorewall/Perl/Shorewall/Config.pm +++ b/Shorewall/Perl/Shorewall/Config.pm @@ -738,7 +738,7 @@ sub initialize( $;$$) { HELPERS => undef, AUTOHELPERS => undef, RESTORE_ROUTEMARKS => undef, - ALLOWUNKNOWNVARIABLES => undef, + IGNOREUNKNOWNVARIABLES => undef, # # Packet Disposition # @@ -2659,7 +2659,7 @@ sub expand_variables( \$ ) { my $val; if ( $var =~ /^\d+$/ ) { - fatal_error "Undefined parameter (\$$var)" unless ( $config{ALLOWUNKNOWNVARIABLES} || + fatal_error "Undefined parameter (\$$var)" unless ( $config{IGNOREUNKNOWNVARIABLES} || ( defined $actparms{$var} && ( length( $var ) == 1 || $var !~ /^0/ ) ) ); fatal_error "Undefined parameter (\$$var)" if ( ! defined $actparms{$var} ) || ( length( $var ) > 1 && $var =~ /^0/ ); @@ -2669,7 +2669,7 @@ sub expand_variables( \$ ) { } elsif ( exists $actparms{$var} ) { $val = $actparms{$var}; } else { - fatal_error "Undefined shell variable (\$$var)" unless $config{ALLOWUNKNOWNVARIABLES} || exists $config{$var}; + fatal_error "Undefined shell variable (\$$var)" unless $config{IGNOREUNKNOWNVARIABLES} || exists $config{$var}; } $val = '' unless defined $val; @@ -4787,7 +4787,7 @@ sub get_configuration( $$$ ) { default_yes_no 'IPSET_WARNINGS' , 'Yes'; default_yes_no 'AUTOHELPERS' , 'Yes'; default_yes_no 'RESTORE_ROUTEMARKS' , 'Yes'; - default_yes_no 'ALLOWUNKNOWNVARIABLES' , 'Yes'; + default_yes_no 'IGNOREUNKNOWNVARIABLES' , 'Yes'; $config{IPSET} = '' if supplied $config{IPSET} && $config{IPSET} eq 'ipset'; diff --git a/Shorewall/Samples/Universal/shorewall.conf b/Shorewall/Samples/Universal/shorewall.conf index 267a40f3e..c446b86cb 100644 --- a/Shorewall/Samples/Universal/shorewall.conf +++ b/Shorewall/Samples/Universal/shorewall.conf @@ -114,7 +114,7 @@ ADD_SNAT_ALIASES=No ADMINISABSENTMINDED=Yes -ALLOWUNKNOWNVARIABLES=No +IGNOREUNKNOWNVARIABLES=No AUTOCOMMENT=Yes diff --git a/Shorewall/Samples/one-interface/shorewall.conf b/Shorewall/Samples/one-interface/shorewall.conf index 852fb2646..3e8cf69dc 100644 --- a/Shorewall/Samples/one-interface/shorewall.conf +++ b/Shorewall/Samples/one-interface/shorewall.conf @@ -125,7 +125,7 @@ ADD_SNAT_ALIASES=No ADMINISABSENTMINDED=Yes -ALLOWUNKNOWNVARIABLES=No +IGNOREUNKNOWNVARIABLES=No AUTOCOMMENT=Yes diff --git a/Shorewall/Samples/three-interfaces/shorewall.conf b/Shorewall/Samples/three-interfaces/shorewall.conf index ac8f05232..ff7677731 100644 --- a/Shorewall/Samples/three-interfaces/shorewall.conf +++ b/Shorewall/Samples/three-interfaces/shorewall.conf @@ -123,7 +123,7 @@ ADD_SNAT_ALIASES=No ADMINISABSENTMINDED=Yes -ALLOWUNKNOWNVARIABLES=No +IGNOREUNKNOWNVARIABLES=No AUTOCOMMENT=Yes diff --git a/Shorewall/Samples/two-interfaces/shorewall.conf b/Shorewall/Samples/two-interfaces/shorewall.conf index 258c879ec..7e6f394f7 100644 --- a/Shorewall/Samples/two-interfaces/shorewall.conf +++ b/Shorewall/Samples/two-interfaces/shorewall.conf @@ -126,7 +126,7 @@ ADD_SNAT_ALIASES=No ADMINISABSENTMINDED=Yes -ALLOWUNKNOWNVARIABLES=No +IGNOREUNKNOWNVARIABLES=No AUTOCOMMENT=Yes diff --git a/Shorewall/configfiles/shorewall.conf b/Shorewall/configfiles/shorewall.conf index 70650be67..aa18f44f2 100644 --- a/Shorewall/configfiles/shorewall.conf +++ b/Shorewall/configfiles/shorewall.conf @@ -114,7 +114,7 @@ ADD_SNAT_ALIASES=No ADMINISABSENTMINDED=Yes -ALLOWUNKNOWNVARIABLES=No +IGNOREUNKNOWNVARIABLES=No AUTOCOMMENT=Yes diff --git a/Shorewall/manpages/shorewall.conf.xml b/Shorewall/manpages/shorewall.conf.xml index f97b9387b..1ec731b2f 100644 --- a/Shorewall/manpages/shorewall.conf.xml +++ b/Shorewall/manpages/shorewall.conf.xml @@ -282,14 +282,14 @@ ALLOWUNKNOWNVARIABLES=[IGNOREUNKNOWNVARIABLES=[Yes|No] Added in Shorewall 4.5.11. Normally, if an unknown shell variable is encountered in a configuration file (except in ?IF and ?ELSIF directives), the compiler raises a fatal error. If - ALLOWUNKNOWNVARIABLES is set to 'Yes', then such variables simply + IGNOREUNKNOWNVARIABLES is set to 'Yes', then such variables simply expand to an empty string. Default is 'No'. diff --git a/Shorewall6/Samples6/Universal/shorewall6.conf b/Shorewall6/Samples6/Universal/shorewall6.conf index bb4c6df85..77069c962 100644 --- a/Shorewall6/Samples6/Universal/shorewall6.conf +++ b/Shorewall6/Samples6/Universal/shorewall6.conf @@ -109,7 +109,7 @@ ACCOUNTING_TABLE=filter ADMINISABSENTMINDED=Yes -ALLOWUNKNOWNVARIABLES=No +IGNOREUNKNOWNVARIABLES=No AUTOCOMMENT=Yes diff --git a/Shorewall6/Samples6/one-interface/shorewall6.conf b/Shorewall6/Samples6/one-interface/shorewall6.conf index 08010c858..6fbd8de85 100644 --- a/Shorewall6/Samples6/one-interface/shorewall6.conf +++ b/Shorewall6/Samples6/one-interface/shorewall6.conf @@ -109,7 +109,7 @@ ACCOUNTING_TABLE=filter ADMINISABSENTMINDED=Yes -ALLOWUNKNOWNVARIABLES=No +IGNOREUNKNOWNVARIABLES=No AUTOCOMMENT=Yes diff --git a/Shorewall6/Samples6/three-interfaces/shorewall6.conf b/Shorewall6/Samples6/three-interfaces/shorewall6.conf index 8f06bfc82..b1b2e41d5 100644 --- a/Shorewall6/Samples6/three-interfaces/shorewall6.conf +++ b/Shorewall6/Samples6/three-interfaces/shorewall6.conf @@ -109,7 +109,7 @@ ACCOUNTING_TABLE=filter ADMINISABSENTMINDED=Yes -ALLOWUNKNOWNVARIABLES=No +IGNOREUNKNOWNVARIABLES=No AUTOCOMMENT=Yes diff --git a/Shorewall6/Samples6/two-interfaces/shorewall6.conf b/Shorewall6/Samples6/two-interfaces/shorewall6.conf index b35798c39..e72ad1599 100644 --- a/Shorewall6/Samples6/two-interfaces/shorewall6.conf +++ b/Shorewall6/Samples6/two-interfaces/shorewall6.conf @@ -109,7 +109,7 @@ ACCOUNTING_TABLE=filter ADMINISABSENTMINDED=Yes -ALLOWUNKNOWNVARIABLES=No +IGNOREUNKNOWNVARIABLES=No AUTOCOMMENT=Yes diff --git a/Shorewall6/configfiles/shorewall6.conf b/Shorewall6/configfiles/shorewall6.conf index 47f29ac08..da57ac6b7 100644 --- a/Shorewall6/configfiles/shorewall6.conf +++ b/Shorewall6/configfiles/shorewall6.conf @@ -109,7 +109,7 @@ ACCOUNTING_TABLE=filter ADMINISABSENTMINDED=Yes -ALLOWUNKNOWNVARIABLES=No +IGNOREUNKNOWNVARIABLES=No AUTOCOMMENT=Yes diff --git a/Shorewall6/manpages/shorewall6.conf.xml b/Shorewall6/manpages/shorewall6.conf.xml index 1c731e893..c02c53498 100644 --- a/Shorewall6/manpages/shorewall6.conf.xml +++ b/Shorewall6/manpages/shorewall6.conf.xml @@ -219,14 +219,14 @@ ALLOWUNKNOWNVARIABLES=[IGNOREUNKNOWNVARIABLES=[Yes|No] Added in Shorewall 4.5.11. Normally, if an unknown shell variable is encountered in a configuration file (except in ?IF and ?ELSIF directives), the compiler raises a fatal error. If - ALLOWUNKNOWNVARIABLES is set to 'Yes', then such variables simply + IGNOREUNKNOWNVARIABLES is set to 'Yes', then such variables simply expand to an empty string. Default is 'No'.