From: Volker Lendecke <vl@samba.org>
Date: Thu, 16 May 2019 13:34:37 +0000 (+0200)
Subject: smbd: Use send_break_message() in send_break_to_none()
X-Git-Tag: tdb-1.4.1~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3d9a720f092b8c45184a0d53540fb490a3fdef9d;p=thirdparty%2Fsamba.git

smbd: Use send_break_message() in send_break_to_none()

Centralize the marshalling code

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index 22277abab07..d08003bb3e9 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -1327,14 +1327,12 @@ static void send_break_to_none(struct messaging_context *msg_ctx,
 			       const struct file_id *id,
 			       const struct share_mode_entry *e)
 {
-	char msg[MSG_SMB_SHARE_MODE_ENTRY_SIZE];
-
-	share_mode_entry_to_message(msg, id, e);
-	/* Overload entry->op_type */
-	SSVAL(msg, OP_BREAK_MSG_OP_TYPE_OFFSET, NO_OPLOCK);
-
-	messaging_send_buf(msg_ctx, e->pid, MSG_SMB_BREAK_REQUEST,
-			   (uint8_t *)msg, sizeof(msg));
+	NTSTATUS status;
+	status = send_break_message(msg_ctx, id, e, OPLOCK_NONE);
+	if (!NT_STATUS_IS_OK(status)) {
+		DBG_DEBUG("send_break_message failed: %s\n",
+			  nt_errstr(status));
+	}
 }
 
 static bool do_break_lease_to_none(struct share_mode_lock *lck,