diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-10-13 20:01:56 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-10-13 14:06:07 +0200 |
| commit | 3cdb1fe4404e26ae383cfb73bfa8af36cb1d7f7c (patch) | |
| tree | ed1f1f37b4ecbb887fa391da340de0c044e9dec7 /source4/smbd | |
| parent | 5603dab6478fbb40206a8664a308b5db5b1863e8 (diff) | |
| download | samba-3cdb1fe4404e26ae383cfb73bfa8af36cb1d7f7c.tar.gz samba-3cdb1fe4404e26ae383cfb73bfa8af36cb1d7f7c.tar.bz2 samba-3cdb1fe4404e26ae383cfb73bfa8af36cb1d7f7c.zip | |
s4-messaging: Pass the loadparm context, not just the messaging path
This will allow the TDB layer to get at the lp_ctx for tdb options.
Andrew Bartlett
Diffstat (limited to 'source4/smbd')
| -rw-r--r-- | source4/smbd/server.c | 2 | ||||
| -rw-r--r-- | source4/smbd/service_stream.c | 2 | ||||
| -rw-r--r-- | source4/smbd/service_task.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source4/smbd/server.c b/source4/smbd/server.c index c8549e2b56..86622c8be9 100644 --- a/source4/smbd/server.c +++ b/source4/smbd/server.c @@ -221,7 +221,7 @@ static NTSTATUS setup_parent_messaging(struct tevent_context *event_ctx, NTSTATUS status; msg = imessaging_init(talloc_autofree_context(), - lpcfg_imessaging_path(event_ctx, lp_ctx), + lp_ctx, cluster_id(0, SAMBA_PARENT_TASKID), event_ctx, false); NT_STATUS_HAVE_NO_MEMORY(msg); diff --git a/source4/smbd/service_stream.c b/source4/smbd/service_stream.c index 28159f4f00..22c4c040e4 100644 --- a/source4/smbd/service_stream.c +++ b/source4/smbd/service_stream.c @@ -189,7 +189,7 @@ static void stream_new_connection(struct tevent_context *ev, /* setup to receive internal messages on this connection */ srv_conn->msg_ctx = imessaging_init(srv_conn, - lpcfg_imessaging_path(srv_conn, lp_ctx), + lp_ctx, srv_conn->server_id, ev, false); if (!srv_conn->msg_ctx) { stream_terminate_connection(srv_conn, "imessaging_init() failed"); diff --git a/source4/smbd/service_task.c b/source4/smbd/service_task.c index f68805fde0..4531c3aebc 100644 --- a/source4/smbd/service_task.c +++ b/source4/smbd/service_task.c @@ -79,7 +79,7 @@ static void task_server_callback(struct tevent_context *event_ctx, task->lp_ctx = lp_ctx; task->msg_ctx = imessaging_init(task, - lpcfg_imessaging_path(task, task->lp_ctx), + task->lp_ctx, task->server_id, task->event_ctx, false); if (!task->msg_ctx) { |