From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Tue, 5 Aug 2008 10:54:27 +0000 (+0000)
Subject: fixup DS test for apex validation of NODATA.
X-Git-Tag: release-1.0.2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5ac360be4133bc95fde4649d27c287faae44eaf;p=thirdparty%2Funbound.git

fixup DS test for apex validation of NODATA.


git-svn-id: file:///svn/unbound/branches/support-1.0@1177 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/doc/Changelog b/doc/Changelog
index eaa2ead21..d425e9ab4 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+5 August 2008: Wouter
+	- fixup DS test so apex nodata works again (from trunk).
+
 4 August 2008: Wouter
 	- Bug #201 fixup from trunk; fixes segfault on exit cleanup
 	- iana port nrs updated.
diff --git a/validator/val_nsec.c b/validator/val_nsec.c
index 6150fbd75..5499f4b2a 100644
--- a/validator/val_nsec.c
+++ b/validator/val_nsec.c
@@ -350,7 +350,8 @@ int nsec_proves_nodata(struct ub_packed_rrset_key* nsec,
 		nsec_has_type(nsec, LDNS_RR_TYPE_NS) &&
 		!nsec_has_type(nsec, LDNS_RR_TYPE_SOA)) {
 		return 0;
-	} else if(nsec_has_type(nsec, LDNS_RR_TYPE_SOA)) { /* for DS type */
+	} else if(qinfo->qtype == LDNS_RR_TYPE_DS &&
+		nsec_has_type(nsec, LDNS_RR_TYPE_SOA)) {
 		return 0;
 	}