diff options
| author | Stefan Metzmacher <metze@samba.org> | 2019-08-15 18:18:50 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2019-09-09 16:04:30 +0000 |
| commit | 5e9d294a045d7b7e1d77dd5f306d74b165585344 (patch) | |
| tree | d278d0da51e7dba1538b764f3cc1c6dca5aad2fd | |
| parent | 11e489b0789d7c9cc7f082c054c97c6c4c6f131a (diff) | |
| download | samba-5e9d294a045d7b7e1d77dd5f306d74b165585344.tar.gz | |
s3:blocking: call smbd_smb1_do_locks_setup_timeout() also in smbd_smb1_do_locks_try()
This is a noop if smbd_smb1_do_locks_setup_timeout() was called before.
But it allows us to use smbd_smb1_do_locks_try() in
smbd_smb1_do_locks_send() in a following commit.
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 6e30a89b3f00ad55391454fbaa1272074e1962f0)
| -rw-r--r-- | source3/smbd/blocking.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c index 39042d2f46d..77dfc5a3d44 100644 --- a/source3/smbd/blocking.c +++ b/source3/smbd/blocking.c @@ -545,6 +545,11 @@ static void smbd_smb1_do_locks_try(struct tevent_req *req) goto done; } + smbd_smb1_do_locks_setup_timeout(state, &state->locks[state->blocker]); + DBG_DEBUG("timeout=%"PRIu32", blocking_smblctx=%"PRIu64"\n", + state->timeout, + blocking_smblctx); + /* * The client specified timeout expired * avoid further retries. |