summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorenahum <nahumhbl@gmail.com>2016-05-05 16:36:17 -0300
committerCorey Hulen <corey@hulen.com>2016-05-05 12:36:17 -0700
commit3a0734ec9d3f8f8e6e9090e45138a11ca838d9ff (patch)
treef373b75fec8b85b09c9fc0f7af13728a5230bfd9
parented3162a59d522981cd6b63e578d31e0a96b5d2ff (diff)
downloadchat-3a0734ec9d3f8f8e6e9090e45138a11ca838d9ff.tar.gz
chat-3a0734ec9d3f8f8e6e9090e45138a11ca838d9ff.tar.bz2
chat-3a0734ec9d3f8f8e6e9090e45138a11ca838d9ff.zip
PLT-2798 Config sanitation fails when no LDAP Settings are present in config.json (#2882)
-rw-r--r--model/config.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/model/config.go b/model/config.go
index 01b4a886a..eb25948fd 100644
--- a/model/config.go
+++ b/model/config.go
@@ -615,7 +615,7 @@ func (o *Config) GetSanitizeOptions() map[string]bool {
}
func (o *Config) Sanitize() {
- if len(*o.LdapSettings.BindPassword) > 0 {
+ if &o.LdapSettings != nil && len(*o.LdapSettings.BindPassword) > 0 {
*o.LdapSettings.BindPassword = FAKE_SETTING
}