From df408d056ec03f2abe08ce0ea487e1875b90e7bf Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 5 Jan 2008 19:03:43 -0600 Subject: r26672: Janitorial: Remove uses of global_loadparm. (This used to be commit 18cd08623eaad7d2cd63b82ea5275d4dfd21cf00) --- source4/smbd/service_task.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'source4/smbd/service_task.c') diff --git a/source4/smbd/service_task.c b/source4/smbd/service_task.c index f286da5cf6d..08588464cc8 100644 --- a/source4/smbd/service_task.c +++ b/source4/smbd/service_task.c @@ -53,6 +53,7 @@ struct task_state { the server specific startup code */ static void task_server_callback(struct event_context *event_ctx, + struct loadparm_context *lp_ctx, struct server_id server_id, void *private) { struct task_state *state = talloc_get_type(private, struct task_state); @@ -64,7 +65,7 @@ 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->lp_ctx = lp_ctx; task->msg_ctx = messaging_init(task, lp_messaging_path(task, task->lp_ctx), @@ -83,6 +84,7 @@ static void task_server_callback(struct event_context *event_ctx, startup a task based server */ NTSTATUS task_server_startup(struct event_context *event_ctx, + struct loadparm_context *lp_ctx, const struct model_ops *model_ops, void (*task_init)(struct task_server *)) { @@ -94,7 +96,7 @@ NTSTATUS task_server_startup(struct event_context *event_ctx, state->task_init = task_init; state->model_ops = model_ops; - model_ops->new_task(event_ctx, task_server_callback, state); + model_ops->new_task(event_ctx, lp_ctx, task_server_callback, state); return NT_STATUS_OK; } -- cgit v1.2.1