[1775] cleanup: make sure wildcard and glue don't coexist.

findNode() should have ensured that, so assert() is used for this.

diff --git a/src/lib/datasrc/memory_datasrc.cc b/src/lib/datasrc/memory_datasrc.cc
index b75cb51f0ceaacbb784d34ef2b7a869809a2062a..a627b06ec9f16ab8e02824ebb744143571070c10 100644 (file)
--- a/src/lib/datasrc/memory_datasrc.cc
+++ b/src/lib/datasrc/memory_datasrc.cc
@@ -1425,7 +1425,7 @@ addAdditional(RBNodeRRset* rrset, ZoneData* zone_data,
               vector<RBNodeRRset*>* wild_rrsets)
 {
     RdataIteratorPtr rdata_iterator = rrset->getRdataIterator();
-    bool match_wild = false;
+    bool match_wild = false;    // will be true if wildcard match is found
     for (; !rdata_iterator->isLast(); rdata_iterator->next()) {
         // For each domain name that requires additional section processing
         // in each RDATA, search the tree for the name and remember it if
@@ -1460,6 +1460,9 @@ addAdditional(RBNodeRRset* rrset, ZoneData* zone_data,
         // performance sensitive.
         DomainNode* wildnode = NULL;
         if ((result.flags & ZoneData::FindNodeResult::FIND_WILDCARD) != 0) {
+            // Wildcard and glue shouldn't coexist.  Make it sure here.
+            assert(!node->getFlag(domain_flag::GLUE));
+
             if (zone_data->getAuxWildDomains().insert(name, &wildnode)
                 == DomainTree::SUCCESS) {
                 // If we first insert the node, copy the RRsets.  If the