temporary fix to ITS#5154

diff --git a/CHANGES b/CHANGES
index 376174688f4fa6ec9602aace2faefe5077f51bce..1410e2a64c4a9fa051d2854272ba32adeca84bdf 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -7,7 +7,8 @@ OpenLDAP 2.3.39 Engineering
        Fixed slapd ACL sets memory handling (ITS#4873)
        Fixed slapd ordered values add normalization issue (ITS#5136)
        Fixed slapd-bdb DB_CONFIG conversion bug (ITS#5118)
-       Fixed slapd-ldap SASL idassert w/o autchId
+       Fixed slapd-ldap SASL idassert w/o authcId
+       Fixed slapd-meta conn caching on bind failure (ITS#5154)
        Fixed slapd-sql concurrency issue (ITS#5095)
        Fixed slapo-chain double-free (ITS#5137)
        Fixed slapo-pcache and -rwm interaction fix (ITS#4991) 

diff --git a/servers/slapd/back-meta/bind.c b/servers/slapd/back-meta/bind.c
index 717462ffab24a39d0e70cca2a27bce17ff692809..495481bf29e3ce71ebc23e5466eefb4320eaa7d7 100644 (file)
--- a/servers/slapd/back-meta/bind.c
+++ b/servers/slapd/back-meta/bind.c
@@ -189,6 +189,10 @@ meta_back_bind( Operation *op, SlapReply *rs )
 
                if ( lerr != LDAP_SUCCESS ) {
                        rc = rs->sr_err = lerr;
+                       /* Mark the meta_conn struct as tainted so
+                        * it'll be freed by meta_conn_back_destroy below */
+                       LDAP_BACK_CONN_TAINTED_SET( mc );
+
                        /* FIXME: in some cases (e.g. unavailable)
                         * do not assume it's not candidate; rather
                         * mark this as an error to be eventually