From 0dcc161372418e0b30c60790b8c897889259315a Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 30 Nov 2017 21:06:53 +0100 Subject: [PATCH] messaging: Always register the unique id The winbind child does not call serverid_register, so the unique id is not registered. ctdbd_process_exists now calls CTDB_CONTROL_CHECK_PID_SRVID, which then fails. Bug: https://bugzilla.samba.org/show_bug.cgi?id=13180 Signed-off-by: Volker Lendecke Autobuild-User(v4-7-test): Karolin Seeger Autobuild-Date(v4-7-test): Fri Dec 15 15:35:25 CET 2017 on sn-devel-144 (cherry picked from commit 1eb08445d96a2c41593719925203f43f881b3567) --- source3/lib/messages_ctdbd.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/source3/lib/messages_ctdbd.c b/source3/lib/messages_ctdbd.c index bee268500db..b375da29530 100644 --- a/source3/lib/messages_ctdbd.c +++ b/source3/lib/messages_ctdbd.c @@ -221,6 +221,19 @@ static int messaging_ctdbd_init_internal(struct messaging_context *msg_ctx, return ret; } + { + struct server_id self = messaging_server_id(msg_ctx); + + ret = register_with_ctdbd(ctx->conn, self.unique_id, + NULL, NULL); + if (ret != 0) { + DBG_DEBUG("register_with_ctdbd failed: %s\n", + strerror(ret)); + return ret; + } + + } + ctdb_fd = ctdbd_conn_get_fd(ctx->conn); ev = messaging_tevent_context(msg_ctx); -- 2.11.0