The branch, v3-6-test has been updated
via 76d2ce0 async_smb.c: convert cli->timeout properly
from 38155e2 A couple more off-by-one calculations with strlcpy.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 76d2ce018a0d164259ab73277af3e2012edcce71
Author: Rusty Russell <ru...@rustcorp.com.au>
Date: Tue May 10 17:33:11 2011 +0930
async_smb.c: convert cli->timeout properly
I have a test failure on my 32-bit Ubuntu system, in that
samba3.smbtorture_s3.plain(s3dc).LOCK9 immediately times out (rather than
waiting 5 seconds for the child).
Debugging revealed this code: timeout is in ms and is set to > 1000 in
various places. The code dates from 2002, and other perturbations didn't
reveal why it breaks now, but fix it anyway.
Signed-off-by: Rusty Russell <ru...@rustcorp.com.au>
Autobuild-User: Rusty Russell <ru...@rustcorp.com.au>
Autobuild-Date: Tue May 10 12:09:07 CEST 2011 on sn-devel-104
(cherry picked from commit 87e35421744df568721a7f9c7fa141d62665d183)
-----------------------------------------------------------------------
Summary of changes:
source3/libsmb/async_smb.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c
index ea3ca2d..ac6a7a2 100644
--- a/source3/libsmb/async_smb.c
+++ b/source3/libsmb/async_smb.c
@@ -425,7 +425,8 @@ struct tevent_req *cli_smb_req_create(TALLOC_CTX *mem_ctx,
state->iov_count = iov_count + 3;
if (cli->timeout) {
- endtime = timeval_current_ofs(0, cli->timeout * 1000);
+ endtime = timeval_current_ofs(cli->timeout / 1000,
+ (cli->timeout % 1000) * 1000);
if (!tevent_req_set_endtime(result, ev, endtime)) {
tevent_req_nomem(NULL, result);
}
--
Samba Shared Repository
