From b2ad52376530c59bc40f443be2b2461f26935731 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Fri, 18 May 2018 13:07:52 -0700 Subject: Fixing TE login. (#8826) --- app/login.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'app/login.go') diff --git a/app/login.go b/app/login.go index a07056c1e..3001e1f4d 100644 --- a/app/login.go +++ b/app/login.go @@ -67,9 +67,11 @@ func (a *App) GetUserForLogin(id, loginId string) (*model.User, *model.AppError) return result.Data.(*model.User), nil } - // Try to get the user with LDAP - if user, err := a.Ldap.GetUser(loginId); err == nil { - return user, nil + // Try to get the user with LDAP if enabled + if *a.Config().LdapSettings.Enable && a.Ldap != nil { + if user, err := a.Ldap.GetUser(loginId); err == nil { + return user, nil + } } return nil, model.NewAppError("GetUserForLogin", "store.sql_user.get_for_login.app_error", nil, "", http.StatusBadRequest) -- cgit v1.2.3-1-g7c22