diff --git a/bind8/conf_trusted.cgi b/bind8/conf_trusted.cgi index 8232a56ab..b61961d95 100755 --- a/bind8/conf_trusted.cgi +++ b/bind8/conf_trusted.cgi @@ -17,7 +17,6 @@ $access{'defaults'} || &error($text{'trusted_ecannot'}); my $conf = &get_config(); my $options = &find("options", $conf); my $mems = $options->{'members'}; -my @dlv = &find("dnssec-lookaside", $mems); my $tkeys = &find("trusted-keys", $conf); $tkeys ||= { 'members' => [ ] }; @@ -38,33 +37,6 @@ if (&supports_dnssec_client() == 2) { $text{'default'}, undef); } -# Trusted DLVs (obsolete) -if (@dlv) { - my @dtable = ( ); - my $i = 0; - foreach my $d (@dlv, { 'values' => [ '.' ] }) { - my $dlv = $d->{'values'}->[0]; - $dlv = "" if ($dlv eq "."); - push(@dtable, [ - &ui_opt_textbox("anchor_$i", $d->{'values'}->[2], - 30, $text{'trusted_none'}), - &ui_opt_textbox("dlv_$i", $dlv, 20, - $text{'trusted_root'}) ]); - $i++; - } - print &ui_table_row($text{'trusted_dlvs'}, - &ui_radio("dlv_auto", - @dlv == 0 ? 2 : - @dlv == 1 && $dlv[0]->{'values'}->[0] eq 'auto' ? 1 : 0, - [ [ 1, $text{'trusted_dlvs1'} ], - [ 2, $text{'trusted_dlvs2'} ], - [ 0, $text{'trusted_dlvs0'} ] ])."
\n". - &ui_columns_table([ $text{'trusted_anchor'}, - $text{'trusted_dlv'} ], - undef, - \@dtable), 3); - } - # Trusted keys if (@{$tkeys->{'members'}}) { my @ktable = ( ); diff --git a/bind8/save_trusted.cgi b/bind8/save_trusted.cgi index 50c9b1416..f080e65c5 100755 --- a/bind8/save_trusted.cgi +++ b/bind8/save_trusted.cgi @@ -24,46 +24,6 @@ if (&supports_dnssec_client() == 2) { &save_choice("dnssec-validation", $options, 1); } -# Save DLV zones -if (defined($in{'dlv_auto'})) { - my @dlvs = ( ); - if ($in{'dlv_auto'} == 1) { - # Automatic mode - push(@dlvs, { 'name' => 'dnssec-lookaside', - 'values' => [ 'auto' ] }); - } - elsif ($in{'dlv_auto'} == 0) { - # Listed zones - my $dlv; - for(my $i=0; defined($in{"anchor_$i"}); $i++) { - if (!$in{"anchor_${i}_def"}) { - $in{"anchor_$i"} =~ /^[a-z0-9\.\-\_]+$/ || - &error(&text('trusted_eanchor', $i+1)); - $in{"anchor_$i"} .= "." - if ($in{"anchor_$i"} !~ /\.$/); - if ($in{"dlv_${i}_def"}) { - $dlv = "."; - } - else { - $in{"dlv_$i"} =~ /^[a-z0-9\.\-\_]+$/ || - &error(&text('trusted_edlv', $i+1)); - $dlv = $in{"dlv_$i"}; - $dlv .= "." if ($dlv !~ /\.$/); - } - push(@dlvs, { 'name' => 'dnssec-lookaside', - 'values' => [ - $dlv, "trust-anchor", - $in{"anchor_$i"} ] }); - } - } - } - elsif ($in{'dlv_auto'} == 2) { - # None - @dlvs = ( ); - } - &save_directive($options, "dnssec-lookaside", \@dlvs, 1); - } - # Save trusted keys if (defined($in{'zone_0'})) { my @keys = ( );