From 4f22cbc92bf131fe37dbed43a4154a43e344d8cf Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Thu, 12 May 2016 21:36:02 -0400
Subject: Stopped login code from falling back to LDAP when it's disabled
 (#2986)

---
 api/user.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'api/user.go')

diff --git a/api/user.go b/api/user.go
index 9e93ae779..559cda076 100644
--- a/api/user.go
+++ b/api/user.go
@@ -487,7 +487,7 @@ func login(c *Context, w http.ResponseWriter, r *http.Request) {
 }
 
 func getUserForLogin(loginId string, onlyLdap bool) (*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 result := <-Srv.Store.User().GetForLogin(
 		loginId,
-- 
cgit v1.2.3-1-g7c22