sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

dbcheck: cache linkIDs and reverse attribute names

Browse Source 
This avoids fetching the same same schema things again and again.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Douglas Bagnall 2016-06-30 16:15:35 +12:00 committed by Garming Sam
parent 31ffe97178
commit ca839cf88a
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
python/samba/dbchecker.py
View File

@ -88,7 +88,7 @@ class dbcheck(object):
self.fix_missing_deleted_objects = False self.fix_missing_deleted_objects = False
self.dn_set = set() self.dn_set = set()
self.link_id_cache = {}
self.name_map = {} self.name_map = {}
try: try:
res = samdb.search(base="CN=DnsAdmins,CN=Users,%s" % samdb.domain_dn(), scope=ldb.SCOPE_BASE, res = samdb.search(base="CN=DnsAdmins,CN=Users,%s" % samdb.domain_dn(), scope=ldb.SCOPE_BASE,
@ -335,6 +335,17 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
return False return False
return True return True
def get_attr_linkID_and_reverse_name(self, attrname):
if attrname in self.link_id_cache:
return self.link_id_cache[attrname]
linkID = self.samdb_schema.get_linkId_from_lDAPDisplayName(attrname)
if linkID:
revname = self.samdb_schema.get_backlink_from_lDAPDisplayName(attrname)
else:
revname = None
self.link_id_cache[attrname] = (linkID, revname)
return linkID, revname
def err_empty_attribute(self, dn, attrname): def err_empty_attribute(self, dn, attrname):
'''fix empty attributes''' '''fix empty attributes'''
self.report("ERROR: Empty attribute %s in %s" % (attrname, dn)) self.report("ERROR: Empty attribute %s in %s" % (attrname, dn))
@ -448,7 +459,7 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
def err_missing_dn_GUID(self, dn, attrname, val, dsdb_dn): def err_missing_dn_GUID(self, dn, attrname, val, dsdb_dn):
"""handle a missing target DN (both GUID and DN string form are missing)""" """handle a missing target DN (both GUID and DN string form are missing)"""
# check if its a backlink # check if its a backlink
linkID = self.samdb_schema.get_linkId_from_lDAPDisplayName(attrname) linkID, _ = self.get_attr_linkID_and_reverse_name(attrname)
if (linkID & 1 == 0) and str(dsdb_dn).find('\\0ADEL') == -1: if (linkID & 1 == 0) and str(dsdb_dn).find('\\0ADEL') == -1:
self.report("Not removing dangling forward link") self.report("Not removing dangling forward link")
return return
@ -745,8 +756,7 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
else: else:
fixing_msDS_HasInstantiatedNCs = False fixing_msDS_HasInstantiatedNCs = False
linkID = self.samdb_schema.get_linkId_from_lDAPDisplayName(attrname) linkID, reverse_link_name = self.get_attr_linkID_and_reverse_name(attrname)
reverse_link_name = self.samdb_schema.get_backlink_from_lDAPDisplayName(attrname)
if reverse_link_name is not None: if reverse_link_name is not None:
attrs.append(reverse_link_name) attrs.append(reverse_link_name)
@ -1583,10 +1593,12 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
error_count += 1 error_count += 1
continue continue
linkID, reverse_link_name = self.get_attr_linkID_and_reverse_name(attrname)
flag = self.samdb_schema.get_systemFlags_from_lDAPDisplayName(attrname) flag = self.samdb_schema.get_systemFlags_from_lDAPDisplayName(attrname)
if (not flag & dsdb.DS_FLAG_ATTR_NOT_REPLICATED if (not flag & dsdb.DS_FLAG_ATTR_NOT_REPLICATED
and not flag & dsdb.DS_FLAG_ATTR_IS_CONSTRUCTED and not flag & dsdb.DS_FLAG_ATTR_IS_CONSTRUCTED
and not self.samdb_schema.get_linkId_from_lDAPDisplayName(attrname)): and not linkID):
set_attrs_seen.add(str(attrname).lower()) set_attrs_seen.add(str(attrname).lower())
if syntax_oid in [ dsdb.DSDB_SYNTAX_BINARY_DN, dsdb.DSDB_SYNTAX_OR_NAME, if syntax_oid in [ dsdb.DSDB_SYNTAX_BINARY_DN, dsdb.DSDB_SYNTAX_OR_NAME,