Commit ce3c25ae authored by Pierangelo Masarati's avatar Pierangelo Masarati
Browse files

import fix to ITS#5185

parent 569629cb
...@@ -18,6 +18,7 @@ OpenLDAP 2.4.6 Engineering ...@@ -18,6 +18,7 @@ OpenLDAP 2.4.6 Engineering
Fixed slapd-ldif directory separators in DN (ITS#5172) Fixed slapd-ldif directory separators in DN (ITS#5172)
Fixed slapd-meta leak when binding as rootdn (ITS#5155) Fixed slapd-meta leak when binding as rootdn (ITS#5155)
Fixed slapd-meta conn caching on bind failure (ITS#5154) Fixed slapd-meta conn caching on bind failure (ITS#5154)
Fixed slapd-meta bind timeout assertion (ITS#5185)
Fixed slapd-monitor database registration (ITS#4965) Fixed slapd-monitor database registration (ITS#4965)
Fixed slapo-chain double-free (ITS#5137) Fixed slapo-chain double-free (ITS#5137)
Fixed slapo-dynlist entry release (ITS#5135) Fixed slapo-dynlist entry release (ITS#5135)
......
...@@ -1181,7 +1181,8 @@ retry_lock:; ...@@ -1181,7 +1181,8 @@ retry_lock:;
case LDAP_REQ_BIND: case LDAP_REQ_BIND:
/* if bound as rootdn, the backend must bind to all targets /* if bound as rootdn, the backend must bind to all targets
* with the administrative identity */ * with the administrative identity
* (unless pseoudoroot-bind-defer is TRUE) */
if ( op->orb_method == LDAP_AUTH_SIMPLE && be_isroot_pw( op ) ) { if ( op->orb_method == LDAP_AUTH_SIMPLE && be_isroot_pw( op ) ) {
op_type = META_OP_REQUIRE_ALL; op_type = META_OP_REQUIRE_ALL;
} }
...@@ -1239,6 +1240,9 @@ retry_lock:; ...@@ -1239,6 +1240,9 @@ retry_lock:;
rs, mc, i, LDAP_BACK_CONN_ISPRIV( &mc_curr ), rs, mc, i, LDAP_BACK_CONN_ISPRIV( &mc_curr ),
LDAP_BACK_DONTSEND, !new_conn ); LDAP_BACK_DONTSEND, !new_conn );
if ( candidates[ i ].sr_err == LDAP_SUCCESS ) { if ( candidates[ i ].sr_err == LDAP_SUCCESS ) {
if ( new_conn && ( sendok & LDAP_BACK_BINDING ) ) {
LDAP_BACK_CONN_BINDING_SET( &mc->mc_conns[ i ] );
}
META_CANDIDATE_SET( &candidates[ i ] ); META_CANDIDATE_SET( &candidates[ i ] );
ncandidates++; ncandidates++;
...@@ -1428,6 +1432,10 @@ retry_lock2:; ...@@ -1428,6 +1432,10 @@ retry_lock2:;
return NULL; return NULL;
} }
if ( new_conn && ( sendok & LDAP_BACK_BINDING ) ) {
LDAP_BACK_CONN_BINDING_SET( &mc->mc_conns[ i ] );
}
candidates[ i ].sr_err = LDAP_SUCCESS; candidates[ i ].sr_err = LDAP_SUCCESS;
META_CANDIDATE_SET( &candidates[ i ] ); META_CANDIDATE_SET( &candidates[ i ] );
ncandidates++; ncandidates++;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment