NLnetLabs
diff --git a/‎doc/example.conf.in
Copy file name to clipboard
+1-6Lines changed: 1 addition & 6 deletions b/‎doc/example.conf.in
Copy file name to clipboard
+1-6Lines changed: 1 addition & 6 deletions
diff --git a/‎doc/unbound.conf.5.in
Copy file name to clipboard
+1-16Lines changed: 1 addition & 16 deletions b/‎doc/unbound.conf.5.in
Copy file name to clipboard
+1-16Lines changed: 1 addition & 16 deletions
diff --git a/‎iterator/iterator.c
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎iterator/iterator.c
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎pythonmod/doc/modules/config.rst
Copy file name to clipboard
-8Lines changed: 0 additions & 8 deletions b/‎pythonmod/doc/modules/config.rst
Copy file name to clipboard
-8Lines changed: 0 additions & 8 deletions
diff --git a/‎pythonmod/interface.i
Copy file name to clipboard
-2Lines changed: 0 additions & 2 deletions b/‎pythonmod/interface.i
Copy file name to clipboard
-2Lines changed: 0 additions & 2 deletions
diff --git a/‎services/cache/dns.c
Copy file name to clipboard
+2-3Lines changed: 2 additions & 3 deletions b/‎services/cache/dns.c
Copy file name to clipboard
+2-3Lines changed: 2 additions & 3 deletions
diff --git a/‎smallapp/unbound-checkconf.c
Copy file name to clipboard
-2Lines changed: 0 additions & 2 deletions b/‎smallapp/unbound-checkconf.c
Copy file name to clipboard
-2Lines changed: 0 additions & 2 deletions
diff --git a/‎testdata/dlv_anchor.rpl
Copy file name to clipboard
-279Lines changed: 0 additions & 279 deletions b/‎testdata/dlv_anchor.rpl
Copy file name to clipboard
-279Lines changed: 0 additions & 279 deletions
@@ -509,11 +509,6 @@ server:
 	# Root key trust anchor sentinel (draft-ietf-dnsop-kskroll-sentinel)
 	# root-key-sentinel: yes
 
-	# File with DLV trusted keys. Same format as trust-anchor-file.
-	# There can be only one DLV configured, it is trusted from root down.
-	# DLV is going to be decommissioned.  Please do not use it any more.
-	# dlv-anchor-file: "dlv.isc.org.key"
-
 	# File with trusted keys for validation. Specify more than one file
 	# with several entries, one file per entry.
 	# Zone file format, with DS and DNSKEY entries.
@@ -627,7 +622,7 @@ server:
 	# more slabs reduce lock contention, but fragment memory usage.
 	# key-cache-slabs: 4
 
-	# the amount of memory to use for the negative cache (used for DLV).
+	# the amount of memory to use for the negative cache.
 	# plain value in bytes or you can append k, m or G. default is "1Mb".
 	# neg-cache-size: 1m
 
 
@@ -1010,26 +1010,11 @@ Send RFC8145 key tag query after trust anchor priming. Default is yes.
 .B root\-key\-sentinel: \fI<yes or no>
 Root key trust anchor sentinel. Default is yes.
 .TP
-.B dlv\-anchor\-file: \fI<filename>
-This option was used during early days DNSSEC deployment when no parent-side
-DS record registrations were easily available.  Nowadays, it is best to have
-DS records registered with the parent zone (many top level zones are signed).
-File with trusted keys for DLV (DNSSEC Lookaside Validation). Both DS and
-DNSKEY entries can be used in the file, in the same format as for
-\fItrust\-anchor\-file:\fR statements. Only one DLV can be configured, more
-would be slow. The DLV configured is used as a root trusted DLV, this
-means that it is a lookaside for the root. Default is "", or no dlv anchor
-file. DLV is going to be decommissioned.  Please do not use it any more.
-.TP
-.B dlv\-anchor: \fI<"Resource Record">
-Much like trust\-anchor, this is a DLV anchor with the DS or DNSKEY inline.
-DLV is going to be decommissioned.  Please do not use it any more.
-.TP
 .B domain\-insecure: \fI<domain name>
 Sets domain name to be insecure, DNSSEC chain of trust is ignored towards
 the domain name.  So a trust anchor above the domain name can not make the
 domain secure with a DS record, such a DS record is then ignored.
-Also keys from DLV are ignored for the domain.  Can be given multiple times
+Can be given multiple times
 to specify multiple domains that are treated as if unsigned.  If you set
 trust anchors for the domain they override this setting (and the domain
 is secured).
 
@@ -3191,7 +3191,7 @@ processPrimeResponse(struct module_qstate* qstate, int id)
 	/* validate the root or stub after priming (if enabled).
 	 * This is the same query as the prime query, but with validation.
 	 * Now that we are primed, the additional queries that validation
-	 * may need can be resolved, such as DLV. */
+	 * may need can be resolved. */
 	if(qstate->env->cfg->harden_referral_path) {
 		struct module_qstate* subq = NULL;
 		log_nametypeclass(VERB_ALGO, "schedule prime validation", 
 
@@ -256,14 +256,6 @@ config_file
 
       Files with trusted DNSKEYs in named.conf format, list.
 
-   .. attribute:: dlv_anchor_file
-   
-      DLV anchor file.
-   
-   .. attribute:: dlv_anchor_list
-   
-      DLV anchor inline.
-
    .. attribute:: max_ttl
 
       The number of seconds maximal TTL used for RRsets and messages.
 
@@ -992,8 +992,6 @@ struct config_file {
    struct config_strlist* trust_anchor_file_list;
    struct config_strlist* trust_anchor_list;
    struct config_strlist* trusted_keys_file_list;
-   char* dlv_anchor_file;
-   struct config_strlist* dlv_anchor_list;
    int max_ttl;
    int32_t val_date_override;
    int bogus_ttl;
 
@@ -890,9 +890,8 @@ dns_cache_lookup(struct module_env* env,
 		lock_rw_unlock(&rrset->entry.lock);
 	}
 
-	/* construct DS, DNSKEY, DLV messages from rrset cache. */
-	if((qtype == LDNS_RR_TYPE_DS || qtype == LDNS_RR_TYPE_DNSKEY ||
-		qtype == LDNS_RR_TYPE_DLV) &&
+	/* construct DS, DNSKEY messages from rrset cache. */
+	if((qtype == LDNS_RR_TYPE_DS || qtype == LDNS_RR_TYPE_DNSKEY) &&
 		(rrset=rrset_cache_lookup(env->rrset_cache, qname, qnamelen, 
 		qtype, qclass, 0, now, 0))) {
 		/* if the rrset is from the additional section, and the
 
@@ -624,8 +624,6 @@ morechecks(struct config_file* cfg)
 		cfg->auto_trust_anchor_file_list, cfg->chrootdir, cfg);
 	check_chroot_filelist_wild("trusted-keys-file",
 		cfg->trusted_keys_file_list, cfg->chrootdir, cfg);
-	check_chroot_string("dlv-anchor-file", &cfg->dlv_anchor_file,
-		cfg->chrootdir, cfg);
 #ifdef USE_IPSECMOD
 	if(cfg->ipsecmod_enabled && strstr(cfg->module_conf, "ipsecmod")) {
 		/* only check hook if enabled */