diff options
author | Christopher Speller <crspeller@gmail.com> | 2016-05-17 17:51:42 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-05-17 17:51:42 -0400 |
commit | edd453c6cd6daf1b4c6e1ea7ce2721db16e25214 (patch) | |
tree | b5d616a061d949fc894fe07f03c06d2b20338476 /model | |
parent | 0fe75cb7826944a3352705d5e78eba1d12cc213a (diff) | |
parent | ac509b114df1c1b4b841eded74fb797805e0162d (diff) | |
download | chat-edd453c6cd6daf1b4c6e1ea7ce2721db16e25214.tar.gz chat-edd453c6cd6daf1b4c6e1ea7ce2721db16e25214.tar.bz2 chat-edd453c6cd6daf1b4c6e1ea7ce2721db16e25214.zip |
Merge branch 'release-3.0'
Diffstat (limited to 'model')
-rw-r--r-- | model/config.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/model/config.go b/model/config.go index eb25948fd..9a7e3b7c5 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 &o.LdapSettings != nil && len(*o.LdapSettings.BindPassword) > 0 { + if o.LdapSettings.BindPassword != nil && len(*o.LdapSettings.BindPassword) > 0 { *o.LdapSettings.BindPassword = FAKE_SETTING } |