Commit 1d86b202 authored by Evan Hunt's avatar Evan Hunt
Browse files

remove DLV-related library code

parent 6a51b661
......@@ -24,7 +24,7 @@ ISC_LANG_BEGINDECLS
isc_result_t
dns_dsdigest_fromtext(dns_dsdigest_t *dsdigestp, isc_textregion_t *source);
/*%<
* Convert the text 'source' refers to into a DS/DLV digest type value.
* Convert the text 'source' refers to into a DS digest type value.
* The text may contain either a mnemonic digest name or a decimal
* digest number.
*
......@@ -42,7 +42,7 @@ dns_dsdigest_fromtext(dns_dsdigest_t *dsdigestp, isc_textregion_t *source);
isc_result_t
dns_dsdigest_totext(dns_dsdigest_t dsdigest, isc_buffer_t *target);
/*%<
* Put a textual representation of the DS/DLV digest type 'dsdigest'
* Put a textual representation of the DS digest type 'dsdigest'
* into 'target'.
*
* Requires:
......
......@@ -483,7 +483,7 @@ dns_resolver_reset_algorithms(dns_resolver_t *resolver);
void
dns_resolver_reset_ds_digests(dns_resolver_t *resolver);
/*%<
* Clear the disabled DS/DLV digest types.
* Clear the disabled DS digest types.
*/
isc_result_t
......@@ -503,7 +503,7 @@ isc_result_t
dns_resolver_disable_ds_digest(dns_resolver_t *resolver,
const dns_name_t *name, unsigned int digest_type);
/*%<
* Mark the given DS/DLV digest type as disabled and below 'name'.
* Mark the given DS digest type as disabled and below 'name'.
* Valid types are less than 256.
*
* Returns:
......
......@@ -150,11 +150,7 @@ struct dns_validator {
dns_fixedname_t nearest;
dns_fixedname_t closest;
ISC_LINK(dns_validator_t) link;
dns_rdataset_t dlv;
dns_fixedname_t dlvsep;
bool havedlvsep;
bool mustbesecure;
unsigned int dlvlabels;
bool mustbesecure;
unsigned int depth;
unsigned int authcount;
unsigned int authfail;
......@@ -164,7 +160,7 @@ struct dns_validator {
/*%
* dns_validator_create() options.
*/
#define DNS_VALIDATOR_DLV 0x0001U
/* obsolete: #define DNS_VALIDATOR_DLV 0x0001U */
#define DNS_VALIDATOR_DEFER 0x0002U
#define DNS_VALIDATOR_NOCDFLAG 0x0004U
#define DNS_VALIDATOR_NONTA 0x0008U /*% Ignore NTA table */
......@@ -208,11 +204,6 @@ dns_validator_create(dns_view_t *view, dns_name_t *name, dns_rdatatype_t type,
* Its 'result' field will be ISC_R_SUCCESS iff the
* response was successfully proven to be either secure or
* part of a known insecure domain.
*
* options:
* If DNS_VALIDATOR_DLV is set the caller knows there is not a
* trusted key and the validator should immediately attempt to validate
* the answer by looking for an appropriate DLV RRset.
*/
void
......
......@@ -168,8 +168,6 @@ struct dns_view {
bool rootdelonly;
dns_namelist_t * rootexclude;
bool checknames;
dns_name_t * dlv;
dns_fixedname_t dlv_fixed;
uint16_t maxudp;
dns_ttl_t staleanswerttl;
dns_stale_answer_t staleanswersok; /* rndc setting */
......
......@@ -2446,10 +2446,6 @@ resquery_send(resquery_t *query) {
if (result != ISC_R_SUCCESS) {
secure_domain = false;
}
if (res->view->dlv != NULL) {
secure_domain = true;
}
if (secure_domain ||
(ISFORWARDER(query->addrinfo) && ntacovered))
{
......@@ -3714,7 +3710,6 @@ fctx_getaddresses(fetchctx_t *fctx, bool badcache) {
result = isc_time_nowplusinterval(&expire, &i);
if (badcache &&
(fctx->type == dns_rdatatype_dnskey ||
fctx->type == dns_rdatatype_dlv ||
fctx->type == dns_rdatatype_ds) &&
result == ISC_R_SUCCESS)
dns_resolver_addbadcache(res, &fctx->name,
......@@ -5488,7 +5483,6 @@ validated(isc_task_t *task, isc_event_t *event) {
tresult = isc_time_nowplusinterval(&expire, &i);
if (negative &&
(fctx->type == dns_rdatatype_dnskey ||
fctx->type == dns_rdatatype_dlv ||
fctx->type == dns_rdatatype_ds) &&
tresult == ISC_R_SUCCESS)
dns_resolver_addbadcache(res, &fctx->name,
......@@ -5929,11 +5923,6 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adbaddrinfo_t *addrinfo,
if (result != ISC_R_SUCCESS) {
return (result);
}
if (!secure_domain && res->view->dlv != NULL) {
valoptions |= DNS_VALIDATOR_DLV;
secure_domain = true;
}
}
if ((fctx->options & DNS_FETCHOPT_NOCDFLAG) != 0) {
......@@ -6523,11 +6512,6 @@ ncache_message(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo,
now, checknta, NULL, &secure_domain);
if (result != ISC_R_SUCCESS)
return (result);
if (!secure_domain && res->view->dlv != NULL) {
valoptions |= DNS_VALIDATOR_DLV;
secure_domain = true;
}
}
if ((fctx->options & DNS_FETCHOPT_NOCDFLAG) != 0)
......
......@@ -205,7 +205,6 @@ dns_view_create(isc_mem_t *mctx, dns_rdataclass_t rdclass,
view->dstport = 53;
view->preferred_glue = 0;
view->flush = false;
view->dlv = NULL;
view->maxudp = 0;
view->staleanswerttl = 1;
view->staleanswersok = dns_stale_answer_conf;
......@@ -216,7 +215,6 @@ dns_view_create(isc_mem_t *mctx, dns_rdataclass_t rdclass,
view->maxbits = 0;
view->rpzs = NULL;
view->catzs = NULL;
dns_fixedname_init(&view->dlv_fixed);
view->managed_keys = NULL;
view->redirect = NULL;
view->redirectzone = NULL;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment