Don't show dnssev-validation option if not supported

This commit is contained in:
Jamie Cameron
2008-12-05 17:29:02 +00:00
parent de98057d9f
commit cb447f2651
5 changed files with 15 additions and 7 deletions

View File

@ -2596,10 +2596,12 @@ return &has_command($config{'signzone'}) &&
}
# supports_dnssec_client()
# Returns 1 if this BIND can send and verify DNSSEC requests
# Returns 2 if this BIND can send and verify DNSSEC requests, 1 if the
# dnssec-validation directive is not supported, 0 otherwise
sub supports_dnssec_client
{
return $bind_version >= 9.4;
return $bind_version >= 9.4 ? 2 :
$bind_version >= 9 ? 1 : 0;
}
# dnssec_size_range(algorithm)

View File

@ -1,10 +1,10 @@
#!/usr/local/bin/perl
# Show a form for setting up DNSSEC verification and trusted keys
# XXX quick button to setup defaults?
require './bind8-lib.pl';
&ReadParse();
$access{'defaults'} || &error($text{'trusted_ecannot'});
&supports_dnssec_client() || &error($text{'trusted_esupport'});
&ui_print_header(undef, $text{'trusted_title'}, "",
undef, undef, undef, undef, &restart_links());
$conf = &get_config();
@ -33,9 +33,12 @@ print &ui_table_start($text{'trusted_header'}, undef, 4);
print &choice_input($text{'trusted_dnssec'}, 'dnssec-enable', $mems,
$text{'yes'}, 'yes', $text{'no'}, 'no',
$text{'default'}, undef);
print &choice_input($text{'trusted_validation'}, 'dnssec-validation', $mems,
if (&supports_dnssec_client() == 2) {
print &choice_input($text{'trusted_validation'},
'dnssec-validation', $mems,
$text{'yes'}, 'yes', $text{'no'}, 'no',
$text{'default'}, undef);
}
# Trusted DLVs
@dtable = ( );

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 0 B

View File

@ -1045,6 +1045,7 @@ resign_err=Failed to re-sign zone
trusted_title=DNSSEC Verification
trusted_ecannot=You are not allowed to configure DNSSEC verification
trusted_esupport=Your version of BIND does not support DNSSEC verification
trusted_header=Options for DNSSEC verification of other zones
trusted_dnssec=DNSSEC queries enabled?
trusted_validation=DNSSEC response validation enabled?

View File

@ -13,7 +13,9 @@ $options = &find("options", $conf);
# DNSSEC enabled
&save_choice("dnssec-enable", $options, 1);
if (&supports_dnssec_client() == 2) {
&save_choice("dnssec-validation", $options, 1);
}
# Save DLV zones
@dlvs = ( );