BIND 10 master, updated. 7733a51887b6370c92cfb02a2446b10d15e224dc [master] update changelog for merge of #1535
BIND 10 source code commits
bind10-changes at lists.isc.org
Mon Apr 2 10:47:36 UTC 2012
The branch, master has been updated
via 7733a51887b6370c92cfb02a2446b10d15e224dc (commit)
via 66300a3c4769a48b765f70e2d0dbf8bbb714435b (commit)
via 952cb2ceeb8e23145a18839d42b12641e520ecdb (commit)
via 65b293e59954c95c245f44691f5c82fdcd6579c9 (commit)
via 532aa507e57aaa8c406cd4cc537058de6fcb5a88 (commit)
via ce81fab6415ae7f50ed29c201162e912d41eb50d (commit)
via 2df61b4c21596ca9b1f9e2e2364d6ed352c2eca0 (commit)
via f8c0d29e25d71f77314ffc997e678c7b24c34ca5 (commit)
via 58283fa48ac4c232e20edb144de0dad791f429cb (commit)
from ead53d5c0f105d4f60d451734d66c8f202cbbd15 (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 7733a51887b6370c92cfb02a2446b10d15e224dc
Author: Jelte Jansen <jelte at isc.org>
Date: Mon Apr 2 12:47:21 2012 +0200
[master] update changelog for merge of #1535
commit 66300a3c4769a48b765f70e2d0dbf8bbb714435b
Merge: ead53d5c0f105d4f60d451734d66c8f202cbbd15 952cb2ceeb8e23145a18839d42b12641e520ecdb
Author: Jelte Jansen <jelte at isc.org>
Date: Mon Apr 2 11:45:16 2012 +0200
[master] Merge branch 'trac1535'
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 11 ++++
src/lib/datasrc/database.cc | 2 +-
src/lib/datasrc/memory_datasrc.cc | 23 ++++++--
src/lib/datasrc/memory_datasrc.h | 10 ----
src/lib/datasrc/tests/database_unittest.cc | 52 +++++++++-----------
src/lib/datasrc/tests/memory_datasrc_unittest.cc | 26 ++++------
src/lib/datasrc/zone.h | 14 +++++-
src/lib/python/isc/datasrc/datasrc.cc | 4 ++
src/lib/python/isc/datasrc/finder_inc.cc | 7 +--
src/lib/python/isc/datasrc/finder_python.cc | 3 +
src/lib/python/isc/datasrc/tests/datasrc_test.py | 9 ++--
src/lib/python/isc/notify/notify_out.py | 24 +++++----
.../python/isc/notify/tests/testdata/test.sqlite3 | Bin 13312 -> 13312 bytes
13 files changed, 104 insertions(+), 81 deletions(-)
-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index a6ac6b0..92a189a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+417. [bug] jelte
+ The notify-out code now looks up notify targets in their correct
+ zones (and no longer just in the zone that the notify is about).
+ (Trac #1535, git 66300a3c4769a48b765f70e2d0dbf8bbb714435b)
+
+416. [func]* jelte
+ The implementations of ZoneFinder::find() now throw an OutOfZone
+ exception when the name argument is not in or below the zone this
+ zonefinder contains.
+ (Trac #1535, git 66300a3c4769a48b765f70e2d0dbf8bbb714435b)
+
bind10-devel-20120329 released on March 29, 2012
415. [doc] jinmei, jreed
diff --git a/src/lib/datasrc/database.cc b/src/lib/datasrc/database.cc
index a5a4edd..08c7b26 100644
--- a/src/lib/datasrc/database.cc
+++ b/src/lib/datasrc/database.cc
@@ -865,7 +865,7 @@ DatabaseClient::Finder::findInternal(const Name& name, const RRType& type,
name.compare(getOrigin()).getRelation();
if (reln != NameComparisonResult::SUBDOMAIN &&
reln != NameComparisonResult::EQUAL) {
- return (ResultContext(NXDOMAIN, ConstRRsetPtr()));
+ isc_throw(OutOfZone, name.toText() << " not in " << getOrigin());
}
// 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 a3a2110..4cfadfc 100644
--- a/src/lib/datasrc/memory_datasrc.cc
+++ b/src/lib/datasrc/memory_datasrc.cc
@@ -362,8 +362,7 @@ ZoneData::findNode(const Name& name, ZoneFinder::FindOptions options) const {
if (result == DomainTree::EXACTMATCH) {
return (ResultType(ZoneFinder::SUCCESS, node, state.rrset_,
zonecut_flag));
- }
- if (result == DomainTree::PARTIALMATCH) {
+ } else if (result == DomainTree::PARTIALMATCH) {
assert(node != NULL);
if (state.dname_node_ != NULL) { // DNAME
LOG_DEBUG(logger, DBG_TRACE_DATA, DATASRC_MEM_DNAME_FOUND).
@@ -408,10 +407,15 @@ ZoneData::findNode(const Name& name, ZoneFinder::FindOptions options) const {
FindNodeResult::FIND_WILDCARD |
zonecut_flag));
}
+ // Nothing really matched.
+ LOG_DEBUG(logger, DBG_TRACE_DATA, DATASRC_MEM_NOT_FOUND).arg(name);
+ return (ResultType(ZoneFinder::NXDOMAIN, node, state.rrset_));
+ } else {
+ // If the name is neither an exact or partial match, it is
+ // out of bailiwick, which is considered an error.
+ isc_throw(OutOfZone, name.toText() << " not in " <<
+ origin_data_->getName());
}
- // Nothing really matched. The name may even be out-of-bailiwick.
- LOG_DEBUG(logger, DBG_TRACE_DATA, DATASRC_MEM_NOT_FOUND).arg(name);
- return (ResultType(ZoneFinder::NXDOMAIN, node, state.rrset_));
}
} // unnamed namespace
@@ -1346,7 +1350,7 @@ InMemoryZoneFinder::findNSEC3(const Name& name, bool recursive) {
const NameComparisonResult cmp_result = name.compare(impl_->origin_);
if (cmp_result.getRelation() != NameComparisonResult::EQUAL &&
cmp_result.getRelation() != NameComparisonResult::SUBDOMAIN) {
- isc_throw(InvalidParameter, "findNSEC3 attempt for out-of-zone name: "
+ isc_throw(OutOfZone, "findNSEC3 attempt for out-of-zone name: "
<< name << ", zone: " << impl_->origin_ << "/"
<< impl_->zone_class_);
}
@@ -1451,6 +1455,13 @@ addAdditional(RBNodeRRset* rrset, ZoneData* zone_data,
const Name& name = getAdditionalName(rrset->getType(),
rdata_iterator->getCurrent());
+ // if the name is not in or below this zone, skip it
+ const NameComparisonResult::NameRelation reln =
+ name.compare(zone_data->origin_data_->getName()).getRelation();
+ if (reln != NameComparisonResult::SUBDOMAIN &&
+ reln != NameComparisonResult::EQUAL) {
+ continue;
+ }
const ZoneData::FindMutableNodeResult result =
zone_data->findNode<ZoneData::FindMutableNodeResult>(
name, ZoneFinder::FIND_GLUE_OK);
diff --git a/src/lib/datasrc/memory_datasrc.h b/src/lib/datasrc/memory_datasrc.h
index fbeb2c3..fdb3786 100644
--- a/src/lib/datasrc/memory_datasrc.h
+++ b/src/lib/datasrc/memory_datasrc.h
@@ -125,16 +125,6 @@ public:
/// exists).
result::Result add(const isc::dns::ConstRRsetPtr& rrset);
- /// \brief RRSet out of zone exception.
- ///
- /// This is thrown if addition of an RRset that doesn't belong under the
- /// zone's origin is requested.
- struct OutOfZone : public InvalidParameter {
- OutOfZone(const char* file, size_t line, const char* what) :
- InvalidParameter(file, line, what)
- { }
- };
-
/// \brief RRset is NULL exception.
///
/// This is thrown if the provided RRset parameter is NULL.
diff --git a/src/lib/datasrc/tests/database_unittest.cc b/src/lib/datasrc/tests/database_unittest.cc
index 8ffd3c7..af64f58 100644
--- a/src/lib/datasrc/tests/database_unittest.cc
+++ b/src/lib/datasrc/tests/database_unittest.cc
@@ -1872,38 +1872,33 @@ TYPED_TEST(DatabaseClientTest, find) {
}
TYPED_TEST(DatabaseClientTest, findOutOfZone) {
- // If the query name is out-of-zone it should result in NXDOMAIN
+ // If the query name is out-of-zone it should result in an exception
boost::shared_ptr<DatabaseClient::Finder> finder(this->getFinder());
vector<ConstRRsetPtr> target;
// Superdomain
- doFindTest(*finder, Name("org"), this->qtype_, this->qtype_,
- this->rrttl_, ZoneFinder::NXDOMAIN,
- this->empty_rdatas_, this->empty_rdatas_);
- EXPECT_EQ(ZoneFinder::NXDOMAIN, finder->findAll(Name("org"), target)->code);
+ EXPECT_THROW(finder->find(Name("org"), this->qtype_), OutOfZone);
+ EXPECT_THROW(finder->findAll(Name("org"), target), OutOfZone);
+
// sharing a common ancestor
- doFindTest(*finder, Name("noexample.org"), this->qtype_, this->qtype_,
- this->rrttl_, ZoneFinder::NXDOMAIN,
- this->empty_rdatas_, this->empty_rdatas_);
- EXPECT_EQ(ZoneFinder::NXDOMAIN, finder->findAll(Name("noexample.org"),
- target)->code);
+ EXPECT_THROW(finder->find(Name("noexample.org"), this->qtype_),
+ OutOfZone);
+ EXPECT_THROW(finder->findAll(Name("noexample.org"), target),
+ OutOfZone);
+
// totally unrelated domain, smaller number of labels
- doFindTest(*finder, Name("com"), this->qtype_, this->qtype_,
- this->rrttl_, ZoneFinder::NXDOMAIN,
- this->empty_rdatas_, this->empty_rdatas_);
- EXPECT_EQ(ZoneFinder::NXDOMAIN, finder->findAll(Name("com"), target)->code);
+ EXPECT_THROW(finder->find(Name("com"), this->qtype_), OutOfZone);
+ EXPECT_THROW(finder->findAll(Name("com"), target), OutOfZone);
+
// totally unrelated domain, same number of labels
- doFindTest(*finder, Name("example.com"), this->qtype_, this->qtype_,
- this->rrttl_, ZoneFinder::NXDOMAIN,
- this->empty_rdatas_, this->empty_rdatas_);
- EXPECT_EQ(ZoneFinder::NXDOMAIN, finder->findAll(Name("example.com"),
- target)->code);
+ EXPECT_THROW(finder->find(Name("example.com"), this->qtype_), OutOfZone);
+ EXPECT_THROW(finder->findAll(Name("example.com"), target), OutOfZone);
+
// totally unrelated domain, larger number of labels
- doFindTest(*finder, Name("more.example.com"), this->qtype_, this->qtype_,
- this->rrttl_, ZoneFinder::NXDOMAIN,
- this->empty_rdatas_, this->empty_rdatas_);
- EXPECT_EQ(ZoneFinder::NXDOMAIN, finder->findAll(Name("more.example.com"),
- target)->code);
+ EXPECT_THROW(finder->find(Name("more.example.com"), this->qtype_),
+ OutOfZone);
+ EXPECT_THROW(finder->findAll(Name("more.example.com"), target),
+ OutOfZone);
}
TYPED_TEST(DatabaseClientTest, findDelegation) {
@@ -2831,14 +2826,13 @@ TYPED_TEST(DatabaseClientTest, addDeviantRR) {
this->expected_rdatas_.clear();
this->expected_rdatas_.push_back("192.0.2.100");
{
- // Note: find() rejects out-of-zone query name with NXDOMAIN
+ // Note: find() rejects out-of-zone query name with an exception
// regardless of whether adding the RR succeeded, so this check
// actually doesn't confirm it.
SCOPED_TRACE("add out-of-zone RR");
- doFindTest(this->updater_->getFinder(), Name("example.com"),
- this->qtype_, this->qtype_, this->rrttl_,
- ZoneFinder::NXDOMAIN, this->empty_rdatas_,
- this->empty_rdatas_);
+ EXPECT_THROW(this->updater_->getFinder().find(Name("example.com"),
+ this->qtype_),
+ OutOfZone);
}
}
diff --git a/src/lib/datasrc/tests/memory_datasrc_unittest.cc b/src/lib/datasrc/tests/memory_datasrc_unittest.cc
index 9096a9e..a19808f 100644
--- a/src/lib/datasrc/tests/memory_datasrc_unittest.cc
+++ b/src/lib/datasrc/tests/memory_datasrc_unittest.cc
@@ -672,7 +672,7 @@ TEST_F(InMemoryZoneFinderTest, constructor) {
*/
TEST_F(InMemoryZoneFinderTest, add) {
// This one does not belong to this zone
- EXPECT_THROW(zone_finder_.add(rr_out_), InMemoryZoneFinder::OutOfZone);
+ EXPECT_THROW(zone_finder_.add(rr_out_), OutOfZone);
// Test null pointer
EXPECT_THROW(zone_finder_.add(ConstRRsetPtr()),
InMemoryZoneFinder::NullRRset);
@@ -899,8 +899,9 @@ TEST_F(InMemoryZoneFinderTest, findAny) {
findAllTest(origin_, ZoneFinder::SUCCESS, expected_sets);
// out zone name
- findAllTest(Name("example.com"), ZoneFinder::NXDOMAIN,
- vector<ConstRRsetPtr>());
+ EXPECT_THROW(findAllTest(Name("example.com"), ZoneFinder::NXDOMAIN,
+ vector<ConstRRsetPtr>()),
+ OutOfZone);
expected_sets.clear();
expected_sets.push_back(rr_child_glue_);
@@ -997,8 +998,8 @@ InMemoryZoneFinderTest::findCheck(ZoneFinder::FindResultFlags expected_flags) {
// These domains don't exist (and one is out of the zone)
findTest(Name("nothere.example.org"), RRType::A(), ZoneFinder::NXDOMAIN,
true, ConstRRsetPtr(), expected_flags);
- findTest(Name("example.net"), RRType::A(), ZoneFinder::NXDOMAIN, true,
- ConstRRsetPtr(), expected_flags);
+ EXPECT_THROW(zone_finder_.find(Name("example.net"), RRType::A()),
+ OutOfZone);
}
TEST_F(InMemoryZoneFinderTest, find) {
@@ -1053,8 +1054,7 @@ InMemoryZoneFinderTest::emptyNodeCheck(
// Note: basically we don't expect such a query to be performed (the common
// operation is to identify the best matching zone first then perform
// search it), but we shouldn't be confused even in the unexpected case.
- findTest(Name("org"), RRType::A(), ZoneFinder::NXDOMAIN, true,
- ConstRRsetPtr(), expected_flags);
+ EXPECT_THROW(zone_finder_.find(Name("org"), RRType::A()), OutOfZone);
}
TEST_F(InMemoryZoneFinderTest, emptyNode) {
@@ -1512,14 +1512,12 @@ TEST_F(InMemoryZoneFinderTest, swap) {
EXPECT_EQ(RRClass::CH(), finder1.getClass());
EXPECT_EQ(RRClass::IN(), finder2.getClass());
// make sure the zone data is swapped, too
- findTest(origin_, RRType::NS(), ZoneFinder::NXDOMAIN, false,
- ConstRRsetPtr(), ZoneFinder::RESULT_DEFAULT, &finder1);
+ EXPECT_THROW(finder1.find(origin_, RRType::NS()), OutOfZone);
findTest(other_origin, RRType::TXT(), ZoneFinder::SUCCESS, false,
ConstRRsetPtr(), ZoneFinder::RESULT_DEFAULT, &finder1);
findTest(origin_, RRType::NS(), ZoneFinder::SUCCESS, false,
ConstRRsetPtr(), ZoneFinder::RESULT_DEFAULT, &finder2);
- findTest(other_origin, RRType::TXT(), ZoneFinder::NXDOMAIN, false,
- ConstRRsetPtr(), ZoneFinder::RESULT_DEFAULT, &finder2);
+ EXPECT_THROW(finder2.find(other_origin, RRType::TXT()), OutOfZone);
}
TEST_F(InMemoryZoneFinderTest, getFileName) {
@@ -1971,10 +1969,8 @@ TEST_F(InMemoryZoneFinderTest, findNSEC3) {
EXPECT_EQ(result::SUCCESS, zone_finder_.add(textToRRset(zzz_nsec3_text)));
// Parameter validation: the query name must be in or below the zone
- EXPECT_THROW(zone_finder_.findNSEC3(Name("example.com"), false),
- isc::InvalidParameter);
- EXPECT_THROW(zone_finder_.findNSEC3(Name("org"), true),
- isc::InvalidParameter);
+ EXPECT_THROW(zone_finder_.findNSEC3(Name("example.com"), false), OutOfZone);
+ EXPECT_THROW(zone_finder_.findNSEC3(Name("org"), true), OutOfZone);
// Apex name. It should have a matching NSEC3.
{
diff --git a/src/lib/datasrc/zone.h b/src/lib/datasrc/zone.h
index c705279..c68a01c 100644
--- a/src/lib/datasrc/zone.h
+++ b/src/lib/datasrc/zone.h
@@ -27,6 +27,16 @@
namespace isc {
namespace datasrc {
+/// \brief Out of zone exception
+///
+/// This is thrown when a method is called for a name or RRset which
+/// is not in or below the zone.
+class OutOfZone : public Exception {
+public:
+ OutOfZone(const char* file, size_t line, const char* what) :
+ isc::Exception(file, line, what) {}
+};
+
/// \brief The base class to search a zone for RRsets
///
/// The \c ZoneFinder class is an abstract base class for representing
@@ -466,6 +476,8 @@ public:
///
/// \exception std::bad_alloc Memory allocation such as for constructing
/// the resulting RRset fails
+ /// \throw OutOfZone The Name \c name is outside of the origin of the
+ /// zone of this ZoneFinder.
/// \exception DataSourceError Derived class specific exception, e.g.
/// when encountering a bad zone configuration or database connection
/// failure. Although these are considered rare, exceptional events,
@@ -589,7 +601,7 @@ public:
/// algorithm, and salt) from the zone as noted above. If these
/// assumptions aren't met, \c DataSourceError exception will be thrown.
///
- /// \exception InvalidParameter name is not a subdomain of the zone origin
+ /// \exception OutOfZone name is not a subdomain of the zone origin
/// \exception DataSourceError Low-level or internal datasource errors
/// happened, or the zone isn't properly signed with NSEC3
/// (NSEC3 parameters cannot be found, no NSEC3s are available, etc).
diff --git a/src/lib/python/isc/datasrc/datasrc.cc b/src/lib/python/isc/datasrc/datasrc.cc
index 8ee06b7..af6c21e 100644
--- a/src/lib/python/isc/datasrc/datasrc.cc
+++ b/src/lib/python/isc/datasrc/datasrc.cc
@@ -233,6 +233,7 @@ initModulePart_ZoneJournalReader(PyObject* mod) {
}
PyObject* po_DataSourceError;
+PyObject* po_OutOfZone;
PyObject* po_NotImplemented;
PyModuleDef iscDataSrc = {
@@ -287,6 +288,9 @@ PyInit_datasrc(void) {
po_DataSourceError = PyErr_NewException("isc.datasrc.Error", NULL,
NULL);
PyObjectContainer(po_DataSourceError).installToModule(mod, "Error");
+ po_OutOfZone = PyErr_NewException("isc.datasrc.OutOfZone", NULL,
+ NULL);
+ PyObjectContainer(po_OutOfZone).installToModule(mod, "OutOfZone");
po_NotImplemented = PyErr_NewException("isc.datasrc.NotImplemented",
NULL, NULL);
PyObjectContainer(po_NotImplemented).installToModule(mod,
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\
diff --git a/src/lib/python/isc/datasrc/finder_python.cc b/src/lib/python/isc/datasrc/finder_python.cc
index 33a503f..ed05fdb 100644
--- a/src/lib/python/isc/datasrc/finder_python.cc
+++ b/src/lib/python/isc/datasrc/finder_python.cc
@@ -97,6 +97,9 @@ PyObject* ZoneFinder_helper(ZoneFinder* finder, PyObject* args) {
} else {
return (Py_BuildValue("IOI", r, Py_None, result_flags));
}
+ } catch (const OutOfZone& ooz) {
+ PyErr_SetString(getDataSourceException("OutOfZone"), ooz.what());
+ return (NULL);
} catch (const DataSourceError& dse) {
PyErr_SetString(getDataSourceException("Error"), dse.what());
return (NULL);
diff --git a/src/lib/python/isc/datasrc/tests/datasrc_test.py b/src/lib/python/isc/datasrc/tests/datasrc_test.py
index a6f8f16..983b8c2 100644
--- a/src/lib/python/isc/datasrc/tests/datasrc_test.py
+++ b/src/lib/python/isc/datasrc/tests/datasrc_test.py
@@ -379,11 +379,10 @@ class DataSrcClient(unittest.TestCase):
self.assertEqual(finder.NXDOMAIN, result)
self.assertEqual(None, rrset)
- result, rrset, _ = finder.find(isc.dns.Name("www.some.other.domain"),
- isc.dns.RRType.A(),
- finder.FIND_DEFAULT)
- self.assertEqual(finder.NXDOMAIN, result)
- self.assertEqual(None, rrset)
+
+ self.assertRaises(isc.datasrc.OutOfZone, finder.find,
+ isc.dns.Name("www.some.other.domain"),
+ isc.dns.RRType.A())
result, rrset, _ = finder.find(isc.dns.Name("www.example.com"),
isc.dns.RRType.TXT(),
diff --git a/src/lib/python/isc/notify/notify_out.py b/src/lib/python/isc/notify/notify_out.py
index 6f3bec9..bfa7167 100644
--- a/src/lib/python/isc/notify/notify_out.py
+++ b/src/lib/python/isc/notify/notify_out.py
@@ -278,12 +278,12 @@ class NotifyOut:
# data sources.
datasrc_config = '{ "database_file": "' + self._db_file + '"}'
try:
- result, finder = DataSourceClient('sqlite3',
- datasrc_config).find_zone(
- zone_name)
+ ds_client = DataSourceClient('sqlite3', datasrc_config)
except isc.datasrc.Error as ex:
logger.error(NOTIFY_OUT_DATASRC_ACCESS_FAILURE, ex)
return []
+
+ result, finder = ds_client.find_zone(zone_name)
if result is not DataSourceClient.SUCCESS:
logger.error(NOTIFY_OUT_DATASRC_ZONE_NOT_FOUND,
format_zone_str(zone_name, zone_class))
@@ -307,13 +307,17 @@ class NotifyOut:
ns_name = Name(ns_rdata.to_text())
if soa_mname == ns_name:
continue
- result, rrset, _ = finder.find(ns_name, RRType.A())
- if result is finder.SUCCESS and rrset is not None:
- addrs.extend([a.to_text() for a in rrset.get_rdata()])
-
- result, rrset, _ = finder.find(ns_name, RRType.AAAA())
- if result is finder.SUCCESS and rrset is not None:
- addrs.extend([aaaa.to_text() for aaaa in rrset.get_rdata()])
+ ns_result, ns_finder = ds_client.find_zone(ns_name)
+ if ns_result is DataSourceClient.SUCCESS or \
+ ns_result is DataSourceClient.PARTIALMATCH:
+ result, rrset, _ = ns_finder.find(ns_name, RRType.A())
+ if result is ns_finder.SUCCESS and rrset is not None:
+ addrs.extend([a.to_text() for a in rrset.get_rdata()])
+
+ result, rrset, _ = ns_finder.find(ns_name, RRType.AAAA())
+ if result is ns_finder.SUCCESS and rrset is not None:
+ addrs.extend([aaaa.to_text()
+ for aaaa in rrset.get_rdata()])
return addrs
diff --git a/src/lib/python/isc/notify/tests/testdata/test.sqlite3 b/src/lib/python/isc/notify/tests/testdata/test.sqlite3
index e3cadb0..1606064 100644
Binary files a/src/lib/python/isc/notify/tests/testdata/test.sqlite3 and b/src/lib/python/isc/notify/tests/testdata/test.sqlite3 differ
More information about the bind10-changes
mailing list