samba-tool: dbcheck avoid problems with deleted objects

We have to search for deleted objects as well as the previous search
might have been done with the show_deleted control. If not samba-tool
fails with no such DN error while fetching the object.

diff --git a/source4/scripting/python/samba/dbchecker.py b/source4/scripting/python/samba/dbchecker.py
index 7d85adfd16dbba0d7dca9b2317d3be062d9dc3e4..384e5d96c14decbb701a050cf0581cd540e4fb5c 100644 (file)
--- a/source4/scripting/python/samba/dbchecker.py
+++ b/source4/scripting/python/samba/dbchecker.py
@@ -407,7 +407,7 @@ class dbcheck(object):
             attrs.append("replPropertyMetaData")
 
         res = self.samdb.search(base=dn, scope=ldb.SCOPE_BASE,
-                                controls=["extended_dn:1:1", "show_recycled:1"],
+                controls=["extended_dn:1:1", "show_recycled:1", "show_deleted:1"],
                                 attrs=attrs)
         if len(res) != 1:
             self.report("Object %s disappeared during check" % dn)