summaryrefslogtreecommitdiffstats
path: root/app/ldap.go
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2017-11-23 06:45:22 -0800
committerJoram Wilander <jwawilander@gmail.com>2017-11-23 09:45:22 -0500
commita72b3231f088375a4b7f26bdcb36964c28c53cbd (patch)
treed088c3b27455061b9379e30c414e25ff7c65b681 /app/ldap.go
parent942b5b5cc045ce06712fc5868b299f7f082a7276 (diff)
downloadchat-a72b3231f088375a4b7f26bdcb36964c28c53cbd.tar.gz
chat-a72b3231f088375a4b7f26bdcb36964c28c53cbd.tar.bz2
chat-a72b3231f088375a4b7f26bdcb36964c28c53cbd.zip
PLT-8184 Fixing LDAP test connection button for master (#7888)
Diffstat (limited to 'app/ldap.go')
-rw-r--r--app/ldap.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/ldap.go b/app/ldap.go
index 3d4c23a6c..a01a4aeb6 100644
--- a/app/ldap.go
+++ b/app/ldap.go
@@ -25,7 +25,7 @@ func (a *App) SyncLdap() {
}
func (a *App) TestLdap() *model.AppError {
- if ldapI := a.Ldap; ldapI != nil && utils.IsLicensed() && *utils.License().Features.LDAP && *a.Config().LdapSettings.Enable {
+ if ldapI := a.Ldap; ldapI != nil && utils.IsLicensed() && *utils.License().Features.LDAP && (*a.Config().LdapSettings.Enable || *a.Config().LdapSettings.EnableSync) {
if err := ldapI.RunTest(); err != nil {
err.StatusCode = 500
return err