[SCM] Samba Shared Repository - branch master updated

Gary Lockyer gary at samba.org
Tue Jun 26 21:33:01 UTC 2018

The branch, master has been updated
       via  562ec95 remove_dc: Fix removal of an old Windows DC
      from  f90f434 s3:tests: Add test for smbclient --quiet


- Log -----------------------------------------------------------------
commit 562ec950fc27ae498c53a2188329530651e64e05
Author: Tim Beale <timbeale at catalyst.net.nz>
Date:   Fri Jun 15 11:54:37 2018 +1200

    remove_dc: Fix removal of an old Windows DC
    Windows has 'CN=DNS Settings' child object underneath the Server object.
    This was causing the removal of the server object in remove_dc() to
    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 at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
    Autobuild-User(master): Gary Lockyer <gary at samba.org>
    Autobuild-Date(master): Tue Jun 26 23:32:51 CEST 2018 on sn-devel-144


Summary of changes:
 python/samba/remove_dc.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Changeset truncated at 500 lines:

diff --git a/python/samba/remove_dc.py b/python/samba/remove_dc.py
index b9726f5..d190461 100644
--- a/python/samba/remove_dc.py
+++ b/python/samba/remove_dc.py
@@ -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,

Samba Shared Repository

More information about the samba-cvs mailing list