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

ITS#6388

parent d2896144
......@@ -7,6 +7,7 @@ OpenLDAP 2.4.20 Engineering
Fixed liblber to return failure on certain failures (ITS#6344)
Fixed libldap sasl buffer sizing (ITS#6327,ITS#6334)
Fixed libldap uninitialized return value (ITS#6355)
Fixed libldap unlimited timeout (ITS#6388)
Fixed liblutil constant (ITS#5909)
Added slapd handling of hex server IDs (ITS#6297)
Added slapd syncrepl contextCSN storing in subentry (ITS#6373)
......
......@@ -48,7 +48,11 @@ is a NULL pointer, the LDAP_OPT_TIMEOUT value set by
is used. With the default setting,
the select blocks indefinitely. To
effect a poll, the timeout argument should be a non-NULL
pointer, pointing to a zero-valued timeval structure. See
pointer, pointing to a zero-valued timeval structure.
To obtain the behavior of the default setting, bypassing any value set by
.BR ldap_set_option (3),
set to -1 the \fItv_sec\fP field of the \fItimeout\fP parameter.
See
.BR select (2)
for further details.
.LP
......
......@@ -276,7 +276,7 @@ wait4msg(
}
#endif /* LDAP_DEBUG */
if ( timeout != NULL ) {
if ( timeout != NULL && timeout->tv_sec != -1 ) {
tv0 = *timeout;
tv = *timeout;
tvp = &tv;
......
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