summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2009-12-22 16:06:17 +0100
committerVolker Lendecke <vl@samba.org>2009-12-22 16:07:58 +0100
commit47bee67c054a0d2995ee391054435cbcfdfcd6da (patch)
treefc67adbdc921db13603b661c7f4cb604943fa37f
parent528c150d558fbd239c3d8e6b466879a5a5de76c6 (diff)
downloadsamba-47bee67c054a0d2995ee391054435cbcfdfcd6da.tar.gz
samba-47bee67c054a0d2995ee391054435cbcfdfcd6da.tar.bz2
samba-47bee67c054a0d2995ee391054435cbcfdfcd6da.zip
s3: Restore correct timeouts for SMB requests
-rw-r--r--source3/libsmb/async_smb.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c
index ce225f4e00..8b9cf091c6 100644
--- a/source3/libsmb/async_smb.c
+++ b/source3/libsmb/async_smb.c
@@ -382,6 +382,7 @@ struct tevent_req *cli_smb_req_create(TALLOC_CTX *mem_ctx,
{
struct tevent_req *result;
struct cli_smb_state *state;
+ struct timeval endtime;
if (iov_count > MAX_SMB_IOV) {
/*
@@ -422,6 +423,10 @@ struct tevent_req *cli_smb_req_create(TALLOC_CTX *mem_ctx,
}
state->iov_count = iov_count + 3;
+ endtime = timeval_current_ofs(0, cli->timeout * 1000);
+ if (!tevent_req_set_endtime(result, ev, endtime)) {
+ tevent_req_nomem(NULL, result);
+ }
return result;
}