The Samba-Bugzilla – Attachment 6199 Details for
Bug 7887
Talloc error if a service doesn't start correctly
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Fixed patch
patch (text/plain), 2.03 KB, created by
Matthias Dieter Wallnöfer
on 2011-01-13 01:10:58 UTC
(
hide
)
Description:
Fixed patch
Filename:
MIME Type:
Creator:
Matthias Dieter Wallnöfer
Created:
2011-01-13 01:10:58 UTC
Size:
2.03 KB
patch
obsolete
>commit 661cb7ef88b13b22dcd679c56ce68ad98006b7da >Author: Matthias Dieter Wallnöfer <mdw@samba.org> >Date: Wed Jan 12 21:27:03 2011 +0100 > > s4:web_server - immeditately assign "wdata" as private data for the stream socket > > This fixes bug #7887. > >diff --git a/source4/web_server/web_server.c b/source4/web_server/web_server.c >index 9531115..b9fdc30 100644 >--- a/source4/web_server/web_server.c >+++ b/source4/web_server/web_server.c >@@ -305,6 +305,11 @@ static void websrv_task_init(struct task_server *task) > model_ops = process_model_startup("single"); > if (!model_ops) goto failed; > >+ /* startup the esp 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); >+ if (wdata == NULL) goto failed; >+ > if (lpcfg_interfaces(task->lp_ctx) && lpcfg_bind_interfaces_only(task->lp_ctx)) { > int num_interfaces; > int i; >@@ -321,25 +326,20 @@ static void websrv_task_init(struct task_server *task) > &web_stream_ops, > "ipv4", address, > &port, lpcfg_socket_options(task->lp_ctx), >- task); >+ wdata); > if (!NT_STATUS_IS_OK(status)) goto failed; > } > > talloc_free(ifaces); > } else { >- status = stream_setup_socket(task, task->event_ctx, task->lp_ctx, >- model_ops, &web_stream_ops, >+ status = stream_setup_socket(task, task->event_ctx, >+ task->lp_ctx, model_ops, >+ &web_stream_ops, > "ipv4", lpcfg_socket_address(task->lp_ctx), >- &port, lpcfg_socket_options(task->lp_ctx), task); >+ &port, lpcfg_socket_options(task->lp_ctx), >+ wdata); > if (!NT_STATUS_IS_OK(status)) goto failed; > } >- >- /* startup the esp 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); >- if (wdata == NULL)goto failed; >- >- task->private_data = wdata; > > wdata->tls_params = tls_initialise(wdata, task->lp_ctx); > if (wdata->tls_params == NULL) goto failed;
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 7887
:
6197
| 6199