BIND 10 trac2751, updated. 4bee63eec6164380cc042de3405102a6e4a74b67 [2751] Add another minor check and adjust tests

BIND 10 source code commits bind10-changes at lists.isc.org
Tue Sep 17 13:04:21 UTC 2013


The branch, trac2751 has been updated
       via  4bee63eec6164380cc042de3405102a6e4a74b67 (commit)
      from  37069dfbb56bd41717c439339668807a28ca9be0 (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 4bee63eec6164380cc042de3405102a6e4a74b67
Author: Mukund Sivaraman <muks at isc.org>
Date:   Tue Sep 17 18:33:53 2013 +0530

    [2751] Add another minor check and adjust tests

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

Summary of changes:
 src/lib/datasrc/memory/rdataset.cc                |    3 +++
 src/lib/datasrc/tests/memory/rdataset_unittest.cc |    8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/memory/rdataset.cc b/src/lib/datasrc/memory/rdataset.cc
index 737ecd6..b60316c 100644
--- a/src/lib/datasrc/memory/rdataset.cc
+++ b/src/lib/datasrc/memory/rdataset.cc
@@ -97,6 +97,9 @@ sanityChecks(const ConstRRsetPtr& rrset, const ConstRRsetPtr &sig_rrset,
     if (sig_rrset && sig_rrset->getRdataCount() == 0) {
         isc_throw(BadValue, "Empty SIG RRset");
     }
+    if (sig_rrset && sig_rrset->getType() != RRType::RRSIG()) {
+        isc_throw(BadValue, "SIG RRset doesn't have type RRSIG");
+    }
     if (rrset && sig_rrset && rrset->getClass() != sig_rrset->getClass()) {
         isc_throw(BadValue, "RR class doesn't match between RRset and RRSIG");
     }
diff --git a/src/lib/datasrc/tests/memory/rdataset_unittest.cc b/src/lib/datasrc/tests/memory/rdataset_unittest.cc
index d5cebdd..e6fd5cc 100644
--- a/src/lib/datasrc/tests/memory/rdataset_unittest.cc
+++ b/src/lib/datasrc/tests/memory/rdataset_unittest.cc
@@ -703,6 +703,9 @@ TEST_F(RdataSetTest, badParams) {
     const ConstRRsetPtr empty_rrset(new RRset(Name("www.example.com"),
                                              RRClass::IN(), RRType::A(),
                                              RRTTL(3600)));
+    const ConstRRsetPtr empty_rrsig(new RRset(Name("www.example.com"),
+                                             RRClass::IN(), RRType::RRSIG(),
+                                             RRTTL(3600)));
     const ConstRRsetPtr a_rrset = textToRRset("www.example.com. 3600 IN A "
                                               "192.0.2.1");
     const ConstRRsetPtr aaaa_rrset = textToRRset("www.example.com. 3600 IN AAAA "
@@ -722,7 +725,10 @@ TEST_F(RdataSetTest, badParams) {
     EXPECT_THROW(RdataSet::create(mem_sgmt_, encoder_, empty_rrset, sig_rrset),
                  isc::BadValue);
     // The same for rrsig
-    EXPECT_THROW(RdataSet::create(mem_sgmt_, encoder_, a_rrset, empty_rrset),
+    EXPECT_THROW(RdataSet::create(mem_sgmt_, encoder_, a_rrset, empty_rrsig),
+                 isc::BadValue);
+    // Mismatched type
+    EXPECT_THROW(RdataSet::create(mem_sgmt_, encoder_, empty_rrset, a_rrset),
                  isc::BadValue);
     // Similar for subtract
     EXPECT_THROW(RdataSet::subtract(mem_sgmt_, encoder_, empty_rrset,



More information about the bind10-changes mailing list