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/dns_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/dns_server')
-rw-r--r-- | source4/dns_server/dns_server.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/source4/dns_server/dns_server.c b/source4/dns_server/dns_server.c index 6a90e3089f5..cd293b82522 100644 --- a/source4/dns_server/dns_server.c +++ b/source4/dns_server/dns_server.c @@ -684,23 +684,14 @@ static NTSTATUS dns_add_socket(struct dns_server *dns, setup our listening sockets on the configured network interfaces */ static NTSTATUS dns_startup_interfaces(struct dns_server *dns, - struct interface *ifaces) + struct interface *ifaces, + const struct model_ops *model_ops) { - const struct model_ops *model_ops; int num_interfaces; TALLOC_CTX *tmp_ctx = talloc_new(dns); NTSTATUS status; int i; - /* within the dns task we want to be a single process, so - ask for the single process model ops and pass these to the - stream_setup_socket() call. */ - model_ops = process_model_startup("single"); - if (!model_ops) { - DEBUG(0,("Can't find 'single' process model_ops\n")); - return NT_STATUS_INTERNAL_ERROR; - } - if (ifaces != NULL) { num_interfaces = iface_list_count(ifaces); @@ -907,7 +898,7 @@ static void dns_task_init(struct task_server *task) return; } - status = dns_startup_interfaces(dns, ifaces); + status = dns_startup_interfaces(dns, ifaces, task->model_ops); if (!NT_STATUS_IS_OK(status)) { task_server_terminate(task, "dns failed to setup interfaces", true); return; |