BIND 10 trac2108_3, updated. 22add5b6c6441fab79e0fd43b44d0caade159f69 [2108] Multiple DNAME RRs should throw

[BIND 10 source code commits]

The branch, trac2108_3 has been updated
       via  22add5b6c6441fab79e0fd43b44d0caade159f69 (commit)
       via  f0be7a0795ab7a93bf7aa8e1c6b48a738441e179 (commit)
      from  26abb2819f66a4a247ce1ebf77831d3979c85018 (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 22add5b6c6441fab79e0fd43b44d0caade159f69
Author: Mukund Sivaraman <muks at isc.org>
Date:   Fri Sep 7 10:23:34 2012 +0530

    [2108] Multiple DNAME RRs should throw

commit f0be7a0795ab7a93bf7aa8e1c6b48a738441e179
Author: Mukund Sivaraman <muks at isc.org>
Date:   Fri Sep 7 10:22:04 2012 +0530

    [2108] Multiple CNAME RRs should throw

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

Summary of changes:
 .../datasrc/memory/tests/memory_client_unittest.cc |   18 ++++++++++++++++++
 src/lib/datasrc/memory/tests/testdata/Makefile.am  |    2 ++
 .../tests/testdata/example.org-multiple-cname.zone |    3 +++
 .../tests/testdata/example.org-multiple-dname.zone |    3 +++
 4 files changed, 26 insertions(+)
 create mode 100644 src/lib/datasrc/memory/tests/testdata/example.org-multiple-cname.zone
 create mode 100644 src/lib/datasrc/memory/tests/testdata/example.org-multiple-dname.zone

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/memory/tests/memory_client_unittest.cc b/src/lib/datasrc/memory/tests/memory_client_unittest.cc
index b0b2371..288d3d7 100644
--- a/src/lib/datasrc/memory/tests/memory_client_unittest.cc
+++ b/src/lib/datasrc/memory/tests/memory_client_unittest.cc
@@ -234,6 +234,24 @@ TEST_F(MemoryClientTest, loadDuplicateType) {
     // Teardown checks for memory segment leaks
 }
 
+TEST_F(MemoryClientTest, loadMultipleCNAME) {
+    // Multiple CNAME RRs should throw.
+    EXPECT_THROW(client_->load(Name("example.org"),
+                               TEST_DATA_DIR
+                               "/example.org-multiple-cname.zone"),
+                 InMemoryClient::AddError);
+    // Teardown checks for memory segment leaks
+}
+
+TEST_F(MemoryClientTest, loadMultipleDNAME) {
+    // Multiple DNAME RRs should throw.
+    EXPECT_THROW(client_->load(Name("example.org"),
+                               TEST_DATA_DIR
+                               "/example.org-multiple-dname.zone"),
+                 InMemoryClient::AddError);
+    // Teardown checks for memory segment leaks
+}
+
 TEST_F(MemoryClientTest, loadRRSIGFollowsNothing) {
     EXPECT_THROW(client_->load(Name("example.org"),
                                TEST_DATA_DIR
diff --git a/src/lib/datasrc/memory/tests/testdata/Makefile.am b/src/lib/datasrc/memory/tests/testdata/Makefile.am
index a8a0ddf..1e16226 100644
--- a/src/lib/datasrc/memory/tests/testdata/Makefile.am
+++ b/src/lib/datasrc/memory/tests/testdata/Makefile.am
@@ -11,3 +11,5 @@ EXTRA_DIST += example.org-rrsig-type-unmatched.zone
 EXTRA_DIST += example.org-rrsigs.zone
 EXTRA_DIST += example.org-duplicate-type.zone
 EXTRA_DIST += example.org-duplicate-type-bad.zone
+EXTRA_DIST += example.org-multiple-cname.zone
+EXTRA_DIST += example.org-multiple-dname.zone
diff --git a/src/lib/datasrc/memory/tests/testdata/example.org-multiple-cname.zone b/src/lib/datasrc/memory/tests/testdata/example.org-multiple-cname.zone
new file mode 100644
index 0000000..0a0c983
--- /dev/null
+++ b/src/lib/datasrc/memory/tests/testdata/example.org-multiple-cname.zone
@@ -0,0 +1,3 @@
+example.org. 3600 IN SOA	ns1.example.org. bugs.x.w.example.org. 78 3600 300 3600000 3600
+ns1.example.org.		      3600 IN CNAME	foo.example.com.
+ns1.example.org.		      3600 IN CNAME	bar.example.com.
diff --git a/src/lib/datasrc/memory/tests/testdata/example.org-multiple-dname.zone b/src/lib/datasrc/memory/tests/testdata/example.org-multiple-dname.zone
new file mode 100644
index 0000000..3d581d0
--- /dev/null
+++ b/src/lib/datasrc/memory/tests/testdata/example.org-multiple-dname.zone
@@ -0,0 +1,3 @@
+example.org. 3600 IN SOA	ns1.example.org. bugs.x.w.example.org. 79 3600 300 3600000 3600
+ns1.example.org.		      3600 IN DNAME	foo.example.com.
+ns1.example.org.		      3600 IN DNAME	bar.example.com.