dbcheck: use get_lDAPDisplayName_by_attid()
authorAndrew Tridgell <tridge@samba.org>
Mon, 11 Jul 2011 04:28:19 +0000 (14:28 +1000)
committerAndrew Tridgell <tridge@samba.org>
Mon, 11 Jul 2011 05:43:18 +0000 (07:43 +0200)
this is better than doing a schema search inside the dbcheck code

Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Mon Jul 11 07:43:18 CEST 2011 on sn-devel-104

source4/scripting/python/samba/dbchecker.py

index 402b3b6714d893452f7b4313fe584b48b14ff96f..f914bbb9e96ea0faf564b271ca38b38d7564fe73 100644 (file)
@@ -333,20 +333,12 @@ class dbcheck(object):
         '''Read metadata properties and list attributes in it'''
 
         list_att = []
-        d = {}
-        if self.dict_oid_name == None:
-            res = self.samdb.search(expression = '(lDAPDisplayName=*)',
-                                    controls=["search_options:1:2"],
-                                    attrs=["attributeID","lDAPDisplayName"])
-            for m in res:
-                d[str(m.get("attributeID"))] = str(m.get("lDAPDisplayName"))
-            self.dict_oid_name = d
-
-        repl = ndr_unpack(drsblobs.replPropertyMetaDataBlob,str(val))
+
+        repl = ndr_unpack(drsblobs.replPropertyMetaDataBlob, str(val))
         obj = repl.ctr
 
         for o in repl.ctr.array:
-            att = self.dict_oid_name[self.samdb.get_oid_from_attid(o.attid)]
+            att = self.samdb_schema.get_lDAPDisplayName_by_attid(o.attid)
             list_att.append(att.lower())
 
         return list_att