From f898a655a912ae76585339dfa04f018df552fb8a Mon Sep 17 00:00:00 2001
From: John Crygier <john.crygier@aon.com>
Date: Wed, 18 Apr 2012 16:48:00 -0400
Subject: [PATCH] Change username to come from simpleUserName (from login screen) instead of CN.
---
src/com/gitblit/LdapUserService.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/com/gitblit/LdapUserService.java b/src/com/gitblit/LdapUserService.java
index c67d17b..9fcef9d 100644
--- a/src/com/gitblit/LdapUserService.java
+++ b/src/com/gitblit/LdapUserService.java
@@ -148,7 +148,7 @@
UserModel user = getUserModel(simpleUsername);
if (user == null) // create user object for new authenticated user
- user = createUserFromLdap(loggingInUser);
+ user = createUserFromLdap(simpleUsername, loggingInUser);
user.password = "StoredInLDAP";
@@ -224,8 +224,8 @@
return answer;
}
- private UserModel createUserFromLdap(SearchResultEntry userEntry) {
- UserModel answer = new UserModel(userEntry.getAttributeValue("cn"));
+ private UserModel createUserFromLdap(String simpleUserName, SearchResultEntry userEntry) {
+ UserModel answer = new UserModel(simpleUserName);
//If attributes other than user name ever from from LDAP, this is where to get them
return answer;
--
Gitblit v1.9.1