>From bc3bf5f33573de0f6dd0a2d262b1336d44678cc8 Mon Sep 17 00:00:00 2001 From: Matthieu Patou Date: Mon, 25 May 2015 09:16:50 -0700 Subject: [PATCH 1/4] dbcheck: do not search for wellknown objects in schema partition: there is none Change-Id: If9922e8a439c956619e3e02a626e7541dc7c0180 --- python/samba/dbchecker.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/python/samba/dbchecker.py b/python/samba/dbchecker.py index 355a228..7c384e6 100644 --- a/python/samba/dbchecker.py +++ b/python/samba/dbchecker.py @@ -112,6 +112,9 @@ class dbcheck(object): ncs = res[0]["namingContexts"] self.deleted_objects_containers = [] for nc in ncs: + if str(nc) == str(self.schema_dn): + # There is no wellKnownObject for schema + continue try: dn = self.samdb.get_wellknown_dn(ldb.Dn(self.samdb, nc), dsdb.DS_GUID_DELETED_OBJECTS_CONTAINER) @@ -1132,8 +1135,11 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base))) nc_dn = self.samdb.get_nc_root(obj.dn) try: - deleted_objects_dn = self.samdb.get_wellknown_dn(nc_dn, + if str(nc_dn) != str(self.schema_dn): + deleted_objects_dn = self.samdb.get_wellknown_dn(nc_dn, samba.dsdb.DS_GUID_DELETED_OBJECTS_CONTAINER) + else: + deleted_objects_dn = None except KeyError, e: deleted_objects_dn = ldb.Dn(self.samdb, "CN=Deleted Objects,%s" % nc_dn) -- 2.1.4