mirror of
https://github.com/samba-team/samba.git
synced 2025-07-28 11:42:03 +03:00
samba-tool domain demote: Remove dns-SERVER object as well
This object is not in standard AD, but Marc Muehlfeld correctly notes that Samba creates it for BIND9_DLZ Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Garming Sam <garming@catalyst.net.nz>
This commit is contained in:
@ -193,7 +193,8 @@ def offline_remove_server(samdb, server_dn,
|
||||
remove_computer_obj=False,
|
||||
remove_server_obj=False,
|
||||
remove_sysvol_obj=False,
|
||||
remove_dns_names=False):
|
||||
remove_dns_names=False,
|
||||
remove_dns_account=False):
|
||||
res = samdb.search("",
|
||||
scope=ldb.SCOPE_BASE, attrs=["dsServiceName"])
|
||||
assert len(res) == 1
|
||||
@ -226,7 +227,8 @@ def offline_remove_server(samdb, server_dn,
|
||||
computer_msgs = samdb.search(base=computer_dn,
|
||||
expression="objectclass=computer",
|
||||
attrs=["msDS-KrbTgtLink",
|
||||
"rIDSetReferences"],
|
||||
"rIDSetReferences",
|
||||
"cn"],
|
||||
scope=ldb.SCOPE_BASE)
|
||||
if "rIDSetReferences" in computer_msgs[0]:
|
||||
samdb.delete(computer_msgs[0]["rIDSetReferences"][0])
|
||||
@ -240,6 +242,14 @@ def offline_remove_server(samdb, server_dn,
|
||||
if "dnsHostName" in msgs[0]:
|
||||
dnsHostName = msgs[0]["dnsHostName"][0]
|
||||
|
||||
if remove_dns_account:
|
||||
res = samdb.search(expression="(&(objectclass=user)(cn=dns-%s)(servicePrincipalName=DNS/%s))" %
|
||||
(ldb.binary_encode(dc_name), dnsHostName),
|
||||
attrs=[], scope=ldb.SCOPE_SUBTREE,
|
||||
base=samdb.get_default_basedn())
|
||||
if len(res) == 1:
|
||||
samdb.delete(res[0].dn)
|
||||
|
||||
if dnsHostName is not None and remove_dns_names:
|
||||
remove_dns_references(samdb, dnsHostName)
|
||||
|
||||
@ -252,7 +262,8 @@ def offline_remove_ntds_dc(samdb, ntds_dn,
|
||||
remove_connection_obj=False,
|
||||
seize_stale_fsmo=False,
|
||||
remove_sysvol_obj=False,
|
||||
remove_dns_names=False):
|
||||
remove_dns_names=False,
|
||||
remove_dns_account=False):
|
||||
res = samdb.search("",
|
||||
scope=ldb.SCOPE_BASE, attrs=["dsServiceName"])
|
||||
assert len(res) == 1
|
||||
@ -318,7 +329,8 @@ def offline_remove_ntds_dc(samdb, ntds_dn,
|
||||
remove_computer_obj=remove_computer_obj,
|
||||
remove_server_obj=remove_server_obj,
|
||||
remove_sysvol_obj=remove_sysvol_obj,
|
||||
remove_dns_names=remove_dns_names)
|
||||
remove_dns_names=remove_dns_names,
|
||||
remove_dns_account=remove_dns_account)
|
||||
|
||||
|
||||
def remove_dc(samdb, dc_name):
|
||||
@ -350,7 +362,8 @@ def remove_dc(samdb, dc_name):
|
||||
remove_computer_obj=True,
|
||||
remove_server_obj=True,
|
||||
remove_sysvol_obj=True,
|
||||
remove_dns_names=True)
|
||||
remove_dns_names=True,
|
||||
remove_dns_account=True)
|
||||
|
||||
samdb.transaction_commit()
|
||||
return
|
||||
@ -363,7 +376,8 @@ def remove_dc(samdb, dc_name):
|
||||
remove_connection_obj=True,
|
||||
seize_stale_fsmo=True,
|
||||
remove_sysvol_obj=True,
|
||||
remove_dns_names=True)
|
||||
remove_dns_names=True,
|
||||
remove_dns_account=True)
|
||||
|
||||
samdb.transaction_commit()
|
||||
|
||||
|
Reference in New Issue
Block a user