diff options
| author | Stefan Metzmacher <metze@samba.org> | 2012-09-20 16:16:03 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2012-09-28 09:23:08 +0200 |
| commit | 493dec1a89908cb569df4e76c576c66e80c0c8d2 (patch) | |
| tree | 2a10baa093cb24dbed6ffdfb5afcb50e9c6b0a5d | |
| parent | c99507d8c6e02e53e3a6f91d02657d79a2d2ef7b (diff) | |
| download | samba-493dec1a89908cb569df4e76c576c66e80c0c8d2.tar.gz | |
s3:smb2_lock: smbd_smb2_notify_recv() can already return NT_STATUS_CANCELED
That's why we can remove the code that violates the tevent_req layers.
metze
(cherry picked from commit 65a81060093cf9d7c0ebf8d6e160625bdc87baab)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
| -rw-r--r-- | source3/smbd/smb2_notify.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/source3/smbd/smb2_notify.c b/source3/smbd/smb2_notify.c index 2c598e8d668..638e01ad7b5 100644 --- a/source3/smbd/smb2_notify.c +++ b/source3/smbd/smb2_notify.c @@ -112,24 +112,6 @@ static void smbd_smb2_request_notify_done(struct tevent_req *subreq) NTSTATUS status; NTSTATUS error; /* transport error */ - if (req->cancelled) { - struct smbd_smb2_notify_state *state = tevent_req_data(subreq, - struct smbd_smb2_notify_state); - const uint8_t *inhdr = SMBD_SMB2_IN_HDR_PTR(req); - uint64_t mid = BVAL(inhdr, SMB2_HDR_MESSAGE_ID); - - DEBUG(10,("smbd_smb2_request_notify_done: cancelled mid %llu\n", - (unsigned long long)mid )); - error = smbd_smb2_request_error(req, NT_STATUS_CANCELLED); - if (!NT_STATUS_IS_OK(error)) { - smbd_server_connection_terminate(req->sconn, - nt_errstr(error)); - return; - } - TALLOC_FREE(state->im); - return; - } - status = smbd_smb2_notify_recv(subreq, req, &out_output_buffer); |