From 4ad1943d29a273ad3770e7abd5f266c25608eb39 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 7 May 2010 01:20:26 -0700 Subject: Make us pass all SMB2 lock tests except MULTIPLE-UNLOCK and CONTEXT. Them next :-). Jeremy. --- source3/smbd/smb2_lock.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'source3/smbd/smb2_lock.c') diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c index b106c5fad1..9c8964abb8 100644 --- a/source3/smbd/smb2_lock.c +++ b/source3/smbd/smb2_lock.c @@ -840,7 +840,8 @@ void process_blocking_lock_queue_smb2(struct timeval tv_curr) ****************************************************************************/ void cancel_pending_lock_requests_by_fid_smb2(files_struct *fsp, - struct byte_range_lock *br_lck) + struct byte_range_lock *br_lck, + enum file_close_type close_type) { struct smbd_server_connection *sconn = smbd_server_conn; struct smbd_smb2_request *smb2req, *nextreq; @@ -904,6 +905,11 @@ void cancel_pending_lock_requests_by_fid_smb2(files_struct *fsp, blr); /* Finally end the request. */ - tevent_req_nterror(smb2req->subreq, NT_STATUS_RANGE_NOT_LOCKED); + if (close_type == SHUTDOWN_CLOSE) { + tevent_req_done(smb2req->subreq); + } else { + tevent_req_nterror(smb2req->subreq, + NT_STATUS_RANGE_NOT_LOCKED); + } } } -- cgit