summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2003-03-13 07:58:54 +0000
committerJeremy Allison <jra@samba.org>2003-03-13 07:58:54 +0000
commit5ca8254f747dd28ba1aba459d95f3567388bf5fb (patch)
treeebc612556a77b93d12dd72a9134341c324645d4c
parent71e94ca9046100fcfca409c77540fa046ea1577b (diff)
downloadsamba-5ca8254f747dd28ba1aba459d95f3567388bf5fb.tar.gz
samba-5ca8254f747dd28ba1aba459d95f3567388bf5fb.tar.bz2
samba-5ca8254f747dd28ba1aba459d95f3567388bf5fb.zip
Merge from HEAD. 'win2000 can take much longer than the specified time to respond to a
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)
-rw-r--r--source3/libsmb/clifile.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c
index f61787abde..8e84963c09 100644
--- 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)) {