summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2019-08-15 16:44:11 +0200
committerStefan Metzmacher <metze@samba.org>2019-09-09 16:04:29 +0000
commite91bae2bdb11c8466a42ae51660bb564de1aedc2 (patch)
tree5a8856d64304f4fe0babec596d5daa2ad226348f
parent2c31c9d365d3aaa323e10abff15fc4404a4a52dd (diff)
downloadsamba-e91bae2bdb11c8466a42ae51660bb564de1aedc2.tar.gz
s3:blocking: Remove bug reproducer from a few commits ago
The problem is fixed, now we can revert the change that made it easier to trigger. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14113 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Volker Lendecke <vl@samba.org> (cherry picked from commit 62ec58b06c38ee82bb3147c4d325413fd3a76499)
-rw-r--r--source3/smbd/blocking.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index 587923aa5ec..af889a10d62 100644
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -239,7 +239,7 @@ struct tevent_req *smbd_smb1_do_locks_send(
DBG_DEBUG("Blocked on a posix lock. Retry in one second\n");
- tmp = timeval_current_ofs(15, 0);
+ tmp = timeval_current_ofs(1, 0);
endtime = timeval_min(&endtime, &tmp);
}
@@ -375,7 +375,7 @@ static void smbd_smb1_do_locks_try(struct tevent_req *req)
DBG_DEBUG("Blocked on a posix lock. Retry in one second\n");
- tmp = timeval_current_ofs(15, 0);
+ tmp = timeval_current_ofs(1, 0);
endtime = timeval_min(&endtime, &tmp);
}