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

diff --git a/src/com/gitblit/LdapUserService.java b/src/com/gitblit/LdapUserService.java
index c67d17b152bcb56e9e0d21a3ee786be02fab6091..9fcef9d65ec586189e810213b4d27f4e74cfe7ca 100644 (file)
--- a/src/com/gitblit/LdapUserService.java
+++ b/src/com/gitblit/LdapUserService.java
@@ -148,7 +148,7 @@ public class LdapUserService extends GitblitUserService {
                                        \r
                                        UserModel user = getUserModel(simpleUsername);\r
                                        if (user == null)       // create user object for new authenticated user\r
-                                               user = createUserFromLdap(loggingInUser);\r
+                                               user = createUserFromLdap(simpleUsername, loggingInUser);\r
                                        \r
                                        user.password = "StoredInLDAP";\r
                                        \r
@@ -224,8 +224,8 @@ public class LdapUserService extends GitblitUserService {
                return answer;          \r
        }\r
        \r
-       private UserModel createUserFromLdap(SearchResultEntry userEntry) {\r
-               UserModel answer = new UserModel(userEntry.getAttributeValue("cn"));\r
+       private UserModel createUserFromLdap(String simpleUserName, SearchResultEntry userEntry) {\r
+               UserModel answer = new UserModel(simpleUserName);\r
                //If attributes other than user name ever from from LDAP, this is where to get them\r
                \r
                return answer;\r