From 4011b6048cb5f31bdabb5daad94a67ead7869be7 Mon Sep 17 00:00:00 2001
From: Southparkfan <Southparkfan@users.noreply.github.com>
Date: Thu, 26 Feb 2015 08:39:57 -0500
Subject: [PATCH] Fix spelling mistake
---
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