extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-02-23 13:11:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow indefinite alternative to 'yes' and 'no'

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2014-09-27 15:06:18 -07:00
parent a09484356c
commit 38a18ac9ac
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3505,6 +3505,7 @@ sub default ( $$ ) {
# #
sub default_yes_no ( $$;$ ) { sub default_yes_no ( $$;$ ) {
my ( $var, $val, $other ) = @_; my ( $var, $val, $other ) = @_;
my $result = 1;
my $curval = $config{$var}; my $curval = $config{$var};
@ -3513,11 +3514,19 @@ sub default_yes_no ( $$;$ ) {
if ( $curval eq 'no' ) { if ( $curval eq 'no' ) {
$config{$var} = ''; $config{$var} = '';
} elsif ( defined( $other ) && $curval eq $other ) { } elsif ( defined( $other ) ) {
# if ( $other eq '*' ) {
# Downshift value for later comparison if ( $curval eq 'yes' ) {
# $config{$var} = 'Yes';
$config{$var} = $curval; } else {
$result = 0;
}
} elsif ( $curval eq $other ) {
#
# Downshift value for later comparison
#
$config{$var} = $curval;
}
} else { } else {
fatal_error "Invalid value for $var ($curval)" unless $curval eq 'yes'; fatal_error "Invalid value for $var ($curval)" unless $curval eq 'yes';
# #
@ -3528,6 +3537,8 @@ sub default_yes_no ( $$;$ ) {
} else { } else {
$config{$var} = $val; $config{$var} = $val;
} }
$result;
} }
sub default_yes_no_ipv4 ( $$ ) { sub default_yes_no_ipv4 ( $$ ) {