mirror of
https://github.com/samba-team/samba.git
synced 2024-12-25 23:21:54 +03:00
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 commit is contained in:
parent
40def80d43
commit
41571a69e0
@ -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)) {
|
||||
|
Loading…
Reference in New Issue
Block a user