From ab40b4013aef079e3a01b53435ee745fc21cc483 Mon Sep 17 00:00:00 2001 From: Douglas Bagnall Date: Fri, 16 Jun 2017 09:16:16 +1200 Subject: [PATCH] samba_kcc: drop all connections from non-existent DSAs Signed-off-by: Douglas Bagnall Reviewed-by: Garming Sam --- python/samba/kcc/__init__.py | 5 +++-- 1 file 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)) -- 2.47.2