lib: Lift lp_ctdbd_socket() call up one level

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

diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index 9aec517840050983209e2516c4b13c0be99c9eac..c966c4f4ab3d2c67ab7e39ee81c17b4f3934555e 100644 (file)
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -265,9 +265,8 @@ const char *lp_ctdbd_socket(void)
  * Get us a ctdb connection
  */
 
-static int ctdbd_connect(int *pfd)
+static int ctdbd_connect(const char *sockname, int *pfd)
 {
-       const char *sockname = lp_ctdbd_socket();
        struct sockaddr_un addr = { 0, };
        int fd;
        socklen_t salen;
@@ -431,6 +430,7 @@ static int ctdbd_connection_destructor(struct ctdbd_connection *c)
 static NTSTATUS ctdbd_init_connection(TALLOC_CTX *mem_ctx,
                                      struct ctdbd_connection **pconn)
 {
+       const char *sockname = lp_ctdbd_socket();
        struct ctdbd_connection *conn;
        int ret;
        NTSTATUS status;
@@ -440,7 +440,7 @@ static NTSTATUS ctdbd_init_connection(TALLOC_CTX *mem_ctx,
                return NT_STATUS_NO_MEMORY;
        }
 
-       ret = ctdbd_connect(&conn->fd);
+       ret = ctdbd_connect(sockname, &conn->fd);
        if (ret != 0) {
                status = map_nt_error_from_unix(ret);
                DEBUG(1, ("ctdbd_connect failed: %s\n", strerror(ret)));