s3:blocking: call smbd_smb1_do_locks_setup_timeout() also in smbd_smb1_do_locks_try()
authorStefan Metzmacher <metze@samba.org>
Thu, 15 Aug 2019 16:18:50 +0000 (18:18 +0200)
committerStefan Metzmacher <metze@samba.org>
Mon, 9 Sep 2019 14:23:41 +0000 (14:23 +0000)
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>
source3/smbd/blocking.c

index 39042d2f46d68aa555e1d280c4ea12477e6ee9f1..77dfc5a3d44622c121acc236142a81e9ea28ce4d 100644 (file)
@@ -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.