sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-29 15:42:04 +03:00
Code Activity

remove_dc: Fix removal of an old Windows DC

Browse Source 
Windows has 'CN=DNS Settings' child object underneath the Server object.
This was causing the removal of the server object in remove_dc() to
fail.

Noticed this problem while testing the backup/restore tool manually
against a Windows VM.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13484

Signed-off-by: Tim Beale <timbeale@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>

Autobuild-User(master): Gary Lockyer <gary@samba.org>
Autobuild-Date(master): Tue Jun 26 23:32:51 CEST 2018 on sn-devel-144
This commit is contained in:
Tim Beale
2018-06-15 11:54:37 +12:00
committed by Gary Lockyer
parent f90f434e04
commit 562ec950fc
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
python/samba/remove_dc.py
View File

@ -240,8 +240,9 @@ def offline_remove_server(samdb, logger,
dnsHostName = None
if remove_server_obj:
# Remove the server DN
samdb.delete(server_dn)
# Remove the server DN (do a tree-delete as it could still have a
# 'DNS Settings' child object if it's a Windows DC)
samdb.delete(server_dn, ["tree_delete:0"])
if computer_dn is not None:
computer_msgs = samdb.search(base=computer_dn,