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

Rename 'ALLOWUNKNOWNVARIABLES' to 'IGNOREUNKNOWNVARIABLES'

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-12-12 11:51:31 -08:00
parent 5da7db3d5f
commit 8a0abab4cc
13 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -738,7 +738,7 @@ sub initialize( $;$$) {
HELPERS => undef, HELPERS => undef,
AUTOHELPERS => undef, AUTOHELPERS => undef,
RESTORE_ROUTEMARKS => undef, RESTORE_ROUTEMARKS => undef,
ALLOWUNKNOWNVARIABLES => undef, IGNOREUNKNOWNVARIABLES => undef,
# #
# Packet Disposition # Packet Disposition
# #
@ -2659,7 +2659,7 @@ sub expand_variables( \$ ) {
my $val; my $val;
if ( $var =~ /^\d+$/ ) { if ( $var =~ /^\d+$/ ) {
fatal_error "Undefined parameter (\$$var)" unless ( $config{ALLOWUNKNOWNVARIABLES} || fatal_error "Undefined parameter (\$$var)" unless ( $config{IGNOREUNKNOWNVARIABLES} ||
( defined $actparms{$var} && ( defined $actparms{$var} &&
( length( $var ) == 1 || $var !~ /^0/ ) ) ); ( length( $var ) == 1 || $var !~ /^0/ ) ) );
fatal_error "Undefined parameter (\$$var)" if ( ! 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} ) { } elsif ( exists $actparms{$var} ) {
$val = $actparms{$var}; $val = $actparms{$var};
} else { } 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; $val = '' unless defined $val;
@ -4787,7 +4787,7 @@ sub get_configuration( $$$ ) {
default_yes_no 'IPSET_WARNINGS' , 'Yes'; default_yes_no 'IPSET_WARNINGS' , 'Yes';
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 'ALLOWUNKNOWNVARIABLES' , 'Yes'; default_yes_no 'IGNOREUNKNOWNVARIABLES' , 'Yes';
$config{IPSET} = '' if supplied $config{IPSET} && $config{IPSET} eq 'ipset'; $config{IPSET} = '' if supplied $config{IPSET} && $config{IPSET} eq 'ipset';

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

@ -114,7 +114,7 @@ ADD_SNAT_ALIASES=No
ADMINISABSENTMINDED=Yes ADMINISABSENTMINDED=Yes
ALLOWUNKNOWNVARIABLES=No IGNOREUNKNOWNVARIABLES=No
AUTOCOMMENT=Yes AUTOCOMMENT=Yes

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

@ -125,7 +125,7 @@ ADD_SNAT_ALIASES=No
ADMINISABSENTMINDED=Yes ADMINISABSENTMINDED=Yes
ALLOWUNKNOWNVARIABLES=No IGNOREUNKNOWNVARIABLES=No
AUTOCOMMENT=Yes AUTOCOMMENT=Yes

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

@ -123,7 +123,7 @@ ADD_SNAT_ALIASES=No
ADMINISABSENTMINDED=Yes ADMINISABSENTMINDED=Yes
ALLOWUNKNOWNVARIABLES=No IGNOREUNKNOWNVARIABLES=No
AUTOCOMMENT=Yes AUTOCOMMENT=Yes

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

@ -126,7 +126,7 @@ ADD_SNAT_ALIASES=No
ADMINISABSENTMINDED=Yes ADMINISABSENTMINDED=Yes
ALLOWUNKNOWNVARIABLES=No IGNOREUNKNOWNVARIABLES=No
AUTOCOMMENT=Yes AUTOCOMMENT=Yes

2
Shorewall/configfiles/shorewall.conf
View File

@ -114,7 +114,7 @@ ADD_SNAT_ALIASES=No
ADMINISABSENTMINDED=Yes ADMINISABSENTMINDED=Yes
ALLOWUNKNOWNVARIABLES=No IGNOREUNKNOWNVARIABLES=No
AUTOCOMMENT=Yes AUTOCOMMENT=Yes

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

@ -282,14 +282,14 @@
<varlistentry> <varlistentry>
<term><emphasis <term><emphasis
role="bold">ALLOWUNKNOWNVARIABLES=</emphasis>[<emphasis role="bold">IGNOREUNKNOWNVARIABLES=</emphasis>[<emphasis
role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>]</term> role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>]</term>
<listitem> <listitem>
<para>Added in Shorewall 4.5.11. Normally, if an unknown shell <para>Added in Shorewall 4.5.11. Normally, if an unknown shell
variable is encountered in a configuration file (except in ?IF and variable is encountered in a configuration file (except in ?IF and
?ELSIF directives), the compiler raises a fatal error. If ?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'.</para> expand to an empty string. Default is 'No'.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>

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

@ -109,7 +109,7 @@ ACCOUNTING_TABLE=filter
ADMINISABSENTMINDED=Yes ADMINISABSENTMINDED=Yes
ALLOWUNKNOWNVARIABLES=No IGNOREUNKNOWNVARIABLES=No
AUTOCOMMENT=Yes AUTOCOMMENT=Yes

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

@ -109,7 +109,7 @@ ACCOUNTING_TABLE=filter
ADMINISABSENTMINDED=Yes ADMINISABSENTMINDED=Yes
ALLOWUNKNOWNVARIABLES=No IGNOREUNKNOWNVARIABLES=No
AUTOCOMMENT=Yes AUTOCOMMENT=Yes

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

@ -109,7 +109,7 @@ ACCOUNTING_TABLE=filter
ADMINISABSENTMINDED=Yes ADMINISABSENTMINDED=Yes
ALLOWUNKNOWNVARIABLES=No IGNOREUNKNOWNVARIABLES=No
AUTOCOMMENT=Yes AUTOCOMMENT=Yes

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

@ -109,7 +109,7 @@ ACCOUNTING_TABLE=filter
ADMINISABSENTMINDED=Yes ADMINISABSENTMINDED=Yes
ALLOWUNKNOWNVARIABLES=No IGNOREUNKNOWNVARIABLES=No
AUTOCOMMENT=Yes AUTOCOMMENT=Yes

2
Shorewall6/configfiles/shorewall6.conf
View File

@ -109,7 +109,7 @@ ACCOUNTING_TABLE=filter
ADMINISABSENTMINDED=Yes ADMINISABSENTMINDED=Yes
ALLOWUNKNOWNVARIABLES=No IGNOREUNKNOWNVARIABLES=No
AUTOCOMMENT=Yes AUTOCOMMENT=Yes

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

@ -219,14 +219,14 @@
<varlistentry> <varlistentry>
<term><emphasis <term><emphasis
role="bold">ALLOWUNKNOWNVARIABLES=</emphasis>[<emphasis role="bold">IGNOREUNKNOWNVARIABLES=</emphasis>[<emphasis
role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>]</term> role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>]</term>
<listitem> <listitem>
<para>Added in Shorewall 4.5.11. Normally, if an unknown shell <para>Added in Shorewall 4.5.11. Normally, if an unknown shell
variable is encountered in a configuration file (except in ?IF and variable is encountered in a configuration file (except in ?IF and
?ELSIF directives), the compiler raises a fatal error. If ?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'.</para> expand to an empty string. Default is 'No'.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>