Commit 94cfeebf authored by Jelte Jansen's avatar Jelte Jansen
Browse files

Merge branch 'trac811_new' of git+ssh:// into trac811_new

parents 47e55780 9e84764e
......@@ -561,7 +561,7 @@ class Xfrin:
# data)
old_max_transfers_in = self._max_transfers_in
old_zones = self._zones
self._max_transfers_in = new_config.get("transfers_in") or self._max_transfers_in
if 'zones' in new_config:
......@@ -676,7 +676,7 @@ class Xfrin:
except ValueError as err:
raise XfrinException("failed to resolve master address %s: %s" %
(addr_str, str(err)))
port_str = args.get('port')
if port_str is None:
if zone_info is not None:
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment