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 c403135486fbedb027cd0b5812292499d501a93d..b03b5d12df66e85e79ff45b69342078be8be781e 100644 (file)
--- 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 826ead3472d363ac9f44b386d0b57d53ae55228b..42ba0a88f3d9a77d4c18de65d7ce5007b7fb51e0 100644 (file)
--- 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);