BIND 10 trac2108_3, updated. 2d47ae95847e1088b1458f7d099093d2f5c8d9ef [2108] Check that loading a zone with wildcard NSEC3 names throws an exception

[BIND 10 source code commits]

The branch, trac2108_3 has been updated
       via  2d47ae95847e1088b1458f7d099093d2f5c8d9ef (commit)
       via  46286a6732d6adf6f1640ad4ad6b7360a279fea4 (commit)
      from  15bdb89898addbb7149479a083af674c545755d7 (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 2d47ae95847e1088b1458f7d099093d2f5c8d9ef
Author: Mukund Sivaraman <muks at isc.org>
Date:   Mon Sep 10 07:17:22 2012 +0530

    [2108] Check that loading a zone with wildcard NSEC3 names throws an exception

commit 46286a6732d6adf6f1640ad4ad6b7360a279fea4
Author: Mukund Sivaraman <muks at isc.org>
Date:   Mon Sep 10 07:14:04 2012 +0530

    [2108] Fix RRType in last commit comment

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

Summary of changes:
 .../datasrc/memory/tests/memory_client_unittest.cc |   11 ++++++++++-
 src/lib/datasrc/memory/tests/testdata/Makefile.am  |    1 +
 .../tests/testdata/example.org-wildcard-nsec3.zone |    4 ++++
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 src/lib/datasrc/memory/tests/testdata/example.org-wildcard-nsec3.zone

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/memory/tests/memory_client_unittest.cc b/src/lib/datasrc/memory/tests/memory_client_unittest.cc
index 64214d9..2bcb3f7 100644
--- a/src/lib/datasrc/memory/tests/memory_client_unittest.cc
+++ b/src/lib/datasrc/memory/tests/memory_client_unittest.cc
@@ -300,7 +300,7 @@ TEST_F(MemoryClientTest, loadWildcardNSThrows) {
 }
 
 TEST_F(MemoryClientTest, loadWildcardDNAMEThrows) {
-    // Wildcard NS names should throw
+    // Wildcard DNAME names should throw
     EXPECT_THROW(client_->load(Name("example.org"),
                                TEST_DATA_DIR
                                "/example.org-wildcard-dname.zone"),
@@ -308,6 +308,15 @@ TEST_F(MemoryClientTest, loadWildcardDNAMEThrows) {
     // Teardown checks for memory segment leaks
 }
 
+TEST_F(MemoryClientTest, loadWildcardNSEC3Throws) {
+    // Wildcard NSEC3 names should throw
+    EXPECT_THROW(client_->load(Name("example.org"),
+                               TEST_DATA_DIR
+                               "/example.org-wildcard-nsec3.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 ad810b0..02a23e1 100644
--- a/src/lib/datasrc/memory/tests/testdata/Makefile.am
+++ b/src/lib/datasrc/memory/tests/testdata/Makefile.am
@@ -20,3 +20,4 @@ EXTRA_DIST += example.org-nsec3-signed-no-param.zone
 EXTRA_DIST += example.org-out-of-zone.zone
 EXTRA_DIST += example.org-wildcard-ns.zone
 EXTRA_DIST += example.org-wildcard-dname.zone
+EXTRA_DIST += example.org-wildcard-nsec3.zone
diff --git a/src/lib/datasrc/memory/tests/testdata/example.org-wildcard-nsec3.zone b/src/lib/datasrc/memory/tests/testdata/example.org-wildcard-nsec3.zone
new file mode 100644
index 0000000..feee116
--- /dev/null
+++ b/src/lib/datasrc/memory/tests/testdata/example.org-wildcard-nsec3.zone
@@ -0,0 +1,4 @@
+;; test zone file with wildcard NS names
+
+example.org. 3600 IN SOA	ns1.example.org. bugs.x.w.example.org. 79 3600 300 3600000 3600
+*.example.org. 1200 IN NSEC3	1 0 10 AABBCCDD RKOF8QMFRB5F2V9EJHFBVB2JPVSA0DJD A RRSIG