BIND 10 trac1535, updated. 2df61b4c21596ca9b1f9e2e2364d6ed352c2eca0 [1535] improve OutOfZoneFind text and docstring
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu Mar 29 13:21:12 UTC 2012
The branch, trac1535 has been updated
via 2df61b4c21596ca9b1f9e2e2364d6ed352c2eca0 (commit)
from f8c0d29e25d71f77314ffc997e678c7b24c34ca5 (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 2df61b4c21596ca9b1f9e2e2364d6ed352c2eca0
Author: Jelte Jansen <jelte at isc.org>
Date: Thu Mar 29 15:20:50 2012 +0200
[1535] improve OutOfZoneFind text and docstring
-----------------------------------------------------------------------
Summary of changes:
src/lib/datasrc/database.cc | 4 ++--
src/lib/datasrc/memory_datasrc.cc | 3 +--
src/lib/python/isc/datasrc/finder_inc.cc | 7 +++----
3 files changed, 6 insertions(+), 8 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/database.cc b/src/lib/datasrc/database.cc
index 6a364bd..85958f3 100644
--- a/src/lib/datasrc/database.cc
+++ b/src/lib/datasrc/database.cc
@@ -865,8 +865,8 @@ DatabaseClient::Finder::findInternal(const Name& name, const RRType& type,
name.compare(getOrigin()).getRelation();
if (reln != NameComparisonResult::SUBDOMAIN &&
reln != NameComparisonResult::EQUAL) {
- isc_throw(OutOfZoneFind, "out-of-zone find(): " << name.toText() <<
- " not in " << getOrigin().toText());
+ isc_throw(OutOfZoneFind, name.toText() << " not in " <<
+ getOrigin().toText());
}
// First, go through all superdomains from the origin down, searching for
diff --git a/src/lib/datasrc/memory_datasrc.cc b/src/lib/datasrc/memory_datasrc.cc
index 70986b4..17c22df 100644
--- a/src/lib/datasrc/memory_datasrc.cc
+++ b/src/lib/datasrc/memory_datasrc.cc
@@ -1206,8 +1206,7 @@ struct InMemoryZoneFinder::InMemoryZoneFinderImpl {
name.compare(origin_).getRelation();
if (reln != NameComparisonResult::SUBDOMAIN &&
reln != NameComparisonResult::EQUAL) {
- isc_throw(OutOfZoneFind, "out-of-zone find(): " <<
- name.toText() <<
+ isc_throw(OutOfZoneFind, name.toText() <<
" not in " << origin_.toText());
}
diff --git a/src/lib/python/isc/datasrc/finder_inc.cc b/src/lib/python/isc/datasrc/finder_inc.cc
index c063c44..7caa144 100644
--- a/src/lib/python/isc/datasrc/finder_inc.cc
+++ b/src/lib/python/isc/datasrc/finder_inc.cc
@@ -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\
exact match when a wildcard match is found.\n\
\n\
-In general, 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\
-method will return NXDOMAIN with an empty RRset. But such a case\n\
-should rather be considered a caller's bug.\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 an\n\
+OutOfZoneFind exception is raised.\n\
\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\
More information about the bind10-changes
mailing list