Merge from HEAD. 'win2000 can take much longer than the specified time to respond...

lock - so to make the torture tests valid I give it a grace time of 10
seconds instead of 2'
Jeremy.
(This used to be commit 41571a69e04838c00de7d4a528c59cd1e88919d0)

diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c
index f61787abde2b7c13b248d4ec408152f41cb6895c..8e84963c09475d182d98b3d6db5ffc25b49ad40b 100644 (file)
--- a/source3/libsmb/clifile.c
+++ b/source3/libsmb/clifile.c
@@ -633,7 +633,7 @@ BOOL cli_lock(struct cli_state *cli, int fnum,
        cli_send_smb(cli);
 
        if (timeout != 0) {
-               cli->timeout = (timeout == -1) ? 0x7FFFFFFF : (timeout + 2*1000);
+               cli->timeout = (timeout == -1) ? 0x7FFFFFFF : (timeout + 10*1000);
        }
 
        if (!cli_receive_smb(cli)) {