summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Patou <mat@matws.net>2011-11-13 13:15:47 +0100
committerMatthieu Patou <mat@matws.net>2011-11-13 14:10:05 +0100
commita6686b9f9893c67534c7eec73a6c301f1ebe41da (patch)
tree4764e7a74636bef9bb111fd5eb1a449d51dcd5e4
parent691fb365f8405d92a269abcef1028aa648d12580 (diff)
downloadsamba-a6686b9f9893c67534c7eec73a6c301f1ebe41da.tar.gz
samba-a6686b9f9893c67534c7eec73a6c301f1ebe41da.tar.bz2
samba-a6686b9f9893c67534c7eec73a6c301f1ebe41da.zip
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.
-rw-r--r--source4/scripting/python/samba/dbchecker.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/scripting/python/samba/dbchecker.py b/source4/scripting/python/samba/dbchecker.py
index 7d85adfd16..384e5d96c1 100644
--- 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)