upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-24 16:49:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

by now, make sure no timeout is used (ITS#6282)

Browse source
This commit is contained in:
Pierangelo Masarati 2009-09-08 07:56:43 +00:00
parent 08b43a89f6
commit 393612b8e1
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
servers/slapd/back-ldap/config.c
View file

@ -2086,7 +2086,10 @@ ldap_back_exop_whoami(
retry:
rs->sr_err = ldap_whoami( lc->lc_ld, ctrls, NULL, &msgid );
if ( rs->sr_err == LDAP_SUCCESS ) {
if ( ldap_result( lc->lc_ld, msgid, LDAP_MSG_ALL, NULL, &res ) == -1 ) {
/* by now, make sure no timeout is used (ITS#6282) */
struct timeval tv;
tv.tv_sec = -1;
if ( ldap_result( lc->lc_ld, msgid, LDAP_MSG_ALL, &tv, &res ) == -1 ) {
ldap_get_option( lc->lc_ld, LDAP_OPT_ERROR_NUMBER,
&rs->sr_err );
if ( rs->sr_err == LDAP_SERVER_DOWN && doretry ) {

10
servers/slapd/back-ldap/extended.c
View file

@ -190,7 +190,10 @@ retry:
if ( rc == LDAP_SUCCESS ) {
/* TODO: set timeout? */
if ( ldap_result( lc->lc_ld, msgid, LDAP_MSG_ALL, NULL, &res ) == -1 ) {
/* by now, make sure no timeout is used (ITS#6282) */
struct timeval tv;
tv.tv_sec = -1;
if ( ldap_result( lc->lc_ld, msgid, LDAP_MSG_ALL, &tv, &res ) == -1 ) {
ldap_get_option( lc->lc_ld, LDAP_OPT_ERROR_NUMBER, &rc );
rs->sr_err = rc;
@ -316,7 +319,10 @@ retry:
if ( rc == LDAP_SUCCESS ) {
/* TODO: set timeout? */
if ( ldap_result( lc->lc_ld, msgid, LDAP_MSG_ALL, NULL, &res ) == -1 ) {
/* by now, make sure no timeout is used (ITS#6282) */
struct timeval tv;
tv.tv_sec = -1;
if ( ldap_result( lc->lc_ld, msgid, LDAP_MSG_ALL, &tv, &res ) == -1 ) {
ldap_get_option( lc->lc_ld, LDAP_OPT_ERROR_NUMBER, &rc );
rs->sr_err = rc;