From 67432fb9b9220e3826105b5b1b48391696e3ad99 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 5 Jul 2017 19:13:23 +0200 Subject: [PATCH] messages_ctdb: Add messaging_ctdb_connection This will be the replacement for messaging_ctdbd_connection(). This does not default to initializing messaging but panics. We just don't have correct default arguments for messaging_init. Implicit multiple messaging and event contexts is a bug also. It *might* be that some tools fail due to this, but this needs fixing in different ways. See the previous commit for smbpasswd. Signed-off-by: Volker Lendecke Reviewed-by: Ralph Boehme --- source3/lib/messages_ctdb.c | 8 ++++++++ source3/lib/messages_ctdb.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/source3/lib/messages_ctdb.c b/source3/lib/messages_ctdb.c index 5bc494dcbb8..a2a7c215f23 100644 --- a/source3/lib/messages_ctdb.c +++ b/source3/lib/messages_ctdb.c @@ -258,3 +258,11 @@ bool messaging_ctdb_fde_active(struct messaging_ctdb_fde *fde) flags = tevent_fd_get_flags(fde->fde); return (flags != 0); } + +struct ctdbd_connection *messaging_ctdb_connection(void) +{ + if (global_ctdb_context == NULL) { + smb_panic("messaging not initialized\n"); + } + return global_ctdb_context->conn; +} diff --git a/source3/lib/messages_ctdb.h b/source3/lib/messages_ctdb.h index 006821bfd9e..9d5634366d5 100644 --- a/source3/lib/messages_ctdb.h +++ b/source3/lib/messages_ctdb.h @@ -39,4 +39,6 @@ struct messaging_ctdb_fde *messaging_ctdb_register_tevent_context( TALLOC_CTX *mem_ctx, struct tevent_context *ev); bool messaging_ctdb_fde_active(struct messaging_ctdb_fde *fde); +struct ctdbd_connection *messaging_ctdb_connection(void); + #endif -- 2.34.1