Make us pass all SMB2 lock tests except MULTIPLE-UNLOCK and CONTEXT. Them next :-).

Jeremy.

5 files changed, 25 insertions, 6 deletions

diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index e78d80777e..942237b812 100644
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -571,13 +571,17 @@ static bool blocking_lock_record_process(struct blocking_lock_record *blr)
  Called when a file is closed.
 *****************************************************************************/
 
-void cancel_pending_lock_requests_by_fid(files_struct *fsp, struct byte_range_lock *br_lck)
+void cancel_pending_lock_requests_by_fid(files_struct *fsp,
+			struct byte_range_lock *br_lck,
+			enum file_close_type close_type)
 {
 	struct smbd_server_connection *sconn = smbd_server_conn;
 	struct blocking_lock_record *blr, *blr_cancelled, *next = NULL;
 
 	if (sconn->allow_smb2) {
-		cancel_pending_lock_requests_by_fid_smb2(fsp, br_lck);
+		cancel_pending_lock_requests_by_fid_smb2(fsp,
+					br_lck,
+					close_type);
 		return;
 	}
 
diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index 098edacb6d..20fe9e46f1 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -623,7 +623,7 @@ static NTSTATUS close_normal_file(struct smb_request *req, files_struct *fsp,
 		status = ntstatus_keeperror(status, tmp);
 	}
 
-	locking_close_file(smbd_messaging_context(), fsp);
+	locking_close_file(smbd_messaging_context(), fsp, close_type);
 
 	tmp = fd_close(fsp);
 	status = ntstatus_keeperror(status, tmp);
diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index 34f8796963..6543ee6f24 100644
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -320,7 +320,8 @@ bool push_blocking_lock_request_smb2( struct byte_range_lock *br_lck,
 				uint32_t blocking_pid);
 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);
 /* From smbd/smb2_create.c */
 int map_smb2_oplock_levels_to_samba(uint8_t in_oplock_level);
 uint8_t map_samba_oplock_levels_to_smb2(int oplock_type);
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);
+		}
 	}
 }
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index 243dd40c31..d8e6ba10a3 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -1097,10 +1097,18 @@ NTSTATUS smbd_smb2_request_dispatch(struct smbd_smb2_request *req)
 
 	case SMB2_OP_LOCK:
 		if (!NT_STATUS_IS_OK(session_status)) {
+			/* Too ugly to live ? JRA. */
+			if (NT_STATUS_EQUAL(session_status,NT_STATUS_USER_SESSION_DELETED)) {
+				session_status = NT_STATUS_FILE_CLOSED;
+			}
 			return smbd_smb2_request_error(req, session_status);
 		}
 		status = smbd_smb2_request_check_tcon(req);
 		if (!NT_STATUS_IS_OK(status)) {
+			/* Too ugly to live ? JRA. */
+			if (NT_STATUS_EQUAL(status,NT_STATUS_NETWORK_NAME_DELETED)) {
+				status = NT_STATUS_FILE_CLOSED;
+			}
 			return smbd_smb2_request_error(req, status);
 		}
 		return smbd_smb2_request_process_lock(req);