[SCM] Samba Shared Repository - branch v4-6-test updated

[Karolin Seeger]

The branch, v4-6-test has been updated
       via  d9aaf8d messaging: Always register the unique id
      from  1a8c27f pthreadpool: Add a test for the race condition fixed in the last commit

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-6-test


- Log -----------------------------------------------------------------
commit d9aaf8d3d6826388072a62e87fecd271a69f3903
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Nov 30 21:06:53 2017 +0100

    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 <vl at samba.org>
    
    Autobuild-User(v4-7-test): Karolin Seeger <kseeger at 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 at samba.org>
    Autobuild-Date(v4-6-test): Mon Dec 18 15:32:49 CET 2017 on sn-devel-144

-----------------------------------------------------------------------

Summary of changes:
 source3/lib/messages_ctdbd.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)


Changeset truncated at 500 lines:

diff --git a/source3/lib/messages_ctdbd.c b/source3/lib/messages_ctdbd.c
index bee2685..b375da2 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);
 


-- 
Samba Shared Repository