LDAP local placeholder should return username when its not an email address (closes #1784)
This commit is contained in:
@@ -58,9 +58,12 @@ impl LdapFilter {
|
|||||||
LdapFilterItem::Static(s) => result.push_str(s),
|
LdapFilterItem::Static(s) => result.push_str(s),
|
||||||
LdapFilterItem::Full => result.push_str(ldap_escape(value).as_ref()),
|
LdapFilterItem::Full => result.push_str(ldap_escape(value).as_ref()),
|
||||||
LdapFilterItem::LocalPart => {
|
LdapFilterItem::LocalPart => {
|
||||||
if let Some((value, _)) = value.rsplit_once('@') {
|
result.push_str(
|
||||||
result.push_str(value);
|
value
|
||||||
}
|
.rsplit_once('@')
|
||||||
|
.map(|(local, _)| local)
|
||||||
|
.unwrap_or(value),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
LdapFilterItem::DomainPart => {
|
LdapFilterItem::DomainPart => {
|
||||||
if let Some((_, domain)) = value.rsplit_once('@') {
|
if let Some((_, domain)) = value.rsplit_once('@') {
|
||||||
|
|||||||
Reference in New Issue
Block a user