fixes and new ldns tarball.

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

diff --git a/doc/Changelog b/doc/Changelog
index 77b463bd35fb6b6c5f33ecadac42d46cd226c747..c8c0f66295e156a2548a0a40e6db617245052413 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 15 December 2009: Wouter
        - Answer to qclass=ANY queries, with class IN contents.
          Test that validation also works.
+       - updated ldns snapshot tarball with latest fixes (parsing records).
 
 11 December 2009: Wouter
        - on IPv4 UDP turn off DF flag.

diff --git a/iterator/iterator.c b/iterator/iterator.c
index b2db0367a6481352e5d2050818de25f2914110c1..e549800e62f5334dafa61a6824771abf3e9698b4 100644 (file)
--- a/iterator/iterator.c
+++ b/iterator/iterator.c
@@ -1950,7 +1950,7 @@ processClassResponse(struct module_qstate* qstate, int id,
                /* lower sec_state if this message is lower */
                if(from->rep->rrset_count != 0) {
                        size_t n = from->rep->rrset_count+to->rep->rrset_count;
-                       struct ub_packed_rrset_key** dest;
+                       struct ub_packed_rrset_key** dest, **d;
                        /* copy appropriate rcode */
                        to->rep->flags = from->rep->flags;
                        /* copy rrsets */
@@ -1960,6 +1960,7 @@ processClassResponse(struct module_qstate* qstate, int id,
                                foriq->state = FINISHED_STATE;
                                return;
                        }
+                       d = dest;
                        /* copy AN */
                        memcpy(dest, to->rep->rrsets, to->rep->an_numrrsets
                                * sizeof(dest[0]));
@@ -1983,6 +1984,7 @@ processClassResponse(struct module_qstate* qstate, int id,
                                from->rep->ns_numrrsets,
                                from->rep->ar_numrrsets * sizeof(dest[0]));
                        /* update counts */
+                       to->rep->rrsets = d;
                        to->rep->an_numrrsets += from->rep->an_numrrsets;
                        to->rep->ns_numrrsets += from->rep->ns_numrrsets;
                        to->rep->ar_numrrsets += from->rep->ar_numrrsets;
@@ -2043,7 +2045,7 @@ processCollectClass(struct module_qstate* qstate, int id)
                }
                /* if no roots are configured at all, return */
                if(iq->num_current_queries == 0) {
-                       verbose(VERB_ALGO, "No hints or fwds, giving up "
+                       verbose(VERB_ALGO, "No root hints or fwds, giving up "
                                "on qclass ANY");
                        return error_response(qstate, id, LDNS_RCODE_REFUSED);
                }

diff --git a/ldns-src.tar.gz b/ldns-src.tar.gz
index be2b6ae3938c98eac4d4342d4ff90fd9f5b53f43..f62a8775e0e72b5216c02e07534e19833d6fb105 100644 (file)
Binary files a/ldns-src.tar.gz and b/ldns-src.tar.gz differ

diff --git a/validator/validator.c b/validator/validator.c
index 07a42b28400591bc573e04a1b1ec3c84abf20a8a..54b5f71365bfa9d53e8ebc484fbec7a5980aa6e9 100644 (file)
--- a/validator/validator.c
+++ b/validator/validator.c
@@ -305,7 +305,6 @@ needs_validation(struct module_qstate* qstate, int ret_rc,
                verbose(VERB_ALGO, "cannot validate RRSIG, no sigs on sigs.");
                return 0;
        }
-
        return 1;
 }