diff options
| author | James Moger <james.moger@gitblit.com> | 2014-09-08 12:06:15 -0600 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-09-08 12:06:15 -0600 |
| commit | b25377114fac000ce0d4f44f8fd8688f9c2808fc (patch) | |
| tree | e2599f464d2ec7a43c9b462e1e8ab711a2ad9650 | |
| parent | 0d7fbbfc6484e3dc9ae5596b6d3460a278f86d8c (diff) | |
| parent | 2f0fe2263e73f9bc04d043757883fa0aed3c2669 (diff) | |
| download | gitblit-b25377114fac000ce0d4f44f8fd8688f9c2808fc.tar.gz gitblit-b25377114fac000ce0d4f44f8fd8688f9c2808fc.zip | |
Merged #134 "LDAP user accounts will not reset/clear the email address"
| -rw-r--r-- | src/main/java/com/gitblit/auth/LdapAuthProvider.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main/java/com/gitblit/auth/LdapAuthProvider.java b/src/main/java/com/gitblit/auth/LdapAuthProvider.java index a4d7bb05..5690073a 100644 --- a/src/main/java/com/gitblit/auth/LdapAuthProvider.java +++ b/src/main/java/com/gitblit/auth/LdapAuthProvider.java @@ -427,6 +427,10 @@ public class LdapAuthProvider extends UsernamePasswordAuthenticationProvider { Attribute attribute = userEntry.getAttribute(email); if (attribute != null && attribute.hasValue()) { user.emailAddress = attribute.getValue(); + } else { + // issue-456/ticket-134 + // allow LDAP to delete an email address + user.emailAddress = null; } } } |