mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-03 15:35:17 +00:00
Code Issues Releases Wiki Activity

Merge branch 'trac811_new' of git+ssh://bind10.isc.org/var/bind10/git/bind10 into trac811_new

Browse Source
This commit is contained in:
Jelte Jansen
2011-05-17 22:05:18 +02:00
parent 47e5578077 9e84764e49
commit 94cfeebfec
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/xfrin/xfrin.py.in
View File

@@ -561,7 +561,7 @@ class Xfrin:
# data) # data)
old_max_transfers_in = self._max_transfers_in old_max_transfers_in = self._max_transfers_in
old_zones = self._zones old_zones = self._zones
self._max_transfers_in = new_config.get("transfers_in") or self._max_transfers_in self._max_transfers_in = new_config.get("transfers_in") or self._max_transfers_in
if 'zones' in new_config: if 'zones' in new_config:
@@ -676,7 +676,7 @@ class Xfrin:
except ValueError as err: except ValueError as err:
raise XfrinException("failed to resolve master address %s: %s" % raise XfrinException("failed to resolve master address %s: %s" %
(addr_str, str(err))) (addr_str, str(err)))
port_str = args.get('port') port_str = args.get('port')
if port_str is None: if port_str is None:
if zone_info is not None: if zone_info is not None: