filip/Stalwart
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

LDAP: Support both name and email fields to be mapped to the same attribute

Browse Source
This commit is contained in:
mdecimus
2024-12-15 19:36:29 +01:00
parent db2b0d12b0
commit 5ac2bd5584
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
crates/directory/src/backend/ldap/lookup.rs
View File

@@ -356,10 +356,19 @@ impl LdapMappings {
for (attr, value) in entry.attrs {
if self.attr_name.contains(&attr) {
principal.set(
PrincipalField::Name,
value.into_iter().next().unwrap_or_default(),
);
if !self.attr_email_address.contains(&attr) {
principal.set(
PrincipalField::Name,
value.into_iter().next().unwrap_or_default(),
);
} else {
for (idx, item) in value.into_iter().enumerate() {
principal.prepend_str(PrincipalField::Emails, item.to_lowercase());
if idx == 0 {
principal.set(PrincipalField::Name, item);
}
}
}
} else if self.attr_secret.contains(&attr) {
for item in value {
principal.append_str(PrincipalField::Secrets, item);