messaging3: Pass cache_dir to messaging_dgm_init()

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

diff --git a/source3/include/messages.h b/source3/include/messages.h
index 328161021fdcd722235a379759ccef4da8a22219..8d8268ef5727ff4aa60ab509792595057156d617 100644 (file)
--- a/source3/include/messages.h
+++ b/source3/include/messages.h
@@ -77,6 +77,7 @@ struct messaging_dgm_context;
 int messaging_dgm_init(TALLOC_CTX *mem_ctx,
                       struct tevent_context *ev,
                       struct server_id pid,
+                      const char *cache_dir,
                       void (*recv_cb)(int msg_type,
                                       struct server_id src,
                                       struct server_id dst,

diff --git a/source3/lib/messages.c b/source3/lib/messages.c
index 06d05641e5033d17131623eda3979c0535cd2005..a2954ed149bafb70d0094102040e74eff386c282 100644 (file)
--- a/source3/lib/messages.c
+++ b/source3/lib/messages.c
@@ -248,6 +248,7 @@ struct messaging_context *messaging_init(TALLOC_CTX *mem_ctx,
        sec_init();
 
        ret = messaging_dgm_init(ctx, ctx->event_ctx, ctx->id,
+                                lp_cache_directory(),
                                 messaging_recv_cb, ctx, &ctx->local);
 
        if (ret != 0) {
@@ -306,8 +307,9 @@ NTSTATUS messaging_reinit(struct messaging_context *msg_ctx)
 
        msg_ctx->id = procid_self();
 
-       ret = messaging_dgm_init(msg_ctx, msg_ctx->event_ctx,
-                                msg_ctx->id, messaging_recv_cb, msg_ctx,
+       ret = messaging_dgm_init(msg_ctx, msg_ctx->event_ctx, msg_ctx->id,
+                                lp_cache_directory(),
+                                messaging_recv_cb, msg_ctx,
                                 &msg_ctx->local);
        if (ret != 0) {
                DEBUG(0, ("messaging_dgm_init failed: %s\n", strerror(errno)));

diff --git a/source3/lib/messages_dgm.c b/source3/lib/messages_dgm.c
index 4e75ad048c331eeaaf29ce97d90ef8083687a2e7..da93f949ccb9746910588cd0af03a533fb544ee9 100644 (file)
--- a/source3/lib/messages_dgm.c
+++ b/source3/lib/messages_dgm.c
@@ -170,6 +170,7 @@ static int messaging_dgm_lockfile_remove(TALLOC_CTX *tmp_ctx,
 int messaging_dgm_init(TALLOC_CTX *mem_ctx,
                       struct tevent_context *ev,
                       struct server_id pid,
+                      const char *cache_dir,
                       void (*recv_cb)(int msg_type,
                                       struct server_id src,
                                       struct server_id dst,
@@ -182,17 +183,11 @@ int messaging_dgm_init(TALLOC_CTX *mem_ctx,
        struct messaging_dgm_context *ctx;
        int ret;
        bool ok;
-       const char *cache_dir;
        char *socket_dir;
        struct sockaddr_un socket_address;
        size_t sockname_len;
        uint64_t cookie;
 
-       cache_dir = lp_cache_directory();
-       if (cache_dir == NULL) {
-               return errno;
-       }
-
        ctx = talloc_zero(mem_ctx, struct messaging_dgm_context);
        if (ctx == NULL) {
                goto fail_nomem;