From 69b395d2c1aff0d53d077d9fcb72adf8a3dbb4d5 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 10 Mar 2002 23:16:15 +0000 Subject: better handling of a zero timeout in cli_lock (This used to be commit 56662a75f58d35cec1a5b2d6c9a4315d95a22420) --- source3/libsmb/clifile.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'source3') diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c index 71b3f44b0d..102114f871 100644 --- a/source3/libsmb/clifile.c +++ b/source3/libsmb/clifile.c @@ -579,7 +579,9 @@ BOOL cli_lock(struct cli_state *cli, int fnum, cli_send_smb(cli); - cli->timeout = (timeout == -1) ? 0x7FFFFFFF : (timeout + 2*1000); + if (timeout != 0) { + cli->timeout = (timeout == -1) ? 0x7FFFFFFF : (timeout + 2*1000); + } if (!cli_receive_smb(cli)) { cli->timeout = saved_timeout; @@ -680,7 +682,9 @@ BOOL cli_lock64(struct cli_state *cli, int fnum, cli_setup_bcc(cli, p); cli_send_smb(cli); - cli->timeout = (timeout == -1) ? 0x7FFFFFFF : (timeout + 2*1000); + if (timeout != 0) { + cli->timeout = (timeout == -1) ? 0x7FFFFFFF : (timeout + 5*1000); + } if (!cli_receive_smb(cli)) { cli->timeout = saved_timeout; -- cgit