sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-03 13:47:25 +03:00
Code

python/join: Check for correct msDS-KrbTgtLink attribute

Browse Source 
Previously, the wrong case was used when checking for this attribute,
which meant krbtgt accounts were not being cleaned up.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14881
(cherry picked from commit 21a7717359082feaddfdf42788648c3d7574c28e)
This commit is contained in:
Joseph Sutton 2021-09-10 14:02:22 +12:00 committed by Stefan Metzmacher
parent 0dcab6505c
commit bf06918b44
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
python/samba/join.py
View File

@ -257,8 +257,9 @@ class DCJoinContext(object):
ctx.del_noerror(res[0].dn, recursive=True)
if "msDS-Krbtgtlink" in res[0]:
ctx.new_krbtgt_dn = res[0]["msDS-Krbtgtlink"][0]
krbtgt_dn = res[0].get('msDS-KrbTgtLink', idx=0)
if krbtgt_dn is not None:
ctx.new_krbtgt_dn = krbtgt_dn
ctx.del_noerror(ctx.new_krbtgt_dn)
res = ctx.samdb.search(base=ctx.samdb.get_default_basedn(),
@ -337,7 +338,7 @@ class DCJoinContext(object):
attrs=["msDS-krbTgtLink", "userAccountControl", "serverReferenceBL", "rIDSetReferences"])
if len(res) == 0:
raise Exception("Could not find domain member account '%s' to promote to a DC, use 'samba-tool domain join' instead'" % ctx.samname)
if "msDS-krbTgtLink" in res[0] or "serverReferenceBL" in res[0] or "rIDSetReferences" in res[0]:
if "msDS-KrbTgtLink" in res[0] or "serverReferenceBL" in res[0] or "rIDSetReferences" in res[0]:
raise Exception("Account '%s' appears to be an active DC, use 'samba-tool domain join' if you must re-create this account" % ctx.samname)
if (int(res[0]["userAccountControl"][0]) & (samba.dsdb.UF_WORKSTATION_TRUST_ACCOUNT |
samba.dsdb.UF_SERVER_TRUST_ACCOUNT) == 0):