BIND 10 trac419, updated. 9c22af762d0cb6cdcb0bcbcea2b302b1165a0f66 [trac419] fix some conflicts caused by merging

[BIND 10 source code commits]

The branch, trac419 has been updated
       via  9c22af762d0cb6cdcb0bcbcea2b302b1165a0f66 (commit)
      from  543f406610c4fc2c0236f8f9c7fdc37014937fb6 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 src/bin/xfrout/xfrout.py.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/xfrout/xfrout.py.in b/src/bin/xfrout/xfrout.py.in
index 4a90dd5..fd1288d 100755
--- a/src/bin/xfrout/xfrout.py.in
+++ b/src/bin/xfrout/xfrout.py.in
@@ -152,7 +152,7 @@ class XfroutSession():
         # specific zone, we need to judge if the zone has an SOA record;
         # if not, we consider the zone has incomplete data, so xfrout can't
         # serve for it.
-        if sqlite3_ds.get_zone_soa(zone, self.server.get_db_file()):
+        if sqlite3_ds.get_zone_soa(zone, self._server.get_db_file()):
             return True
 
         return False
@@ -164,7 +164,7 @@ class XfroutSession():
         # authority for the specific zone.
         # TODO: should get zone's configuration from cfgmgr or other place
         # in future.
-        return sqlite3_ds.zone_exist(zonename, self.server.get_db_file())
+        return sqlite3_ds.zone_exist(zonename, self._server.get_db_file())
 
     def _check_xfrout_available(self, zone_name):
         '''Check if xfr request can be responsed.