This commit is contained in:
Carpentier Pierre-Francois 2024-03-13 00:14:20 +01:00 committed by GitHub
commit 97bd89bdbb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 24 additions and 2 deletions

View File

@ -486,7 +486,11 @@ class LdapCherry(object):
"""
for attr in attrs_backend:
if attr in self.attributes.backend_attributes[backend_name]:
attrid = self.attributes.backend_attributes[backend_name][attr]
attr_desc = self.attributes.backend_attributes[backend_name][attr]
if type(attr_desc) is list:
attrid = attr_desc[0]['id']
else:
attrid = attr_desc['id']
if attrid not in attrs_out:
attrs_out[attrid] = attrs_backend[attr]

View File

@ -61,9 +61,27 @@ class Attributes:
self.key = attrid
for b in attr['backends']:
self.backends.add(b)
backend_attr = attr['backends'][b]
if b not in self.backend_attributes:
self.backend_attributes[b] = {}
self.backend_attributes[b][attr['backends'][b]] = attrid
if backend_attr in self.backend_attributes[b]:
if type(self.backend_attributes[b][backend_attr]) \
is not list:
self.backend_attributes[b][backend_attr] = [
self.backend_attributes[b][backend_attr],
]
self.backend_attributes[b][backend_attr].append(
{
'id':attrid,
'type': attr['type']
}
)
else:
self.backend_attributes[b][backend_attr] = {
'id':attrid,
'type': attr['type']
}
if 'search_displayed' in attr and attr['search_displayed']:
self.displayed_attributes[attrid] = attr