sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-04 08:22:08 +03:00
Code Activity

dbcheck: better disambiguate 'attrs'

Browse Source 
We had too many things called 'attrs'; now we have just one, but we
don't want it to look like it is *the* one.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
This commit is contained in:
Douglas Bagnall
2020-12-09 11:34:50 +13:00
committed by Noel Power
parent 206a028e1e
commit 0dd736ff33
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
python/samba/dbchecker.py
View File

@ -250,7 +250,7 @@ class dbcheck(object):
for object in res: for object in res:
self.dn_set.add(str(object.dn)) self.dn_set.add(str(object.dn))
error_count += self.check_object(object.dn, attrs=attrs) error_count += self.check_object(object.dn, requested_attrs=attrs)
if DN is None: if DN is None:
error_count += self.check_rootdse() error_count += self.check_rootdse()
@ -2217,17 +2217,16 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
raise KeyError raise KeyError
def find_checkable_attrs(self, dn, attrs): def find_checkable_attrs(self, dn, requested_attrs):
"""A helper function for check_object() that calculates the list of """A helper function for check_object() that calculates the list of
attributes that need to be checked, and returns that as a list attributes that need to be checked, and returns that as a list
in the original case, and a set normalised to lowercase (for in the original case, and a set normalised to lowercase (for
easy existence checks). easy existence checks).
""" """
if attrs is None: if requested_attrs is None:
attrs = ['*'] attrs = ['*']
else: else:
# make a local copy to modify attrs = list(requested_attrs)
attrs = list(attrs)
lc_attrs = set(x.lower() for x in attrs) lc_attrs = set(x.lower() for x in attrs)
@ -2267,14 +2266,14 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
return attrs, lc_attrs return attrs, lc_attrs
def check_object(self, dn, attrs=None): def check_object(self, dn, requested_attrs=None):
'''check one object''' '''check one object'''
if self.verbose: if self.verbose:
self.report("Checking object %s" % dn) self.report("Checking object %s" % dn)
# search attrs are used to find the attributes, lc_attrs are # search attrs are used to find the attributes, lc_attrs are
# used for existence checks # used for existence checks
search_attrs, lc_attrs = self.find_checkable_attrs(dn, attrs) search_attrs, lc_attrs = self.find_checkable_attrs(dn, requested_attrs)
try: try:
sd_flags = 0 sd_flags = 0