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/web_server | |
| 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/web_server')
| -rw-r--r-- | source4/web_server/web_server.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/web_server/web_server.c b/source4/web_server/web_server.c index 2e80339871..3926993334 100644 --- a/source4/web_server/web_server.c +++ b/source4/web_server/web_server.c @@ -241,7 +241,7 @@ static const struct stream_server_ops web_stream_ops = { static void websrv_task_init(struct task_server *task) { NTSTATUS status; - uint16_t port = lp_web_port(global_loadparm); + uint16_t port = lp_web_port(task->lp_ctx); const struct model_ops *model_ops; task_server_set_title(task, "task[websrv]"); @@ -250,7 +250,7 @@ static void websrv_task_init(struct task_server *task) model_ops = process_model_byname("single"); if (!model_ops) goto failed; - if (lp_interfaces(global_loadparm) && lp_bind_interfaces_only(global_loadparm)) { + if (lp_interfaces(task->lp_ctx) && lp_bind_interfaces_only(task->lp_ctx)) { int num_interfaces = iface_count(); int i; for(i = 0; i < num_interfaces; i++) { @@ -264,7 +264,7 @@ static void websrv_task_init(struct task_server *task) } else { status = stream_setup_socket(task->event_ctx, model_ops, &web_stream_ops, - "ipv4", lp_socket_address(global_loadparm), + "ipv4", lp_socket_address(task->lp_ctx), &port, task); if (!NT_STATUS_IS_OK(status)) goto failed; } |