- Fix validation of nodata for DS query in NSEC zones, reported by

  Ondrej Mikle.

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

diff --git a/doc/Changelog b/doc/Changelog
index 2815ab0107fdddf91cadf96aca9226cec9842a69..2d2e5bc28f15dfa6fdff92189cfeeed88036eaa9 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+2 May 2012: Wouter
+       - Fix validation of nodata for DS query in NSEC zones, reported by
+         Ondrej Mikle.
+
 13 April 2012: Wouter
        - ECDSA support (RFC 6605) by default. Use --disable-ecdsa for older
          openssl.

diff --git a/validator/val_nsec.c b/validator/val_nsec.c
index 640687019a8c7b725411566100157ff703033789..8bda8dabc9376816935581f3b46aebf8fb15cbe3 100644 (file)
--- a/validator/val_nsec.c
+++ b/validator/val_nsec.c
@@ -368,8 +368,8 @@ int nsec_proves_nodata(struct ub_packed_rrset_key* nsec,
                !nsec_has_type(nsec, LDNS_RR_TYPE_SOA)) {
                return 0;
        } else if(qinfo->qtype == LDNS_RR_TYPE_DS &&
-               nsec_has_type(nsec, LDNS_RR_TYPE_SOA &&
-               !dname_is_root(qinfo->qname))) {
+               nsec_has_type(nsec, LDNS_RR_TYPE_SOA) &&
+               !dname_is_root(qinfo->qname)) {
                return 0;
        }