BIND 10 trac1512, updated. dd418d92a81da33ab22b97d3316205ed5e1ad7ec [1512] reverted accidentally commited local workaround to configure.ac.
BIND 10 source code commits
bind10-changes at lists.isc.org
Mon May 21 23:18:51 UTC 2012
The branch, trac1512 has been updated
via dd418d92a81da33ab22b97d3316205ed5e1ad7ec (commit)
via 40f1d423fdc78bedcfcaa15ffd237307dc26760f (commit)
via 0656026efd474564a43569fc2b7bc40543adb89f (commit)
via df579c404c308a60470a6c05701af590c848726d (commit)
via e08d863413670e210a885eda393afc11b4cc94c5 (commit)
via f1e5916f4fe8f99abb7efc39732376f92b576831 (commit)
via 9bc7701597d68fdb865709a2684336e2d908d878 (commit)
via 9b85fc436278ba51beb0c7d7f358b0e519948845 (commit)
from fd063d02153814e1ca2e63066b69b8cbf2111b20 (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 dd418d92a81da33ab22b97d3316205ed5e1ad7ec
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Mon May 21 16:01:26 2012 -0700
[1512] reverted accidentally commited local workaround to configure.ac.
commit 40f1d423fdc78bedcfcaa15ffd237307dc26760f
Merge: 0656026 fd063d0
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Mon May 21 15:57:30 2012 -0700
[1512] Merge branch 'trac1512' of ssh://git.bind10.isc.org/var/bind10/git/bind10 into trac1512
commit 0656026efd474564a43569fc2b7bc40543adb89f
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Mon May 21 15:28:20 2012 -0700
[1512] use set() for ZoneConfig secondaries as only memebership is needed.
commit df579c404c308a60470a6c05701af590c848726d
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Mon May 21 15:20:18 2012 -0700
[1512] minor editorial fix to pydoc string.
commit e08d863413670e210a885eda393afc11b4cc94c5
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Mon May 21 15:14:14 2012 -0700
[1512] added a comment about why we convert Opcode to text before comparing.
commit f1e5916f4fe8f99abb7efc39732376f92b576831
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Mon May 21 15:06:56 2012 -0700
[1512] return UPDATE_ERROR within the exception handling block
for now, the effect is the same, and we may want to move the return
back to the common part if we want to handle multiple exceptions
in a unified matter. But at the moment we don't have the need for it,
and the revised position seemed to be less confusing.
commit 9bc7701597d68fdb865709a2684336e2d908d878
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Mon May 21 14:58:37 2012 -0700
[1512] added note about unused and yet-to-see parameters to UpdateSession ctor.
commit 9b85fc436278ba51beb0c7d7f358b0e519948845
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Mon May 21 14:54:38 2012 -0700
[1512] editorial fixes to log messages.
(the intent of the changes should be obvious from the diff.)
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 2 +-
src/lib/python/isc/ddns/libddns_messages.mes | 6 +++---
src/lib/python/isc/ddns/session.py | 8 +++++++-
src/lib/python/isc/ddns/tests/session_tests.py | 1 +
src/lib/python/isc/ddns/zone_config.py | 6 +++---
5 files changed, 15 insertions(+), 8 deletions(-)
-----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 8f0fb39..566b74d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -722,7 +722,7 @@ elif test "${log4cplus_path}" != "yes" ; then
LOG4CPLUS_LIBS="-L${log4cplus_path}/lib"
else
# If not specified, try some common paths.
- log4cplusdirs="/opt/pkg /usr/local /usr/pkg /opt /opt/local"
+ log4cplusdirs="/usr/local /usr/pkg /opt /opt/local"
for d in $log4cplusdirs
do
if test -f $d/include/log4cplus/logger.h; then
diff --git a/src/lib/python/isc/ddns/libddns_messages.mes b/src/lib/python/isc/ddns/libddns_messages.mes
index 83ff816..4c48c4c 100644
--- a/src/lib/python/isc/ddns/libddns_messages.mes
+++ b/src/lib/python/isc/ddns/libddns_messages.mes
@@ -25,15 +25,15 @@ class, and description of the error are logged.
% LIBDDNS_UPDATE_FORWARD_FAIL update client %1 for zone %2: update forwarding not supported
Debug message. An update request is sent to a secondary server. This
-is not necessarily mean invalid, but this implementation does not yet
+is not necessarily invalid, but this implementation does not yet
support update forwarding as specified in Section 6 of RFC2136 and it
will simply return a response with an RCODE of NOTIMP to the client.
The client's address and the zone name/class are logged.
% LIBDDNS_UPDATE_NOTAUTH update client %1 for zone %2: not authoritative for update zone
Debug message. An update request for a zone for which the receiving
-server has authority. In theory this is not an unexpected event, but
-there are client implementations that could send update requests
+server doesn't have authority. In theory this is an unexpected event,
+but there are client implementations that could send update requests
carelessly, so it may not necessarily be so uncommon in practice. If
possible, you may want to check the implementation or configuration of
those clients to suppress the requests. As specified in Section 3.1
diff --git a/src/lib/python/isc/ddns/session.py b/src/lib/python/isc/ddns/session.py
index 8cb4e5c..36541d9 100644
--- a/src/lib/python/isc/ddns/session.py
+++ b/src/lib/python/isc/ddns/session.py
@@ -68,6 +68,12 @@ class UpdateSession:
def __init__(self, req_message, req_data, client_addr, zone_config):
'''Constructor.
+ Note: req_data is not really used as of #1512 but is listed since
+ it's quite likely we need it in a subsequent task soon. We'll
+ also need to get other parameters such as ACLs, for which, it's less
+ clear in which form we want to get the information, so it's left
+ open for now.
+
Parameters:
- req_message (isc.dns.Message) The request message. This must be
in the PARSE mode.
@@ -128,7 +134,7 @@ class UpdateSession:
ClientFormatter(self.__client_addr),
ZoneFormatter(e.zname, e.zclass), e)
self.__make_response(e.rcode)
- return UPDATE_ERROR, None, None
+ return UPDATE_ERROR, None, None
def __get_update_zone(self):
'''Parse the zone section and find the zone to be updated.
diff --git a/src/lib/python/isc/ddns/tests/session_tests.py b/src/lib/python/isc/ddns/tests/session_tests.py
index 0ccd7ba..1bf4e40 100644
--- a/src/lib/python/isc/ddns/tests/session_tests.py
+++ b/src/lib/python/isc/ddns/tests/session_tests.py
@@ -68,6 +68,7 @@ class SessionTest(unittest.TestCase):
def check_response(self, msg, expected_rcode):
'''Perform common checks on update resposne message.'''
self.assertTrue(msg.get_header_flag(Message.HEADERFLAG_QR))
+ # note: we convert opcode to text it'd be more helpful on failure.
self.assertEqual(Opcode.UPDATE().to_text(), msg.get_opcode().to_text())
self.assertEqual(expected_rcode.to_text(), msg.get_rcode().to_text())
# All sections should be cleared
diff --git a/src/lib/python/isc/ddns/zone_config.py b/src/lib/python/isc/ddns/zone_config.py
index fee0396..5b1af0c 100644
--- a/src/lib/python/isc/ddns/zone_config.py
+++ b/src/lib/python/isc/ddns/zone_config.py
@@ -37,7 +37,7 @@ class ZoneConfig:
'''Constructor.
Parameters:
- - secondaries: a list of 2-element tuple. Each element is a pair
+ - secondaries: a list of 2-element tuples. Each element is a pair
of isc.dns.Name and isc.dns.RRClass, and identifies a single
secondary zone.
- datasrc_class: isc.dns.RRClass object. Specifies the RR class
@@ -47,9 +47,9 @@ class ZoneConfig:
a zone that is eventually updated in the ddns package.
'''
- self.__secondaries = {}
+ self.__secondaries = set()
for (zname, zclass) in secondaries:
- self.__secondaries[(zname, zclass)] = True
+ self.__secondaries.add((zname, zclass))
self.__datasrc_class = datasrc_class
self.__datasrc_client = datasrc_client
More information about the bind10-changes
mailing list