From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Tue, 25 Aug 2009 15:15:10 +0000 (+0000)
Subject: Fixup DS query handling.
X-Git-Tag: release-1.4.0rc1~118
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=568253e4ff804120a3aaa73f520cd094a44358f5;p=thirdparty%2Funbound.git

Fixup DS query handling.


git-svn-id: file:///svn/unbound/trunk@1785 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/doc/Changelog b/doc/Changelog
index c40313548..b03b5d12d 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -6,6 +6,8 @@
 	- ctime_r compat definition.
 	- detect yylex_destroy() in configure.
 	- detect SSL_get_compression_methods declaration in configure.
+	- fixup DS lookup at anchor point with unsigned parent.
+	- fixup DLV lookup for DS queries to unsigned domains.
 
 24 August 2009: Wouter
 	- cleaner memory allocation on exit. autotrust test routines.
diff --git a/validator/validator.c b/validator/validator.c
index 826ead347..42ba0a88f 100644
--- a/validator/validator.c
+++ b/validator/validator.c
@@ -1215,8 +1215,6 @@ processInit(struct module_qstate* qstate, struct val_qstate* vq,
 	val_find_signer(subtype, &vq->qchase, vq->orig_msg->rep, 
 		vq->rrset_skip, &vq->signer_name, &vq->signer_len);
 	if(vq->signer_name == NULL) {
-		lookup_name = vq->qchase.qname;
-		lookup_len = vq->qchase.qname_len;
 		log_nametypeclass(VERB_ALGO, "no signer, using", lookup_name,
 			0, 0);
 	} else {
@@ -1644,6 +1642,8 @@ val_dlv_init(struct module_qstate* qstate, struct val_qstate* vq,
 		/* use qchase */
 		nm = vq->qchase.qname;
 		nm_len = vq->qchase.qname_len;
+		if(vq->qchase.qtype == LDNS_RR_TYPE_DS)
+			dname_remove_label(&nm, &nm_len);
 	}
 	log_nametypeclass(VERB_ALGO, "DLV init look", nm, LDNS_RR_TYPE_DS,
 		vq->qchase.qclass);