diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2006-06-14 23:39:18 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:09:07 -0500 |
| commit | d4c5627073865b2c36b8e283b2cdc866c7514086 (patch) | |
| tree | 6f53b0e7afcc99814513fd6160c2c39a254176f3 /source4/ldap_server | |
| parent | b7bcaec77562ee8967db01d42b84d734359467ff (diff) | |
| download | samba-d4c5627073865b2c36b8e283b2cdc866c7514086.tar.gz samba-d4c5627073865b2c36b8e283b2cdc866c7514086.tar.bz2 samba-d4c5627073865b2c36b8e283b2cdc866c7514086.zip | |
r16234: Set the request timeout from the LDAP search. Without this, the
initial request time is uninitialised, and this causes havoc later.
This also allows us to honour the client's wishes.
We should be doing this for all the operations...
Andrew Bartlett
(This used to be commit c8f5b1c9281072179cd3f3cf282cf376dca24ba0)
Diffstat (limited to 'source4/ldap_server')
| -rw-r--r-- | source4/ldap_server/ldap_backend.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source4/ldap_server/ldap_backend.c b/source4/ldap_server/ldap_backend.c index 0c8d9da45b..0dafd0f312 100644 --- a/source4/ldap_server/ldap_backend.c +++ b/source4/ldap_server/ldap_backend.c @@ -247,7 +247,9 @@ static NTSTATUS ldapsrv_SearchRequest(struct ldapsrv_call *call) lreq->async.context = res; lreq->async.callback = ldapsrv_SearchCallback; - lreq->async.timeout = 600; + + /* Copy the timeout from the incoming call */ + ldb_set_timeout(samdb, lreq, req->timelimit); ldb_ret = ldb_request(samdb, lreq); |