Attachment 14488 Details for Bug 13484 – Cherry-pick of patch for v4.8 branch

Cherry-pick of patch for v4.8 branch

v4.8-patch.txt (text/plain), 1.54 KB, created by Tim Beale on 2018-09-14 02:51:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Beale

Created: 2018-09-14 02:51:45 UTC

Size: 1.54 KB

patch

obsolete

>From 194e29b30ddc1d208088c10eccd64926eac10333 Mon Sep 17 00:00:00 2001
>From: Tim Beale <timbeale@catalyst.net.nz>
>Date: Fri, 15 Jun 2018 11:54:37 +1200
>Subject: [PATCH] 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
>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
>
>(cherry picked from commit 562ec950fc27ae498c53a2188329530651e64e05)
>---
> python/samba/remove_dc.py | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
>diff --git a/python/samba/remove_dc.py b/python/samba/remove_dc.py
>index 4c8ee89..3790592 100644
>--- a/python/samba/remove_dc.py
>+++ b/python/samba/remove_dc.py
>@@ -226,8 +226,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,
>-- 
>2.7.4
>

Actions: View

Attachments on bug 13484: 14259 | 14488