From 4f22cbc92bf131fe37dbed43a4154a43e344d8cf Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Thu, 12 May 2016 21:36:02 -0400 Subject: Stopped login code from falling back to LDAP when it's disabled (#2986) --- api/authentication.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'api/authentication.go') diff --git a/api/authentication.go b/api/authentication.go index 9243947ad..d30fc0a1f 100644 --- a/api/authentication.go +++ b/api/authentication.go @@ -127,7 +127,7 @@ func checkUserNotDisabled(user *model.User) *model.AppError { } func authenticateUser(user *model.User, password, mfaToken string) (*model.User, *model.AppError) { - ldapAvailable := *utils.Cfg.LdapSettings.Enable && einterfaces.GetLdapInterface() != nil + ldapAvailable := *utils.Cfg.LdapSettings.Enable && einterfaces.GetLdapInterface() != nil && utils.IsLicensed && *utils.License.Features.LDAP if user.AuthService == model.USER_AUTH_SERVICE_LDAP { if !ldapAvailable { -- cgit v1.2.3-1-g7c22