From 5d7e34c94b56c4b0abb0c3d1702f2b5feb8d2904 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Tue, 3 May 2016 15:27:00 -0400 Subject: Fixing ldap ability to modify user fields (#2868) --- store/sql_user_store.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'store') diff --git a/store/sql_user_store.go b/store/sql_user_store.go index 006ea734b..07e974559 100644 --- a/store/sql_user_store.go +++ b/store/sql_user_store.go @@ -95,7 +95,7 @@ func (us SqlUserStore) Save(user *model.User) StoreChannel { return storeChannel } -func (us SqlUserStore) Update(user *model.User, allowActiveUpdate bool) StoreChannel { +func (us SqlUserStore) Update(user *model.User, trustedUpdateData bool) StoreChannel { storeChannel := make(StoreChannel) @@ -129,14 +129,14 @@ func (us SqlUserStore) Update(user *model.User, allowActiveUpdate bool) StoreCha user.MfaSecret = oldUser.MfaSecret user.MfaActive = oldUser.MfaActive - if !allowActiveUpdate { + if !trustedUpdateData { user.Roles = oldUser.Roles user.DeleteAt = oldUser.DeleteAt } if user.IsOAuthUser() { user.Email = oldUser.Email - } else if user.IsLDAPUser() { + } else if user.IsLDAPUser() && !trustedUpdateData { if user.Username != oldUser.Username || user.FirstName != oldUser.FirstName || user.LastName != oldUser.LastName || -- cgit v1.2.3-1-g7c22