From: JINMEI Tatuya <jinmei@isc.org>
Date: Tue, 13 Nov 2012 02:28:39 +0000 (-0800)
Subject: [2420] an unrelated fix: set the "signed" flag only with an apex NSEC
X-Git-Tag: bind10-1.0.0-beta-release~52^2~1^2~2^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9397bd5dbf2b82a62f2006775ea92bb3b05b755d;p=thirdparty%2Fkea.git

[2420] an unrelated fix: set the "signed" flag only with an apex NSEC

otherwise it could reslt in assert() failure in getClosestNSEC() for a
half-broken zone that desn't have any NSEC at the zone apex.  also made
a small optimization to detect if a name is the zone origin: just compare
the corresponding node with the origin node.
---

diff --git a/src/lib/datasrc/memory/zone_data_updater.cc b/src/lib/datasrc/memory/zone_data_updater.cc
index 7b8393d8e9..041b79b31b 100644
--- a/src/lib/datasrc/memory/zone_data_updater.cc
+++ b/src/lib/datasrc/memory/zone_data_updater.cc
@@ -309,11 +309,12 @@ ZoneDataUpdater::addRdataSet(const Name& name, const RRType& rrtype,
         node->setData(rdataset_new);
 
         // Ok, we just put it in.
+        const bool is_origin = (node == zone_data_.getOriginNode());
 
         // If this RRset creates a zone cut at this node, mark the node
         // indicating the need for callback in find().  Note that we do this
         // only when non RRSIG RRset of that type is added.
-        if (rrset && rrtype == RRType::NS() && name != zone_name_) {
+        if (rrset && rrtype == RRType::NS() && !is_origin) {
             node->setFlag(ZoneNode::FLAG_CALLBACK);
             // If it is DNAME, we have a callback as well here
         } else if (rrset && rrtype == RRType::DNAME()) {
@@ -323,9 +324,9 @@ ZoneDataUpdater::addRdataSet(const Name& name, const RRType& rrtype,
         // If we've added NSEC3PARAM at zone origin, set up NSEC3
         // specific data or check consistency with already set up
         // parameters.
-        if (rrset && rrtype == RRType::NSEC3PARAM() && name == zone_name_) {
+        if (rrset && rrtype == RRType::NSEC3PARAM() && is_origin) {
             setupNSEC3<generic::NSEC3PARAM>(rrset);
-        } else if (rrset && rrtype == RRType::NSEC()) {
+        } else if (rrset && rrtype == RRType::NSEC() && is_origin) {
             // If it is NSEC signed zone, we mark the zone as signed
             // (conceptually "signed" is a broader notion but our
             // current zone finder implementation regards "signed" as