mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-31 14:05:33 +00:00
Code Issues Releases Wiki Activity

[1535] improve OutOfZoneFind text and docstring

Browse Source
This commit is contained in:
Jelte Jansen
2012-03-29 15:20:50 +02:00
parent f8c0d29e25
commit 2df61b4c21
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/datasrc/database.cc
View File

@@ -865,8 +865,8 @@ DatabaseClient::Finder::findInternal(const Name& name, const RRType& type,
name.compare(getOrigin()).getRelation(); name.compare(getOrigin()).getRelation();
if (reln != NameComparisonResult::SUBDOMAIN && if (reln != NameComparisonResult::SUBDOMAIN &&
reln != NameComparisonResult::EQUAL) { reln != NameComparisonResult::EQUAL) {
isc_throw(OutOfZoneFind, "out-of-zone find(): " << name.toText() << isc_throw(OutOfZoneFind, name.toText() << " not in " <<
" not in " << getOrigin().toText()); getOrigin().toText());
} }
// First, go through all superdomains from the origin down, searching for // First, go through all superdomains from the origin down, searching for

3
src/lib/datasrc/memory_datasrc.cc
View File

@@ -1206,8 +1206,7 @@ struct InMemoryZoneFinder::InMemoryZoneFinderImpl {
name.compare(origin_).getRelation(); name.compare(origin_).getRelation();
if (reln != NameComparisonResult::SUBDOMAIN && if (reln != NameComparisonResult::SUBDOMAIN &&
reln != NameComparisonResult::EQUAL) { reln != NameComparisonResult::EQUAL) {
isc_throw(OutOfZoneFind, "out-of-zone find(): " << isc_throw(OutOfZoneFind, name.toText() <<
name.toText() <<
" not in " << origin_.toText()); " not in " << origin_.toText());
} }

7
src/lib/python/isc/datasrc/finder_inc.cc
View File

@@ -99,10 +99,9 @@ Their semantics is as follows (they are or bit-field):\n\
of the non existence of any matching wildcard or non existence of an\n\ of the non existence of any matching wildcard or non existence of an\n\
exact match when a wildcard match is found.\n\ exact match when a wildcard match is found.\n\
\n\ \n\
In general, name is expected to be included in the zone, that is, it\n\ Name is expected to be included in the zone, that is, it\n\
should be equal to or a subdomain of the zone origin. Otherwise this\n\ should be equal to or a subdomain of the zone origin. Otherwise an\n\
method will return NXDOMAIN with an empty RRset. But such a case\n\ OutOfZoneFind exception is raised.\n\
should rather be considered a caller's bug.\n\
\n\ \n\
Note: For this reason it's probably better to throw an exception than\n\ Note: For this reason it's probably better to throw an exception than\n\
returning NXDOMAIN. This point should be revisited in a near future\n\ returning NXDOMAIN. This point should be revisited in a near future\n\