Attachment 12574 Details for Bug 12297 – More helpful message

[patch] More helpful message

0001-dbcheck-Give-a-more-helpful-error-message-on-danglin.patch (text/plain), 1.24 KB, created by Garming Sam on 2016-10-14 03:59:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Garming Sam

Created: 2016-10-14 03:59:11 UTC

Size: 1.24 KB

patch

obsolete

>From d964be98f994f672fd6862cc217caf279e8d235f Mon Sep 17 00:00:00 2001
>From: Garming Sam <garming@catalyst.net.nz>
>Date: Fri, 14 Oct 2016 16:57:42 +1300
>Subject: [PATCH] dbcheck: Give a more helpful error message on dangling links
>
>Signed-off-by: Garming Sam <garming@catalyst.net.nz>
>---
> python/samba/dbchecker.py | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
>diff --git a/python/samba/dbchecker.py b/python/samba/dbchecker.py
>index 9b0784b..3c73a66 100644
>--- a/python/samba/dbchecker.py
>+++ b/python/samba/dbchecker.py
>@@ -497,7 +497,11 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
>         # check if its a backlink
>         linkID, _ = self.get_attr_linkID_and_reverse_name(attrname)
>         if (linkID & 1 == 0) and str(dsdb_dn).find('\\0ADEL') == -1:
>-            self.report("Not removing dangling forward link")
>+            to_expunge = ''
>+            rmd_flags = int(dsdb_dn.dn.get_extended_component("RMD_FLAGS"))
>+            if rmd_flags & 1 != 0:
>+                to_expunge = 'Try running "samba-tool domain tombstones expunge".'
>+            self.report("Not removing dangling forward link. %s" % to_expunge)
>             return
>         self.err_deleted_dn(dn, attrname, val, dsdb_dn, dsdb_dn, False)
> 
>-- 
>1.9.1
>

Actions: View

Attachments on bug 12297: 12574 | 12590