summaryrefslogtreecommitdiffstats
path: root/store/sql_user_store.go
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-09-01 10:03:55 -0400
committerJoram Wilander <jwawilander@gmail.com>2016-09-01 10:03:55 -0400
commit276e0189b1453b3b869f9ae834482d672b832158 (patch)
treeecac47da72f4954491c108b68b296c244a87c151 /store/sql_user_store.go
parente1e29a86d9f7da84d25fe205287eb0a9e0fecd2d (diff)
downloadchat-276e0189b1453b3b869f9ae834482d672b832158.tar.gz
chat-276e0189b1453b3b869f9ae834482d672b832158.tar.bz2
chat-276e0189b1453b3b869f9ae834482d672b832158.zip
Making LDAP FirstName and LastName fields optional. (#3919)
Diffstat (limited to 'store/sql_user_store.go')
-rw-r--r--store/sql_user_store.go2
1 files changed, 0 insertions, 2 deletions
diff --git a/store/sql_user_store.go b/store/sql_user_store.go
index 61bfa35b8..fff78c8f2 100644
--- a/store/sql_user_store.go
+++ b/store/sql_user_store.go
@@ -132,8 +132,6 @@ func (us SqlUserStore) Update(user *model.User, trustedUpdateData bool) StoreCha
user.Email = oldUser.Email
} else if user.IsLDAPUser() && !trustedUpdateData {
if user.Username != oldUser.Username ||
- user.FirstName != oldUser.FirstName ||
- user.LastName != oldUser.LastName ||
user.Email != oldUser.Email {
result.Err = model.NewLocAppError("SqlUserStore.Update", "store.sql_user.update.can_not_change_ldap.app_error", nil, "user_id="+user.Id)
storeChannel <- result