From: Jelte Jansen <jelte@isc.org>
Date: Thu, 7 Jun 2012 08:37:44 +0000 (+0200)
Subject: [master] Merge branch 'trac2018' with trivial conflicts
X-Git-Tag: trac2351_base~226^2~59^2~7^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9b2f2c4d4f87cf7672a3aa8efc25fb73400dce3a;p=thirdparty%2Fkea.git

[master] Merge branch 'trac2018' with trivial conflicts

Conflicts:
	src/lib/python/isc/ddns/session.py
	src/lib/python/isc/ddns/tests/session_tests.py
---

9b2f2c4d4f87cf7672a3aa8efc25fb73400dce3a
diff --cc src/lib/python/isc/ddns/session.py
index 5759420a49,bcbca91243..6cb2c98c11
--- a/src/lib/python/isc/ddns/session.py
+++ b/src/lib/python/isc/ddns/session.py
@@@ -213,13 -214,8 +214,13 @@@ class UpdateSession
                  return UPDATE_ERROR, None, None
              self.__message = None
              return UPDATE_DROP, None, None
 +        except isc.datasrc.Error as e:
 +            logger.error(LIBDDNS_DATASRC_ERROR,
 +                         ClientFormatter(self.__client_addr, self.__tsig), e)
 +            self.__make_response(Rcode.SERVFAIL())
 +            return UPDATE_ERROR, None, None
  
-     def __get_update_zone(self):
+     def _get_update_zone(self):
          '''Parse the zone section and find the zone to be updated.
  
          If the zone section is valid and the specified zone is found in