]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
messaging: Always register the unique id
authorVolker Lendecke <vl@samba.org>
Thu, 30 Nov 2017 20:06:53 +0000 (21:06 +0100)
committerKarolin Seeger <kseeger@samba.org>
Mon, 18 Dec 2017 14:32:49 +0000 (15:32 +0100)
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 <vl@samba.org>
Autobuild-User(v4-7-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-7-test): Fri Dec 15 15:35:25 CET 2017 on sn-devel-144

(cherry picked from commit 1eb08445d96a2c41593719925203f43f881b3567)

Autobuild-User(v4-6-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-6-test): Mon Dec 18 15:32:49 CET 2017 on sn-devel-144

source3/lib/messages_ctdbd.c

index bee268500db79461e40a8c74c3bd4217441f131d..b375da2953066e2fdf4bd8e1ddf738415c6c2875 100644 (file)
@@ -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);