summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorDouglas Bagnall <douglas.bagnall@catalyst.net.nz>2017-06-16 09:16:16 +1200
committerDouglas Bagnall <dbagnall@samba.org>2017-06-23 02:25:26 +0200
commitab40b4013aef079e3a01b53435ee745fc21cc483 (patch)
tree69460966bca6eef56ec71de78701c59f6b80970e /python
parent6d78cbe2faa8cc8ff38f84a7f6b65cc08cad25f5 (diff)
downloadsamba-ab40b4013aef079e3a01b53435ee745fc21cc483.tar.gz
samba_kcc: drop all connections from non-existent DSAs
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Diffstat (limited to 'python')
-rw-r--r--python/samba/kcc/__init__.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/python/samba/kcc/__init__.py b/python/samba/kcc/__init__.py
index f5444d4bcbd..2c545c18a70 100644
--- a/python/samba/kcc/__init__.py
+++ b/python/samba/kcc/__init__.py
@@ -541,8 +541,9 @@ class KCC(object):
if s_dnstr not in local_dsas:
from_dsa = self.get_dsa(s_dnstr)
# Samba ONLY: ISTG removes connections to dead DCs
- if from_dsa is None and '\\0ADEL' in s_dnstr:
- logger.info("DSA appears deleted, removing connection %s" % s_dnstr)
+ if from_dsa is None or '\\0ADEL' in s_dnstr:
+ logger.info("DSA appears deleted, removing connection %s"
+ % s_dnstr)
cn.to_be_deleted = True
continue
connections_and_dsas.append((cn, dsa, from_dsa))