mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

invalidate connection handler when ldap_sasl_interactive_bind_s() for internal error (ITS#5404); fix response tag

Browse Source
This commit is contained in:
Pierangelo Masarati 2008-03-08 15:41:17 +00:00
parent 44b1af6e65
commit ec8466ec83
1 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
servers/slapd/back-ldap/bind.c
View File

@ -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 );