From 33c57437a497f14c6f554c254cbb00b08f73e382 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Tue, 24 Jul 2007 11:47:37 +0000
Subject: r24032: It helps testing tremendously if the cluster messaging
 actually sends and receives messages to other nodes... :-) (This used to be
 commit 3e9e9a3f28763500a1c5e551a808a14661d7d9fa)

---
 source3/lib/messages.c       | 7 +++++++
 source3/lib/messages_ctdbd.c | 9 +++++++++
 2 files changed, 16 insertions(+)

diff --git a/source3/lib/messages.c b/source3/lib/messages.c
index a7925ace7ae..c153953fb70 100644
--- a/source3/lib/messages.c
+++ b/source3/lib/messages.c
@@ -320,6 +320,13 @@ NTSTATUS messaging_send(struct messaging_context *msg_ctx,
 			struct server_id server, uint32_t msg_type,
 			const DATA_BLOB *data)
 {
+#ifdef CLUSTER_SUPPORT
+	if (!procid_is_local(&server)) {
+		return msg_ctx->remote->send_fn(msg_ctx, server,
+						msg_type, data,
+						msg_ctx->remote);
+	}
+#endif
 	return msg_ctx->local->send_fn(msg_ctx, server, msg_type, data,
 				       msg_ctx->local);
 }
diff --git a/source3/lib/messages_ctdbd.c b/source3/lib/messages_ctdbd.c
index d048bc9abae..dbdc8db3c1e 100644
--- a/source3/lib/messages_ctdbd.c
+++ b/source3/lib/messages_ctdbd.c
@@ -94,6 +94,15 @@ NTSTATUS messaging_ctdbd_init(struct messaging_context *msg_ctx,
 		return status;
 	}
 
+	status = ctdbd_register_msg_ctx(ctx->conn, msg_ctx);
+
+	if (!NT_STATUS_IS_OK(status)) {
+		DEBUG(10, ("ctdbd_register_msg_ctx failed: %s\n",
+			   nt_errstr(status)));
+		TALLOC_FREE(result);
+		return status;
+	}
+
 	global_ctdbd_connection = ctx->conn;
 	talloc_set_destructor(ctx, messaging_ctdbd_destructor);
 
-- 
cgit