extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-25 04:01:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add ALLOWUNKNOWNVARIABLES option.

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-12-03 14:43:35 -08:00
parent 72aabef0fa
commit fb0035bdf3
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -735,6 +735,7 @@ sub initialize( $;$$) {
HELPERS => undef, HELPERS => undef,
AUTOHELPERS => undef, AUTOHELPERS => undef,
RESTORE_ROUTEMARKS => undef, RESTORE_ROUTEMARKS => undef,
ALLOWUNKNOWNVARIABLES => undef,
# #
# Packet Disposition # Packet Disposition
# #
@ -2546,6 +2547,9 @@ sub expand_variables( \$ ) {
my $val; my $val;
if ( $var =~ /^\d+$/ ) { if ( $var =~ /^\d+$/ ) {
fatal_error "Undefined parameter (\$$var)" unless ( $config{ALLOWUNKNOWNVARIABLES} ||
( defined $actparms{$var} &&
( 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/ );
$val = $var ? $actparms{$var} : $actparms{0}->{name}; $val = $var ? $actparms{$var} : $actparms{0}->{name};
} elsif ( exists $params{$var} ) { } elsif ( exists $params{$var} ) {
@ -4631,6 +4635,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';
$config{IPSET} = '' if supplied $config{IPSET} && $config{IPSET} eq 'ipset'; $config{IPSET} = '' if supplied $config{IPSET} && $config{IPSET} eq 'ipset';