From 603f9bfa4cf7910e1c1cae1a8d0741a6d0874baa Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 20 Sep 2012 16:16:03 +0200
Subject: [PATCH] s3:smb2_lock: let smbd_smb2_create_cancel() trigger
 NT_STATUS_CANCELED

Instead of violating the tevent_req layers.

metze
---
 source3/smbd/smb2_create.c | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c
index 0d9a146b232..e188c9fa5ca 100644
--- a/source3/smbd/smb2_create.c
+++ b/source3/smbd/smb2_create.c
@@ -284,19 +284,6 @@ static void smbd_smb2_request_create_done(struct tevent_req *tsubreq)
 	NTSTATUS status;
 	NTSTATUS error; /* transport error */
 
-	if (smb2req->cancelled) {
-		uint64_t mid = get_mid_from_smb2req(smb2req);
-		DEBUG(10,("smbd_smb2_request_create_done: cancelled mid %llu\n",
-			(unsigned long long)mid ));
-		error = smbd_smb2_request_error(smb2req, NT_STATUS_CANCELLED);
-		if (!NT_STATUS_IS_OK(error)) {
-			smbd_server_connection_terminate(smb2req->sconn,
-				nt_errstr(error));
-			return;
-		}
-		return;
-	}
-
 	status = smbd_smb2_create_recv(tsubreq,
 				       smb2req,
 				       &out_oplock_level,
@@ -1427,7 +1414,8 @@ static bool smbd_smb2_create_cancel(struct tevent_req *req)
 	remove_deferred_open_message_smb2_internal(smb2req, mid);
 	smb2req->cancelled = true;
 
-	tevent_req_done(req);
+	tevent_req_defer_callback(req, smb2req->sconn->ev_ctx);
+	tevent_req_nterror(req, NT_STATUS_CANCELLED);
 	return true;
 }
 
-- 
2.11.4.GIT