From ad3d2ca074cd3cf9c554f57c53b22f0de6abede9 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Wed, 17 Sep 2014 12:21:47 -0400 Subject: [PATCH] Merge branch 'ticket/180' into develop --- 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 a4d7bb0..5690073 100644 --- a/src/main/java/com/gitblit/auth/LdapAuthProvider.java +++ b/src/main/java/com/gitblit/auth/LdapAuthProvider.java @@ -427,6 +427,10 @@ 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; } } } -- Gitblit v1.9.1