diff options
| author | Volker Lendecke <vl@samba.org> | 2014-07-03 10:05:55 +0000 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2014-07-15 12:46:16 +0200 |
| commit | 30e638f23ba38f311a6519349c27453875701ba1 (patch) | |
| tree | 002a7a0c0695a9a52dc43d19fa56944adc857a8d /source4 | |
| parent | dfe449aabf453b7baa73a39f6bc710b17e8443b3 (diff) | |
| download | samba-30e638f23ba38f311a6519349c27453875701ba1.tar.gz | |
torture4: Make raw.lock.multilock fail after 20 seconds
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Fri Jul 4 00:04:10 CEST 2014 on sn-devel-104
(cherry picked from commit 0c97b7eb5359b95c0d51a3b5524e82e34243d2d1)
The last 7 patches address bug #10684 - SMB1 blocking locks can fail
notification on unlock, causing client timeout.
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/torture/raw/lock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/torture/raw/lock.c b/source4/torture/raw/lock.c index 2d5616f3d51..e131e27acc1 100644 --- a/source4/torture/raw/lock.c +++ b/source4/torture/raw/lock.c @@ -2317,7 +2317,7 @@ static bool test_multilock(struct torture_context *tctx, * context as blocking locks with infinite timeout. */ - io.lockx.in.timeout = -1; + io.lockx.in.timeout = 20000; lock[0].pid = cli->session->pid+1; lock[1].pid = cli->session->pid+1; req = smb_raw_lock_send(cli->tree, &io); |