ITS#6296

diff --git a/CHANGES b/CHANGES
index 0eb7d30380fdb79c286c33144112a6f9e8d47e2d..b70cfcead3e80ebe41db5a77a7fb293c06bcabe2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@ OpenLDAP 2.4.19 Engineering
        Fixed slapd acl cache (ITS#6287)
        Fixed slapd tools to allow -n for conversion (ITS#6258)
        Fixed slapd-ldap with null timeouts (ITS#6282)
+       Fixed slapd-ldap with strong binds with relay/translucent (ITS#6296)
        Fixed slapd-ldif buffer overflow (ITS#6303)
        Fixed slapo-auditlog comments when modifying (ITS#6286)
        Fixed slapo-dynlist lock leak (ITS#6308)

diff --git a/servers/slapd/back-ldap/bind.c b/servers/slapd/back-ldap/bind.c
index 0e062626393e95428cb611ee10d03d4da8752447..8e74ad01d68cac1e927b25ca100a30e574eb00dc 100644 (file)
--- a/servers/slapd/back-ldap/bind.c
+++ b/servers/slapd/back-ldap/bind.c
@@ -277,6 +277,8 @@ retry:;
        ldap_back_controls_free( op, rs, &ctrls );
 
        if ( rc == LDAP_SUCCESS ) {
+               op->o_conn->c_authz_cookie = op->o_bd->be_private;
+
                /* If defined, proxyAuthz will be used also when
                 * back-ldap is the authorizing backend; for this
                 * purpose, after a successful bind the connection
@@ -1523,6 +1525,7 @@ retry:;
        rc = ldap_back_op_result( lc, op, rs, msgid,
                -1, ( sendok | LDAP_BACK_BINDING ) );
        if ( rc == LDAP_SUCCESS ) {
+               op->o_conn->c_authz_cookie = op->o_bd->be_private;
                LDAP_BACK_CONN_ISBOUND_SET( lc );
        }
 
@@ -2249,6 +2252,7 @@ ldap_back_proxy_authz_bind(
                 * so that referral chasing is attempted using the right
                 * identity */
                LDAP_BACK_CONN_ISBOUND_SET( lc );
+               op->o_conn->c_authz_cookie = op->o_bd->be_private;
                if ( !BER_BVISNULL( binddn ) ) {
                        ber_bvreplace( &lc->lc_bound_ndn, binddn );
                }