Change username to come from simpleUserName (from login screen) instead of CN.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/com/gitblit/LdapUserService.java b/src/com/gitblit/LdapUserService.java
index c67d17b1..9fcef9d6 100644
--- a/src/com/gitblit/LdapUserService.java
+++ b/src/com/gitblit/LdapUserService.java
@@ -148,7 +148,7 @@ public class LdapUserService extends GitblitUserService {
 					

 					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 @@ public class LdapUserService extends GitblitUserService {
 		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;