From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 24 Jul 2007 09:47:26 +0000 (+0000)
Subject: r24025: packet_send() expects DATA_BLOB elements as vaargs
X-Git-Tag: samba-4.0.0alpha6~801^2~5260
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12324f017c06e95013b4a6130df9cfa5e270ac0d;p=thirdparty%2Fsamba.git

r24025: packet_send() expects DATA_BLOB elements as vaargs
and not TDB_DATA

metze
(This used to be commit 3e4f552dbdd065fd7934d646e34199b52f486d5d)
---

diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index d9d3421fa7c..b926c533b53 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -684,7 +684,7 @@ static NTSTATUS ctdbd_control(struct ctdbd_connection *conn,
 	status = packet_send(
 		conn->pkt, 2,
 		data_blob_const(&req, offsetof(struct ctdb_req_control, data)),
-		data);
+		data_blob_const(data.dptr, data.dsize));
 
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(3, ("packet_send failed: %s\n", nt_errstr(status)));
@@ -852,7 +852,7 @@ NTSTATUS ctdbd_migrate(struct ctdbd_connection *conn, uint32 db_id,
 	status = packet_send(
 		conn->pkt, 2,
 		data_blob_const(&req, offsetof(struct ctdb_req_call, data)),
-		key);
+		data_blob_const(key.dptr, key.dsize));
 
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(3, ("packet_send failed: %s\n", nt_errstr(status)));
@@ -911,7 +911,7 @@ NTSTATUS ctdbd_fetch(struct ctdbd_connection *conn, uint32 db_id,
 	status = packet_send(
 		conn->pkt, 2,
 		data_blob_const(&req, offsetof(struct ctdb_req_call, data)),
-		key);
+		data_blob_const(key.dptr, key.dsize));
 
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(3, ("packet_send failed: %s\n", nt_errstr(status)));