summaryrefslogtreecommitdiffstats
path: root/model
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-04-07 19:42:22 -0400
committerCorey Hulen <corey@hulen.com>2016-04-07 16:42:22 -0700
commit556f2a93fbcbca0b81705145ce6150261d1861b0 (patch)
tree152f3777e02f48c49b6b0e4726fa0d96108e2659 /model
parent5cf982e0217a968d5c10ee182c3f02f6edffe567 (diff)
downloadchat-556f2a93fbcbca0b81705145ce6150261d1861b0.tar.gz
chat-556f2a93fbcbca0b81705145ce6150261d1861b0.tar.bz2
chat-556f2a93fbcbca0b81705145ce6150261d1861b0.zip
Fixing config for new LDAP settings (#2662)
Diffstat (limited to 'model')
-rw-r--r--model/config.go10
1 files changed, 10 insertions, 0 deletions
diff --git a/model/config.go b/model/config.go
index 29bc536dc..a8974359d 100644
--- a/model/config.go
+++ b/model/config.go
@@ -440,6 +440,16 @@ func (o *Config) SetDefaults() {
o.ComplianceSettings.EnableDaily = new(bool)
*o.ComplianceSettings.EnableDaily = false
}
+
+ if o.LdapSettings.ConnectionSecurity == nil {
+ o.LdapSettings.ConnectionSecurity = new(string)
+ *o.LdapSettings.ConnectionSecurity = ""
+ }
+
+ if o.LdapSettings.SkipCertificateVerification == nil {
+ o.LdapSettings.SkipCertificateVerification = new(bool)
+ *o.LdapSettings.SkipCertificateVerification = false
+ }
}
func (o *Config) IsValid() *AppError {