lib: Pass sockname and timeout to ctdbd_messaging_connection

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/include/ctdbd_conn.h b/source3/include/ctdbd_conn.h
index b1c25349331f92c1df57dfdbd052d2876364bef7..4dcda6d1569ef51849af70c4ee98cd2585fd54a3 100644 (file)
--- a/source3/include/ctdbd_conn.h
+++ b/source3/include/ctdbd_conn.h
@@ -27,6 +27,7 @@ struct messaging_context;
 struct messaging_rec;
 
 NTSTATUS ctdbd_messaging_connection(TALLOC_CTX *mem_ctx,
+                                   const char *sockname, int timeout,
                                    struct ctdbd_connection **pconn);
 
 uint32_t ctdbd_vnn(const struct ctdbd_connection *conn);

diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index 9ffd44637e160dd85f2e13382861a55d9d9f1864..fb052dde7a101361a7f1b6cdbddb8ff4ebc90f26 100644 (file)
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -483,13 +483,13 @@ static NTSTATUS ctdbd_init_connection(TALLOC_CTX *mem_ctx,
  */
 
 NTSTATUS ctdbd_messaging_connection(TALLOC_CTX *mem_ctx,
+                                   const char *sockname, int timeout,
                                    struct ctdbd_connection **pconn)
 {
         struct ctdbd_connection *conn;
        NTSTATUS status;
 
-       status = ctdbd_init_connection(mem_ctx, lp_ctdbd_socket(),
-                                      lp_ctdb_timeout(), &conn);
+       status = ctdbd_init_connection(mem_ctx, sockname, timeout, &conn);
 
        if (!NT_STATUS_IS_OK(status)) {
                return status;
@@ -1310,7 +1310,8 @@ NTSTATUS ctdbd_probe(void)
        struct ctdbd_connection *conn = NULL;
        NTSTATUS status;
 
-       status = ctdbd_messaging_connection(talloc_tos(), &conn);
+       status = ctdbd_messaging_connection(talloc_tos(), lp_ctdbd_socket(),
+                                           lp_ctdb_timeout(), &conn);
 
        /*
         * We only care if we can connect.

diff --git a/source3/lib/messages_ctdbd.c b/source3/lib/messages_ctdbd.c
index ca85ab8c81a61a6064dcc63a614e194ad107435a..4d8b574f354f9788d2d8bbb8e574112f01f7565f 100644 (file)
--- a/source3/lib/messages_ctdbd.c
+++ b/source3/lib/messages_ctdbd.c
@@ -183,7 +183,8 @@ NTSTATUS messaging_ctdbd_init(struct messaging_context *msg_ctx,
                return NT_STATUS_NO_MEMORY;
        }
 
-       status = ctdbd_messaging_connection(ctx, &ctx->conn);
+       status = ctdbd_messaging_connection(ctx, lp_ctdbd_socket(),
+                                           lp_ctdb_timeout(), &ctx->conn);
 
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(10, ("ctdbd_messaging_connection failed: %s\n",