From 59da1044634701ed2a12b8e84f2b1a2c2a0ae092 Mon Sep 17 00:00:00 2001 From: Ilya Sulimanov Date: Thu, 27 Jul 2023 12:49:15 +0300 Subject: [PATCH] fix: update ldap admin pwd only if changed (#2146) * fix ldap pwd update * fix: linter * fix: simplify check --- object/ldap.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/object/ldap.go b/object/ldap.go index 927b41b7..0eb4ace7 100644 --- a/object/ldap.go +++ b/object/ldap.go @@ -135,12 +135,18 @@ func GetMaskedLdaps(ldaps []*Ldap, errs ...error) ([]*Ldap, error) { } func UpdateLdap(ldap *Ldap) (bool, error) { - if l, err := GetLdap(ldap.Id); err != nil { + var l *Ldap + var err error + if l, err = GetLdap(ldap.Id); err != nil { return false, nil } else if l == nil { return false, nil } + if ldap.Password == "***" { + ldap.Password = l.Password + } + affected, err := adapter.Engine.ID(ldap.Id).Cols("owner", "server_name", "host", "port", "enable_ssl", "username", "password", "base_dn", "filter", "filter_fields", "auto_sync").Update(ldap) if err != nil {