diff options
| author | Gary Lockyer <gary@catalyst.net.nz> | 2017-09-18 13:05:24 +1200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2017-10-19 05:33:10 +0200 |
| commit | 08402526704c6d586febadf401959bc3d8661836 (patch) | |
| tree | 2ef36fcacab16df9d7a9c3aef1b18e7643a97cc8 /source4/web_server | |
| parent | 62d7bf9e0ae94baaaa090051bd6b7cb40e5ef3c3 (diff) | |
| download | samba-08402526704c6d586febadf401959bc3d8661836.tar.gz | |
source4/smbd: Do not overstamp the process model with "single"
Instead, except in RPC which is a special SNOWFLAKE, we rely on the struct
service_details in the init function.
Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Diffstat (limited to 'source4/web_server')
| -rw-r--r-- | source4/web_server/web_server.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/source4/web_server/web_server.c b/source4/web_server/web_server.c index faf1bc65650..c3516890eb7 100644 --- a/source4/web_server/web_server.c +++ b/source4/web_server/web_server.c @@ -298,15 +298,10 @@ static void websrv_task_init(struct task_server *task) { NTSTATUS status; uint16_t port = lpcfg_web_port(task->lp_ctx); - const struct model_ops *model_ops; struct web_server_data *wdata; task_server_set_title(task, "task[websrv]"); - /* run the web server as a single process */ - model_ops = process_model_startup("single"); - if (!model_ops) goto failed; - /* startup the Python processor - unfortunately we can't do this per connection as that wouldn't allow for session variables */ wdata = talloc_zero(task, struct web_server_data); @@ -327,8 +322,9 @@ static void websrv_task_init(struct task_server *task) const char *address = iface_list_n_ip(ifaces, i); status = stream_setup_socket(task, task->event_ctx, - task->lp_ctx, model_ops, - &web_stream_ops, + task->lp_ctx, + task->model_ops, + &web_stream_ops, "ip", address, &port, lpcfg_socket_options(task->lp_ctx), @@ -348,7 +344,8 @@ static void websrv_task_init(struct task_server *task) } for (i=0; wcard[i]; i++) { status = stream_setup_socket(task, task->event_ctx, - task->lp_ctx, model_ops, + task->lp_ctx, + task->model_ops, &web_stream_ops, "ip", wcard[i], &port, lpcfg_socket_options(task->lp_ctx), |