BIND 10 trac2108_3, updated. 330f8ec209cc50bd19da3f2548370f24e6a3641f [2108] Add more checks to data returned by findZone2()

[BIND 10 source code commits]

The branch, trac2108_3 has been updated
       via  330f8ec209cc50bd19da3f2548370f24e6a3641f (commit)
       via  2dce3cb62a8f3c39bf9b4f364bdf6ae42a0e3433 (commit)
      from  79e4f78c803a819ebe940c2b0ae6916b6e7b5933 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 330f8ec209cc50bd19da3f2548370f24e6a3641f
Author: Mukund Sivaraman <muks at isc.org>
Date:   Fri Sep 7 07:50:29 2012 +0530

    [2108] Add more checks to data returned by findZone2()

commit 2dce3cb62a8f3c39bf9b4f364bdf6ae42a0e3433
Author: Mukund Sivaraman <muks at isc.org>
Date:   Fri Sep 7 07:26:28 2012 +0530

    [2108] Add comment

-----------------------------------------------------------------------

Summary of changes:
 src/lib/datasrc/memory/memory_client.cc            |    3 +++
 .../datasrc/memory/tests/memory_client_unittest.cc |   28 ++++++++++++++++++++
 .../memory/tests/testdata/example.org-rrsigs.zone  |    1 +
 3 files changed, 32 insertions(+)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/memory/memory_client.cc b/src/lib/datasrc/memory/memory_client.cc
index a3453fe..8f081dc 100644
--- a/src/lib/datasrc/memory/memory_client.cc
+++ b/src/lib/datasrc/memory/memory_client.cc
@@ -727,6 +727,9 @@ InMemoryClient::add(const isc::dns::Name& zone_name,
     }
 
     result::Result ret(impl_->add(rrset, zone_name, *result.zone_data));
+    // Add any associated RRSIG too. This has to be done here, as both
+    // the RRset and its RRSIG have to be passed when constructing an
+    // RdataSet.
     if ((ret == result::SUCCESS) && rrset->getRRsig()) {
         impl_->add(rrset->getRRsig(), zone_name, *result.zone_data);
     }
diff --git a/src/lib/datasrc/memory/tests/memory_client_unittest.cc b/src/lib/datasrc/memory/tests/memory_client_unittest.cc
index bd19eda..d27b3a9 100644
--- a/src/lib/datasrc/memory/tests/memory_client_unittest.cc
+++ b/src/lib/datasrc/memory/tests/memory_client_unittest.cc
@@ -300,6 +300,34 @@ TEST_F(MemoryClientTest, findZone2) {
     EXPECT_EQ(result::SUCCESS, result2.code);
     EXPECT_NE(static_cast<ZoneData*>(NULL),
               result2.zone_data);
+
+    /* Check SOA */
+    const ZoneNode* node = result2.zone_data->getOriginNode();
+    EXPECT_NE(static_cast<const ZoneNode*>(NULL), node);
+
+    const RdataSet* set = node->getData();
+    EXPECT_NE(static_cast<const RdataSet*>(NULL), set);
+    EXPECT_EQ(RRType::SOA(), set->type);
+
+    set = set->getNext();
+    EXPECT_EQ(static_cast<const RdataSet*>(NULL), set);
+
+    /* Check ns1.example.org */
+    const ZoneTree& tree = result2.zone_data->getZoneTree();
+    ZoneTree::Result result3(tree.find(Name("ns1.example.org"), &node));
+    EXPECT_EQ(ZoneTree::EXACTMATCH, result3);
+    EXPECT_NE(static_cast<const ZoneNode*>(NULL), node);
+
+    set = node->getData();
+    EXPECT_NE(static_cast<const RdataSet*>(NULL), set);
+    EXPECT_EQ(RRType::AAAA(), set->type);
+
+    set = set->getNext();
+    EXPECT_NE(static_cast<const RdataSet*>(NULL), set);
+    EXPECT_EQ(RRType::A(), set->type);
+
+    set = set->getNext();
+    EXPECT_EQ(static_cast<const RdataSet*>(NULL), set);
 }
 
 TEST_F(MemoryClientTest, getUpdaterThrowsNotImplemented) {
diff --git a/src/lib/datasrc/memory/tests/testdata/example.org-rrsigs.zone b/src/lib/datasrc/memory/tests/testdata/example.org-rrsigs.zone
index 594b453..1c780b1 100644
--- a/src/lib/datasrc/memory/tests/testdata/example.org-rrsigs.zone
+++ b/src/lib/datasrc/memory/tests/testdata/example.org-rrsigs.zone
@@ -5,3 +5,4 @@ example.org. 3600 IN SOA	ns1.example.org. bugs.x.w.example.org. 74 3600 300 3600
 ns1.example.org.		      3600 IN A	 	192.168.0.1
 ns1.example.org.		      3600 IN RRSIG	A 7 3 3600 20150420235959 20051021000000 40430 example.org. FAKEFAKE
 ns1.example.org.		      3600 IN RRSIG	A 7 2 3600 20150420235959 20051021000000 40430 example.org. FAKEFAKE
+ns1.example.org.		      3600 IN AAAA 	::1