cleanup, make sure users are always synced with ldap

pkg/login/ext_user.go

@@ -68,12 +68,7 @@ func UpsertUser(cmd *m.UpsertUserCommand) error {
 		}
 	}
 
-	err = syncOrgRoles(cmd.Result, extUser)
-	if err != nil {
-		return err
-	}
-
-	return nil
+	return syncOrgRoles(cmd.Result, extUser)
 }
 
 func createUser(extUser *m.ExternalUserInfo) (*m.User, error) {

pkg/middleware/auth_proxy.go

@@ -65,6 +65,8 @@ func initContextWithAuthProxy(ctx *m.ReqContext, orgID int64) bool {
 		query.UserId = getRequestUserId(ctx)
 		// if we're using ldap, pass authproxy login name to ldap user sync
 	} else if setting.LdapEnabled {
+		ctx.Session.Delete(session.SESS_KEY_LASTLDAPSYNC)
+
 		syncQuery := &m.LoginUserQuery{
 			ReqContext: ctx,
 			Username:   proxyHeaderValue,