From: Jelte Jansen <jelte@isc.org>
Date: Tue, 14 Feb 2012 09:57:08 +0000 (+0100)
Subject: [1582] minor cleanups
X-Git-Tag: trac2351_base~97^2~33^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9ba95c664865ceb3fc551dbb0d8cc120c8aa2ba2;p=thirdparty%2Fkea.git

[1582] minor cleanups
---

diff --git a/src/bin/auth/query.cc b/src/bin/auth/query.cc
index ac2858983c..026728cd37 100644
--- a/src/bin/auth/query.cc
+++ b/src/bin/auth/query.cc
@@ -220,7 +220,7 @@ Query::addDS(ZoneFinder& finder, const Name& dname) {
         addNXRRsetProof(finder, ds_result);
     } else {
         // Any other case should be an error
-        isc_throw(BadDS, "Unexpected result for DS lookup for delegation" << ds_result.code);
+        isc_throw(BadDS, "Unexpected result for DS lookup for delegation");
     }
 }
 
diff --git a/src/bin/auth/query.h b/src/bin/auth/query.h
index 5a78914ef7..f2db2e6b71 100644
--- a/src/bin/auth/query.h
+++ b/src/bin/auth/query.h
@@ -86,11 +86,11 @@ private:
     void addDS(isc::datasrc::ZoneFinder& finder,
                const isc::dns::Name& ds_name);
 
-    /// \brief Adds NSEC denial proof for the given NXRRset result
+    /// \brief Adds NSEC(3) denial proof for the given NXRRset result
     ///
     /// If available, NSEC or NSEC3 records are added to the authority
     /// section (depending on whether isNSECSigned() or isNSEC3Signed()
-    /// returns true.
+    /// returns true).
     ///
     /// \param finder The ZoneFinder that was used to search for the missing
     ///               data
diff --git a/src/bin/auth/tests/query_unittest.cc b/src/bin/auth/tests/query_unittest.cc
index 951fa1977e..0626d90c29 100644
--- a/src/bin/auth/tests/query_unittest.cc
+++ b/src/bin/auth/tests/query_unittest.cc
@@ -170,14 +170,13 @@ const char* const signed_delegation_ds_txt =
     "signed-delegation.example.com. 3600 IN DS 12345 8 2 "
     "764501411DE58E8618945054A3F620B36202E115D015A7773F4B78E0F952CECA\n";
 
-// (Secure) delegation data; Delegation without DS record (and NSEC denying
-// its existence.
+// (Secure) delegation data; Delegation without DS record (and both NSEC
+// and NSEC3 denying its existence)
 const char* const unsigned_delegation_txt =
     "unsigned-delegation.example.com. 3600 IN NS ns.example.net.\n";
 const char* const unsigned_delegation_nsec_txt =
     "unsigned-delegation.example.com. 3600 IN NSEC "
     "unsigned-delegation-optout.example.com. NS RRSIG NSEC\n";
-
 const char* const unsigned_delegation_nsec3_txt =
     "q81r598950igr1eqvc60aedlq66425b5.example.com. 3600 IN NSEC3 1 1 12 "
     "aabbccdd 0p9mhaveqvm6t7vbl5lop2u3t2rp3tom NS RRSIG\n";