From: Willem Toorop <willem@NLnetLabs.nl>
Date: Thu, 13 Sep 2012 10:53:15 +0000 (+0000)
Subject: bugfix #471. Match code with documentation with ldns_resolver_push_dnssec_anchor.
X-Git-Tag: release-1.6.14rc1~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=881b8b682f4a8e4aa1272c52ef1a4b12496fdfb3;p=thirdparty%2Fldns.git

bugfix #471. Match code with documentation with ldns_resolver_push_dnssec_anchor.
Thanks Ondřej.
---

diff --git a/Changelog b/Changelog
index ff454158..778cb470 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 1.6.14
+	* bugfix #471: Let ldns_resolver_push_dnssec_anchor accept DS RR's too.
 	* Various bugfixes from code reviews from CZ.NIC and Paul Wouters
 	* ldns-notify TSIG option argument checking
 	* Let ldns_resolver_nameservers_randomize keep nameservers and rtt's
diff --git a/resolver.c b/resolver.c
index fd08d8e9..08681453 100644
--- a/resolver.c
+++ b/resolver.c
@@ -392,7 +392,9 @@ ldns_resolver_push_dnssec_anchor(ldns_resolver *r, ldns_rr *rr)
 {
   ldns_rr_list * trust_anchors;
 
-  if ((!rr) || (ldns_rr_get_type(rr) != LDNS_RR_TYPE_DNSKEY)) {
+  if ((!rr) || (ldns_rr_get_type(rr) != LDNS_RR_TYPE_DNSKEY &&
+                ldns_rr_get_type(rr) != LDNS_RR_TYPE_DS)) {
+
     return LDNS_STATUS_ERR;
   }