sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-03 04:22:09 +03:00
Code Activity

python/remove_dc: use a local variable in offline_remove_server

Browse Source 
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
This commit is contained in:
Douglas Bagnall
2018-10-11 13:07:30 +13:00
committed by Noel Power
parent 71825bc9aa
commit d6072cbf98
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
python/samba/remove_dc.py
View File

@ -229,15 +229,15 @@ def offline_remove_server(samdb, logger,
scope=ldb.SCOPE_BASE, scope=ldb.SCOPE_BASE,
expression="(objectClass=server)") expression="(objectClass=server)")
msg = msgs[0] msg = msgs[0]
dc_name = str(msgs[0]["cn"][0]) dc_name = str(msg["cn"][0])
try: try:
computer_dn = ldb.Dn(samdb, msgs[0]["serverReference"][0].decode('utf8')) computer_dn = ldb.Dn(samdb, msg["serverReference"][0].decode('utf8'))
except KeyError: except KeyError:
computer_dn = None computer_dn = None
try: try:
dnsHostName = str(msgs[0]["dnsHostName"][0]) dnsHostName = str(msg["dnsHostName"][0])
except KeyError: except KeyError:
dnsHostName = None dnsHostName = None
@ -267,8 +267,8 @@ def offline_remove_server(samdb, logger,
logger.info("Removing computer account: %s (and any child objects)" % computer_dn) logger.info("Removing computer account: %s (and any child objects)" % computer_dn)
samdb.delete(computer_dn, ["tree_delete:0"]) samdb.delete(computer_dn, ["tree_delete:0"])
if "dnsHostName" in msgs[0]: if "dnsHostName" in msg:
dnsHostName = str(msgs[0]["dnsHostName"][0]) dnsHostName = str(msg["dnsHostName"][0])
if remove_dns_account: if remove_dns_account:
res = samdb.search(expression="(&(objectclass=user)(cn=dns-%s)(servicePrincipalName=DNS/%s))" % res = samdb.search(expression="(&(objectclass=user)(cn=dns-%s)(servicePrincipalName=DNS/%s))" %