sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

Allow the timeout pointer to ldap_search_ext_s() to be NULL if lp_ldap_timeout() == 0.

Browse Source
This commit is contained in:
Jeremy Allison 2011-08-19 21:08:10 -07:00
parent da89f7e24c
commit a357d044d4
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source3/lib/smbldap.c
View File

@ -1450,6 +1450,7 @@ static int smbldap_search_ext(struct smbldap_state *ldap_state,
int to = lp_ldap_timeout();
time_t abs_endtime = calc_ldap_abs_endtime(to);
struct timeval timeout;
struct timeval *timeout_ptr = NULL;
int alarm_timer;
size_t converted_size;
@ -1487,9 +1488,12 @@ static int smbldap_search_ext(struct smbldap_state *ldap_state,
return LDAP_NO_MEMORY;
}
/* Setup timeout for the ldap_search_ext_s call - local and remote. */
timeout.tv_sec = lp_ldap_timeout();
timeout.tv_usec = 0;
/* Setup remote timeout for the ldap_search_ext_s call. */
if (to) {
timeout.tv_sec = to;
timeout.tv_usec = 0;
timeout_ptr = &timeout;
}
/* Setup alarm timeout.... Do we need both of these ? JRA.
* Yes, I think we do need both of these. The server timeout only
@ -1517,7 +1521,7 @@ static int smbldap_search_ext(struct smbldap_state *ldap_state,
rc = ldap_search_ext_s(ldap_state->ldap_struct, base, scope,
utf8_filter,
discard_const_p(char *, attrs),
attrsonly, sctrls, cctrls, &timeout,
attrsonly, sctrls, cctrls, timeout_ptr,
sizelimit, res);
if (rc != LDAP_SUCCESS) {
char *ld_error = NULL;