diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-11-15 10:12:22 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-11-15 10:19:34 +1100 |
| commit | ef7f4a142068757dcf0dc11c5b7cf03755be45a8 (patch) | |
| tree | d8e56b44df249b52da8d913f92293ac39d45be35 /source4/smb_server/smb_samba3.c | |
| parent | ec590fc9e37c38891bdd10aaae5bac46f5e71f75 (diff) | |
| download | samba-ef7f4a142068757dcf0dc11c5b7cf03755be45a8.tar.gz samba-ef7f4a142068757dcf0dc11c5b7cf03755be45a8.tar.bz2 samba-ef7f4a142068757dcf0dc11c5b7cf03755be45a8.zip | |
s4-server: make server sockets a child of the task context
We previously allocated sockets as direct children of the event
context. That led to crashes if a service called
task_server_terminate(), as it left the socket open and handling
events for a dead protocol.
Making them a child of the task allows the task to terminate and take
all its sockets with it.
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4/smb_server/smb_samba3.c')
| -rw-r--r-- | source4/smb_server/smb_samba3.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/source4/smb_server/smb_samba3.c b/source4/smb_server/smb_samba3.c index ee12480c39..ed9027afac 100644 --- a/source4/smb_server/smb_samba3.c +++ b/source4/smb_server/smb_samba3.c @@ -86,7 +86,8 @@ static const struct stream_server_ops samba3_smb_stream_ops = { /* setup a listening socket on all the SMB ports for a particular address */ -static NTSTATUS samba3_add_socket(struct tevent_context *event_context, +static NTSTATUS samba3_add_socket(struct task_server *task, + struct tevent_context *event_context, struct loadparm_context *lp_ctx, const struct model_ops *model_ops, const char *address) @@ -98,7 +99,7 @@ static NTSTATUS samba3_add_socket(struct tevent_context *event_context, for (i=0;ports[i];i++) { uint16_t port = atoi(ports[i]); if (port == 0) continue; - status = stream_setup_socket(event_context, lp_ctx, + status = stream_setup_socket(task, event_context, lp_ctx, model_ops, &samba3_smb_stream_ops, "ip", address, &port, lpcfg_socket_options(lp_ctx), @@ -142,14 +143,16 @@ static void samba3_smb_task_init(struct task_server *task) */ for(i = 0; i < num_interfaces; i++) { const char *address = iface_n_ip(ifaces, i); - status = samba3_add_socket(task->event_ctx, + status = samba3_add_socket(task, + task->event_ctx, task->lp_ctx, model_ops, address); if (!NT_STATUS_IS_OK(status)) goto failed; } } else { /* Just bind to lpcfg_socket_address() (usually 0.0.0.0) */ - status = samba3_add_socket(task->event_ctx, task->lp_ctx, + status = samba3_add_socket(task, + task->event_ctx, task->lp_ctx, model_ops, lpcfg_socket_address(task->lp_ctx)); if (!NT_STATUS_IS_OK(status)) goto failed; |