Commit 1594417e authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#6603

parent 251e8b40
......@@ -14,6 +14,7 @@ OpenLDAP 2.4.24 Engineering
Fixed libldap GnuTLS hang on socket close (ITS#6673)
Fixed libldap sasl partial write handling (ITS#6639)
Fixed libldap referral chasing (ITS#6602)
Fixed libldap unnecessary ifdef's (ITS#6603)
Fixed libldap url parsing with NULL host (ITS#6653)
Fixed liblutil getpass prompts (ITS#6702)
Fixed ldapsearch segfault with deref (ITS#6638)
......
......@@ -549,11 +549,7 @@ ber_get_next(
}
/* Did we run out of bytes? */
if ((char *)p == ber->ber_rwptr) {
#if defined( EWOULDBLOCK )
sock_errset(EWOULDBLOCK);
#elif defined( EAGAIN )
sock_errset(EAGAIN);
#endif
return LBER_DEFAULT;
}
}
......@@ -562,11 +558,7 @@ ber_get_next(
}
if ( ber->ber_ptr == ber->ber_rwptr ) {
#if defined( EWOULDBLOCK )
sock_errset(EWOULDBLOCK);
#elif defined( EAGAIN )
sock_errset(EAGAIN);
#endif
return LBER_DEFAULT;
}
......@@ -581,11 +573,7 @@ ber_get_next(
}
/* Not enough bytes? */
if (ber->ber_rwptr - (char *)p < llen) {
#if defined( EWOULDBLOCK )
sock_errset(EWOULDBLOCK);
#elif defined( EAGAIN )
sock_errset(EAGAIN);
#endif
return LBER_DEFAULT;
}
for (i=0; i<llen; i++) {
......@@ -672,11 +660,7 @@ ber_get_next(
ber->ber_rwptr+=res;
if (res<to_go) {
#if defined( EWOULDBLOCK )
sock_errset(EWOULDBLOCK);
#elif defined( EAGAIN )
sock_errset(EAGAIN);
#endif
return LBER_DEFAULT;
}
done:
......
......@@ -503,12 +503,8 @@ nextresp3:
Debug( LDAP_DEBUG_CONNS,
"ber_get_next failed.\n", 0, 0, 0 );
#endif
#ifdef EWOULDBLOCK
if ( err == EWOULDBLOCK ) return LDAP_MSG_X_KEEP_LOOKING;
#endif
#ifdef EAGAIN
if ( err == EAGAIN ) return LDAP_MSG_X_KEEP_LOOKING;
#endif
ld->ld_errno = LDAP_SERVER_DOWN;
--lc->lconn_refcnt;
lc->lconn_status = 0;
......
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