Merge d2d8a413a9 into 7be5935c55

models/login_source.go

@@ -393,6 +393,19 @@ func LoginViaLDAP(user *User, login, password string, source *LoginSource, autoR
 		return nil, ErrUserNotExist{0, login, 0}
 	}
 
+	// Update User if exist
+	isExist, err := IsUserExist(0, sr.Username)
+	if err != nil {
+		return nil, err
+	} else if isExist {
+		user.FullName = composeFullName(sr.Name, sr.Surname, sr.Username)
+		user.Email = sr.Mail
+		// Change existing admin flag only if AdminFilter option is set
+		if len(source.LDAP().AdminFilter) > 0 {
+			user.IsAdmin = sr.IsAdmin
+		}
+	}
+
 	if !autoRegister {
 		return user, nil
 	}