From f4c461d7fb2556ca6e7a9f0c5ff719455c4f80de Mon Sep 17 00:00:00 2001 From: Hugo Hromic Date: Fri, 31 Jan 2020 00:17:19 +0000 Subject: [PATCH] feat(settings/ldap): preserve ReaderDN in database if empty in settings payload (#3537) * Allows to avoid changing any current value when using LDAP Anonymous Mode --- api/http/handler/settings/settings_update.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/api/http/handler/settings/settings_update.go b/api/http/handler/settings/settings_update.go index cf0994648..82e00861d 100644 --- a/api/http/handler/settings/settings_update.go +++ b/api/http/handler/settings/settings_update.go @@ -69,11 +69,16 @@ func (handler *Handler) settingsUpdate(w http.ResponseWriter, r *http.Request) * } if payload.LDAPSettings != nil { + ldapReaderDN := settings.LDAPSettings.ReaderDN ldapPassword := settings.LDAPSettings.Password + if payload.LDAPSettings.ReaderDN != "" { + ldapReaderDN = payload.LDAPSettings.ReaderDN + } if payload.LDAPSettings.Password != "" { ldapPassword = payload.LDAPSettings.Password } settings.LDAPSettings = *payload.LDAPSettings + settings.LDAPSettings.ReaderDN = ldapReaderDN settings.LDAPSettings.Password = ldapPassword }