mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-23 08:09:34 -05:00
Revert last commit.
return 0 on timeout is actually correct.
This commit is contained in:
parent
03712dcc3e
commit
baa76b6f35
1 changed files with 6 additions and 8 deletions
|
|
@ -243,12 +243,10 @@ wait4msg(
|
||||||
|
|
||||||
#ifdef LDAP_DEBUG
|
#ifdef LDAP_DEBUG
|
||||||
if ( timeout == NULL ) {
|
if ( timeout == NULL ) {
|
||||||
Debug( LDAP_DEBUG_TRACE,
|
Debug( LDAP_DEBUG_TRACE, "wait4msg (infinite timeout), msgid %d\n",
|
||||||
"wait4msg (infinite timeout), msgid %d\n",
|
|
||||||
msgid, 0, 0 );
|
msgid, 0, 0 );
|
||||||
} else {
|
} else {
|
||||||
Debug( LDAP_DEBUG_TRACE,
|
Debug( LDAP_DEBUG_TRACE, "wait4msg (timeout %ld sec, %ld usec), msgid %d\n",
|
||||||
"wait4msg (timeout %ld sec, %ld usec), msgid %d\n",
|
|
||||||
(long) timeout->tv_sec, (long) timeout->tv_usec, msgid );
|
(long) timeout->tv_sec, (long) timeout->tv_usec, msgid );
|
||||||
}
|
}
|
||||||
#endif /* LDAP_DEBUG */
|
#endif /* LDAP_DEBUG */
|
||||||
|
|
@ -304,7 +302,7 @@ wait4msg(
|
||||||
{
|
{
|
||||||
ld->ld_errno = (rc == -1 ? LDAP_SERVER_DOWN :
|
ld->ld_errno = (rc == -1 ? LDAP_SERVER_DOWN :
|
||||||
LDAP_TIMEOUT);
|
LDAP_TIMEOUT);
|
||||||
return -1;
|
return( rc );
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( rc == -1 ) {
|
if ( rc == -1 ) {
|
||||||
|
|
@ -353,7 +351,7 @@ wait4msg(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return rc;
|
return( rc );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue