sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

s3:smb2_lock: return RANGE_NOT_LOCKED instead of CANCELLED for logoff and tdis

Browse Source 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Stefan Metzmacher 2014-03-10 09:47:11 +01:00 committed by Jeremy Allison
parent b498937761
commit 4d1d288b89
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source3/smbd/smb2_lock.c
View File

@ -383,6 +383,26 @@ static bool smbd_smb2_lock_cancel(struct tevent_req *req)
remove_pending_lock(state, state->blr);
tevent_req_defer_callback(req, smb2req->sconn->ev_ctx);
/*
* If the request is canceled because of logoff, tdis or close
* the status is NT_STATUS_RANGE_NOT_LOCKED instead of
* NT_STATUS_CANCELLED.
*
* Note that the close case is handled in
* cancel_pending_lock_requests_by_fid_smb2(SHUTDOWN_CLOSE)
* for now.
*/
if (!NT_STATUS_IS_OK(smb2req->session->status)) {
tevent_req_nterror(req, NT_STATUS_RANGE_NOT_LOCKED);
return true;
}
if (!NT_STATUS_IS_OK(smb2req->tcon->status)) {
tevent_req_nterror(req, NT_STATUS_RANGE_NOT_LOCKED);
return true;
}
tevent_req_nterror(req, NT_STATUS_CANCELLED);
return true;
}