From: Jelte Jansen <jelte@isc.org>
Date: Thu, 26 Jan 2012 15:15:07 +0000 (+0100)
Subject: [1573] bit of cleanup
X-Git-Tag: trac2351_base~275^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d4436ec72742cfa447c7a46b377b134a8e82185d;p=thirdparty%2Fkea.git

[1573] bit of cleanup
---

diff --git a/src/bin/auth/query.h b/src/bin/auth/query.h
index 897c7fdd5f..e92806bd0f 100644
--- a/src/bin/auth/query.h
+++ b/src/bin/auth/query.h
@@ -78,6 +78,9 @@ private:
     /// (signaled by find() returning NXRRSET), and the zone is signed
     /// with NSEC, an NSEC denial of existance proof is added.
     ///
+    /// \exception BadDS raised if find() returns anything other than
+    ///                  SUCCESS or NXRRSET when searching for the DS
+    ///                  record.
     /// \param finder The ZoneFinder where the delegation was found
     /// \param ds_name The name of the delegation RRset
     void addDS(isc::datasrc::ZoneFinder& finder,
diff --git a/src/bin/auth/tests/query_unittest.cc b/src/bin/auth/tests/query_unittest.cc
index 0644bcb2b1..c1da52d486 100644
--- a/src/bin/auth/tests/query_unittest.cc
+++ b/src/bin/auth/tests/query_unittest.cc
@@ -515,7 +515,6 @@ MockZoneFinder::find(const Name& name, const RRType& type,
         }
     }
 
-
     // normal cases.  names are searched for only per exact-match basis
     // for simplicity.
     const Domains::const_iterator found_domain = domains_.find(name);
@@ -937,9 +936,8 @@ TEST_F(QueryTest, delegation) {
 }
 
 TEST_F(QueryTest, secureDelegation) {
-    // find match rrset, omit additional data which has already been provided
-    // in the answer section from the additional.
-    EXPECT_NO_THROW(Query(memory_client, Name("foo.signed-delegation.example.com"),
+    EXPECT_NO_THROW(Query(memory_client,
+                          Name("foo.signed-delegation.example.com"),
                           qtype, response, true).process());
 
     // Should now contain RRSIG and DS record as well.
@@ -957,7 +955,7 @@ TEST_F(QueryTest, secureUnsignedDelegation) {
                           Name("foo.unsigned-delegation.example.com"),
                           qtype, response, true).process());
 
-    // Should now contain RRSIG and DS record as well.
+    // Should now contain RRSIG and NSEC record as well.
     responseCheck(response, Rcode::NOERROR(), 0, 0, 3, 0,
                   NULL,
                   (string(unsigned_delegation_txt) +