diff options
author | Joram Wilander <jwawilander@gmail.com> | 2016-03-31 08:21:33 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2016-03-31 08:21:33 -0400 |
commit | 43aa7e4c792b5ee2cbda4c853eeed4fadb8a93b3 (patch) | |
tree | c96104c45b4255abe285a340c626ef8ad779a8e9 | |
parent | dd20f2c697abf20d752de0e10ba1e98f8cf2b90f (diff) | |
parent | 9a82d5d3c5a3f06983f5d7f6391932cf439e44a9 (diff) | |
download | chat-43aa7e4c792b5ee2cbda4c853eeed4fadb8a93b3.tar.gz chat-43aa7e4c792b5ee2cbda4c853eeed4fadb8a93b3.tar.bz2 chat-43aa7e4c792b5ee2cbda4c853eeed4fadb8a93b3.zip |
Merge pull request #2585 from mattermost/fix-ldap-email
Fix for ldap ability to change email
-rw-r--r-- | model/user.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/model/user.go b/model/user.go index f8f2fdb70..7622e48f0 100644 --- a/model/user.go +++ b/model/user.go @@ -352,7 +352,7 @@ func IsInRole(userRoles string, inRole string) bool { } func (u *User) IsSSOUser() bool { - if len(u.AuthData) != 0 && len(u.AuthService) != 0 { + if len(u.AuthData) != 0 && len(u.AuthService) != 0 && u.AuthService != USER_AUTH_SERVICE_LDAP { return true } return false |