upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-23 15:23:00 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

retry on ldap_result() with a timeout

Browse source
This commit is contained in:
Pierangelo Masarati 2005-01-08 09:19:51 +00:00
parent 4b4bdc6bf6
commit 4d8267595f
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
servers/slapd/back-ldap/bind.c
View file

@ -428,17 +428,30 @@ ldap_back_op_result(
* to a successful state, get the error from the
* remote server response */
if ( ERR_OK( rs->sr_err ) ) {
int rc;
struct timeval tv = { 0, 0 };
retry:;
/* if result parsing fails, note the failure reason */
if ( ldap_result( lc->lc_ld, msgid, 1, NULL, &res ) == -1 ) {
switch ( ldap_result( lc->lc_ld, msgid, 1, &tv, &res ) ) {
case 0:
tv.tv_sec = 0;
tv.tv_usec = 100000; /* 0.1 s */
ldap_pvt_thread_yield();
goto retry;
case -1:
ldap_get_option( lc->lc_ld, LDAP_OPT_ERROR_NUMBER,
&rs->sr_err );
break;
/* otherwise get the result; if it is not
* LDAP_SUCCESS, record it in the reply
* structure (this includes
* LDAP_COMPARE_{TRUE|FALSE}) */
} else {
int rc = ldap_parse_result( lc->lc_ld, res, &rs->sr_err,
default:
rc = ldap_parse_result( lc->lc_ld, res, &rs->sr_err,
&match, &text, NULL, NULL, 1 );
rs->sr_text = text;
if ( rc != LDAP_SUCCESS ) {