mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-15 03:01:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#399: timelimit/timeout handling

Browse Source 
ITS#400: LDAP_TIMEOUT handling
This commit is contained in:
Kurt Zeilenga 1999-12-16 00:41:18 +00:00
parent 6253e7c278
commit 30ffb54064
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libraries/libldap/search.c
View File

@ -98,12 +98,21 @@ ldap_search_ext(
Debug( LDAP_DEBUG_TRACE, "ldap_search_ext\n", 0, 0, 0 ); Debug( LDAP_DEBUG_TRACE, "ldap_search_ext\n", 0, 0, 0 );
/* /*
* if timeout is provided, use only tv_sec as timelimit. * if timeout is provided, both tv_sec and tv_usec must
* otherwise, use default. * be non-zero
*/ */
timelimit = (timeout != NULL) if( timeout != NULL ) {
? timeout->tv_sec if( timeout->tv_sec == 0 && timeout->tv_usec == 0 ) {
: -1; return LDAP_PARAM_ERROR;
}
/* timelimit must be non-zero if timeout is provided */
timelimit = timeout->tv_sec != 0 ? timeout->tv_sec : 1;
} else {
/* no timeout, no timelimit */
timelimit = -1;
}
ber = ldap_build_search_req( ld, base, scope, filter, attrs, ber = ldap_build_search_req( ld, base, scope, filter, attrs,
attrsonly, sctrls, cctrls, timelimit, sizelimit ); attrsonly, sctrls, cctrls, timelimit, sizelimit );
@ -157,8 +166,12 @@ ldap_search_ext_s(
return( rc ); return( rc );
} }
if ( ldap_result( ld, msgid, 1, timeout, res ) == -1 ) rc = ldap_result( ld, msgid, 1, timeout, res );
if( rc <= 0 ) {
/* error(-1) or timeout(0) */
return( ld->ld_errno ); return( ld->ld_errno );
}
return( ldap_result2error( ld, *res, 0 ) ); return( ldap_result2error( ld, *res, 0 ) );
} }
@ -348,7 +361,6 @@ static int ldap_is_attr_oid ( const char *attr )
} }
return digit; return digit;
} }
static int ldap_is_attr_desc ( const char *attr ) static int ldap_is_attr_desc ( const char *attr )