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 eaa2ead215f8dd818a76b6ed32d1de1d630ec755..d425e9ab48b152fbca64f8681c505b5e0fd88555 100644 (file)
--- 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 6150fbd75cda8018427f80147f3830cf34153cca..5499f4b2a4bec80fdb7b3b5d96c0a6ddba0409a4 100644 (file)
--- 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;
        }