From: Wouter Wijngaards Date: Tue, 15 Dec 2009 09:31:39 +0000 (+0000) Subject: fixes and new ldns tarball. X-Git-Tag: release-1.4.1~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7094eab574fbd09c6b816f97831b9a43ee038de5;p=thirdparty%2Funbound.git 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 77b463bd3..c8c0f6629 100644 --- 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 b2db0367a..e549800e6 100644 --- 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 be2b6ae39..f62a8775e 100644 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 07a42b284..54b5f7136 100644 --- 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; }