John Crygier
2012-04-18 f898a655a912ae76585339dfa04f018df552fb8a
Change username to come from simpleUserName (from login screen) instead of CN.
1 files modified
6 ■■■■ changed files
src/com/gitblit/LdapUserService.java 6 ●●●● patch | view | raw | blame | history
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;