Commit 691b4dfa authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#5404

parent 6151dc05
......@@ -14,6 +14,7 @@ OpenLDAP 2.4.9 Engineering
Fixed slapd syncrepl crash on empty CSN (ITS#5432)
Fixed slapd syncrepl refreshAndPersist (ITS#5454)
Fixed slapd syncrepl modrdn processing (ITS#5397)
Fixed slapd-ldap connection handler (ITS#5404)
Fixed slapo-syncprov psearch on closed connection (ITS#5401)
Fixed slapo-syncprov psearch task delay (ITS#5405)
Fixed slapo-syncprov psearch filter identity (ITS#5418)
......
......@@ -1228,6 +1228,8 @@ ldap_back_dobind_cb(
{
ber_tag_t *tptr = op->o_callback->sc_private;
op->o_tag = *tptr;
rs->sr_tag = slap_req2res( op->o_tag );
return SLAP_CB_CONTINUE;
}
......@@ -1390,15 +1392,26 @@ retry_lock:;
lutil_sasl_freedefs( defaults );
rs->sr_err = slap_map_api2result( rs );
if ( rs->sr_err != LDAP_SUCCESS ) {
switch ( rs->sr_err ) {
case LDAP_SUCCESS:
LDAP_BACK_CONN_ISBOUND_SET( lc );
break;
case LDAP_LOCAL_ERROR:
/* list client API error codes that require
* to taint the connection */
/* FIXME: should actually retry? */
LDAP_BACK_CONN_TAINTED_SET( lc );
/* fallthru */
default:
LDAP_BACK_CONN_ISBOUND_CLEAR( lc );
rs->sr_err = slap_map_api2result( rs );
if ( sendok & LDAP_BACK_SENDERR ) {
send_ldap_result( op, rs );
}
} else {
LDAP_BACK_CONN_ISBOUND_SET( lc );
break;
}
if ( LDAP_BACK_QUARANTINE( li ) ) {
......@@ -2134,15 +2147,26 @@ ldap_back_proxy_authz_bind(
LDAP_SASL_QUIET, lutil_sasl_interact,
defaults );
rs->sr_err = slap_map_api2result( rs );
if ( rs->sr_err != LDAP_SUCCESS ) {
switch ( rs->sr_err ) {
case LDAP_SUCCESS:
LDAP_BACK_CONN_ISBOUND_SET( lc );
break;
case LDAP_LOCAL_ERROR:
/* list client API error codes that require
* to taint the connection */
/* FIXME: should actually retry? */
LDAP_BACK_CONN_TAINTED_SET( lc );
/* fallthru */
default:
LDAP_BACK_CONN_ISBOUND_CLEAR( lc );
rs->sr_err = slap_map_api2result( rs );
if ( sendok & LDAP_BACK_SENDERR ) {
send_ldap_result( op, rs );
}
} else {
LDAP_BACK_CONN_ISBOUND_SET( lc );
break;
}
lutil_sasl_freedefs( defaults );
......
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