diff options
| author | James Moger <james.moger@gitblit.com> | 2014-09-08 13:57:53 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-09-08 13:57:53 -0400 |
| commit | 0ff8437e4af58a4e75b42248610a486986acfa93 (patch) | |
| tree | 51edcd3e84aedb8bd227a0a73cf4a2a304515694 | |
| parent | 14181da41a98817aef2b528f92d58613e61e495f (diff) | |
| parent | 2f0fe2263e73f9bc04d043757883fa0aed3c2669 (diff) | |
| download | gitblit-0ff8437e4af58a4e75b42248610a486986acfa93.tar.gz gitblit-0ff8437e4af58a4e75b42248610a486986acfa93.zip | |
Merge branch 'ticket/134' into develop
| -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; } } } |