Browse Source

[1574] some documentation updates

JINMEI Tatuya 13 years ago
parent
commit
a19c58f527

+ 1 - 1
src/lib/datasrc/datasrc_messages.mes

@@ -362,7 +362,7 @@ explicitly forbidden, but the protocol is ambiguous about how this should
 behave and BIND 9 refuses that as well. Please describe your intention using
 behave and BIND 9 refuses that as well. Please describe your intention using
 different tools.
 different tools.
 
 
-% DATASRC_BAD_NSEC3_NAME NSEC3 record has a bad own name '%1'
+% DATASRC_BAD_NSEC3_NAME NSEC3 record has a bad owner name '%1'
 The software refuses to load NSEC3 records into a wildcard domain or
 The software refuses to load NSEC3 records into a wildcard domain or
 the owner name has two or more labels below the zone origin.
 the owner name has two or more labels below the zone origin.
 It isn't explicitly forbidden, but no sane zone wouldn have such names
 It isn't explicitly forbidden, but no sane zone wouldn have such names

+ 7 - 1
src/lib/datasrc/memory_datasrc.h

@@ -89,7 +89,13 @@ public:
     virtual FindNSEC3Result
     virtual FindNSEC3Result
     findNSEC3(const isc::dns::Name& name, bool recursive);
     findNSEC3(const isc::dns::Name& name, bool recursive);
 
 
-    /// TBD
+    // A temporary fake version of findNSEC3 for tests
+    //
+    // This method intentionally has the same interface as findNSEC3 but
+    // uses internally hardcoded hash values and offers a limited set
+    // of functionality for the convenience of tests.  This is a temporary
+    // workaround until #1577 is completed.  At that point this method
+    // should be removed.
     FindNSEC3Result
     FindNSEC3Result
     findNSEC3Tmp(const isc::dns::Name& name, bool recursive);
     findNSEC3Tmp(const isc::dns::Name& name, bool recursive);
 
 

+ 6 - 0
src/lib/datasrc/tests/memory_datasrc_unittest.cc

@@ -1346,6 +1346,12 @@ nsec3Check(bool expected_matched, const string& expected_rrsets_txt,
                 actual_rrsets.end());
                 actual_rrsets.end());
 }
 }
 
 
+// In the following tests we use a temporary faked version of findNSEC3
+// as the real version isn't implemented yet (it's a task for #1577).
+// When #1577 is done the tests should be updated using the real version.
+// If we can use fake hash calculator (see #1575), we should be able to
+// just replace findNSEC3Tmp with findNSEC3.
+
 TEST_F(InMemoryZoneFinderTest, addNSEC3) {
 TEST_F(InMemoryZoneFinderTest, addNSEC3) {
     const string nsec3_text = string(apex_hash) + ".example.org." +
     const string nsec3_text = string(apex_hash) + ".example.org." +
         string(nsec3_common);
         string(nsec3_common);