diff options
| author | Jesús Espino <jespinog@gmail.com> | 2018-02-07 18:05:23 +0100 |
|---|---|---|
| committer | Jesús Espino <jespinog@gmail.com> | 2018-02-07 18:05:23 +0100 |
| commit | a04b02081a77497ecfc7a5ae9ffb0ca28404dd0e (patch) | |
| tree | 985cb699d278f68522b08b60b1e7b84e0bd243fc /app/user.go | |
| parent | 7941c30117efe1b957ac0458c2f0479e3824196d (diff) | |
| parent | 7bd298ceaa24c0721e0acd65692cb2d1ca4983f3 (diff) | |
| download | chat-a04b02081a77497ecfc7a5ae9ffb0ca28404dd0e.tar.gz chat-a04b02081a77497ecfc7a5ae9ffb0ca28404dd0e.tar.bz2 chat-a04b02081a77497ecfc7a5ae9ffb0ca28404dd0e.zip | |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-1
Diffstat (limited to 'app/user.go')
| -rw-r--r-- | app/user.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/user.go b/app/user.go index 156503fb0..70ed83c0b 100644 --- a/app/user.go +++ b/app/user.go @@ -374,7 +374,8 @@ func (a *App) GetUserByAuth(authData *string, authService string) (*model.User, } func (a *App) GetUserForLogin(loginId string, onlyLdap bool) (*model.User, *model.AppError) { - ldapAvailable := *a.Config().LdapSettings.Enable && a.Ldap != nil && utils.IsLicensed() && *utils.License().Features.LDAP + license := a.License() + ldapAvailable := *a.Config().LdapSettings.Enable && a.Ldap != nil && license != nil && *license.Features.LDAP if result := <-a.Srv.Store.User().GetForLogin( loginId, |