diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-02 17:09:52 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:47:04 +0100 |
| commit | f4a1083cf9f64b4d2b65b68942e93861409ea90f (patch) | |
| tree | f5e03ad4edfa14eaf09d9d781825a6a30b67b5a9 /source4/smbd | |
| parent | 2fa338cdc99276a5f85ad54cb88b372ffe8ab063 (diff) | |
| download | samba-f4a1083cf9f64b4d2b65b68942e93861409ea90f.tar.gz samba-f4a1083cf9f64b4d2b65b68942e93861409ea90f.tar.bz2 samba-f4a1083cf9f64b4d2b65b68942e93861409ea90f.zip | |
r26227: Make loadparm_context part of a server task, move loadparm_contexts further up the call stack.
(This used to be commit 0721a07aada6a1fae6dcbd610b8783df57d7bbad)
Diffstat (limited to 'source4/smbd')
| -rw-r--r-- | source4/smbd/service_task.c | 3 | ||||
| -rw-r--r-- | source4/smbd/service_task.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/source4/smbd/service_task.c b/source4/smbd/service_task.c index c77cae4185..dceda5a922 100644 --- a/source4/smbd/service_task.c +++ b/source4/smbd/service_task.c @@ -64,9 +64,10 @@ static void task_server_callback(struct event_context *event_ctx, task->event_ctx = event_ctx; task->model_ops = state->model_ops; task->server_id = server_id; + task->lp_ctx = global_loadparm; task->msg_ctx = messaging_init(task, - lp_messaging_path(task, global_loadparm), + lp_messaging_path(task, task->lp_ctx), task->server_id, task->event_ctx); if (!task->msg_ctx) { task_server_terminate(task, "messaging_init() failed"); diff --git a/source4/smbd/service_task.h b/source4/smbd/service_task.h index e5bf9ea414..207e2cbbca 100644 --- a/source4/smbd/service_task.h +++ b/source4/smbd/service_task.h @@ -28,6 +28,7 @@ struct task_server { struct event_context *event_ctx; const struct model_ops *model_ops; struct messaging_context *msg_ctx; + struct loadparm_context *lp_ctx; struct server_id server_id; void *private; }; |