diff options
| author | Volker Lendecke <vl@samba.org> | 2014-07-17 11:38:36 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-08-11 23:57:12 +0200 |
| commit | f408a428962e6b7ccbbe580ac853cbba283b3c8f (patch) | |
| tree | 5e1f948425266776f622dabe4a9a9c216e847268 /source3/lib | |
| parent | 99e288c22b8b1136ec639145f156527a44811e64 (diff) | |
| download | samba-f408a428962e6b7ccbbe580ac853cbba283b3c8f.tar.gz samba-f408a428962e6b7ccbbe580ac853cbba283b3c8f.tar.xz samba-f408a428962e6b7ccbbe580ac853cbba283b3c8f.zip | |
messaging3: Pass cache_dir to messaging_dgm_init()
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/messages.c | 6 | ||||
| -rw-r--r-- | source3/lib/messages_dgm.c | 7 |
2 files changed, 5 insertions, 8 deletions
diff --git a/source3/lib/messages.c b/source3/lib/messages.c index 06d05641e5..a2954ed149 100644 --- 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 4e75ad048c..da93f949cc 100644 --- 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; |