From 330c00a14d0d903b5f1accf5a17c226ca3413dc4 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 11 Jul 2011 14:28:19 +1000 Subject: dbcheck: use get_lDAPDisplayName_by_attid() this is better than doing a schema search inside the dbcheck code Autobuild-User: Andrew Tridgell Autobuild-Date: Mon Jul 11 07:43:18 CEST 2011 on sn-devel-104 --- source4/scripting/python/samba/dbchecker.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'source4/scripting/python') diff --git a/source4/scripting/python/samba/dbchecker.py b/source4/scripting/python/samba/dbchecker.py index 402b3b6714..f914bbb9e9 100644 --- a/source4/scripting/python/samba/dbchecker.py +++ b/source4/scripting/python/samba/dbchecker.py @@ -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 -- cgit