diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2011-05-10 17:33:11 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-05-10 12:09:07 +0200 |
| commit | 87e35421744df568721a7f9c7fa141d62665d183 (patch) | |
| tree | 1d9b22f59a0ccd830da56998de3c54c4395cccf7 | |
| parent | 0d93eb8f5501c348451a7d78e83516873d71cda0 (diff) | |
| download | samba-87e35421744df568721a7f9c7fa141d62665d183.tar.gz samba-87e35421744df568721a7f9c7fa141d62665d183.tar.bz2 samba-87e35421744df568721a7f9c7fa141d62665d183.zip | |
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 <rusty@rustcorp.com.au>
Autobuild-User: Rusty Russell <rusty@rustcorp.com.au>
Autobuild-Date: Tue May 10 12:09:07 CEST 2011 on sn-devel-104
| -rw-r--r-- | source3/libsmb/async_smb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c index 0e4392460b..82dbc74e5b 100644 --- a/source3/libsmb/async_smb.c +++ b/source3/libsmb/async_smb.c @@ -426,7 +426,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); } |