diff options
| author | Andrew Tridgell <tridge@samba.org> | 2003-06-10 14:02:46 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2003-06-10 14:02:46 +0000 |
| commit | d286e44209006e4176a3dd08d73f28a390d7922d (patch) | |
| tree | cc67e5d16569f193de87eea8873771beae242a68 | |
| parent | 7c6aee526aa2f4636e9c1e9694e80e10e875bef7 (diff) | |
| download | samba-d286e44209006e4176a3dd08d73f28a390d7922d.tar.gz samba-d286e44209006e4176a3dd08d73f28a390d7922d.tar.bz2 samba-d286e44209006e4176a3dd08d73f28a390d7922d.zip | |
fixed libsmb code to set correct timeout in cli_state when waiting for
a blocking lock
(This used to be commit 3515476fe436132d4569ac9067ea6195ab087e77)
| -rw-r--r-- | source3/libsmb/clifile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c index b771e135f4..f021076a46 100644 --- a/source3/libsmb/clifile.c +++ b/source3/libsmb/clifile.c @@ -600,8 +600,8 @@ NTSTATUS cli_locktype(struct cli_state *cli, int fnum, /**************************************************************************** Lock a file. + note that timeout is in units of 2 milliseconds ****************************************************************************/ - BOOL cli_lock(struct cli_state *cli, int fnum, uint32 offset, uint32 len, int timeout, enum brl_type lock_type) { @@ -636,7 +636,7 @@ BOOL cli_lock(struct cli_state *cli, int fnum, cli_send_smb(cli); if (timeout != 0) { - cli->timeout = (timeout == -1) ? 0x7FFFFFFF : (timeout + 10*1000); + cli->timeout = (timeout == -1) ? 0x7FFFFFFF : (timeout*2 + 5*1000); } if (!cli_receive_smb(cli)) { |