diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-02-27 10:28:23 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-03-07 02:18:17 +0100 |
| commit | f7883ae02a4e8935a44396f776712cebfd411e52 (patch) | |
| tree | 3777f419ccc54f27f176a865403fbaad1bdbd352 /source4/dns_server/dns_server.c | |
| parent | a571fe520d09a00273a58b1fb0fa9aab8e0aefce (diff) | |
| download | samba-f7883ae02a4e8935a44396f776712cebfd411e52.tar.gz | |
s4:lib/socket: simplify iface_list_wildcard() and its callers
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10464
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Change-Id: Ib317d71dea01fc8ef6b6a26455f15a8a175d59f6
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Fri Mar 7 02:18:17 CET 2014 on sn-devel-104
Diffstat (limited to 'source4/dns_server/dns_server.c')
| -rw-r--r-- | source4/dns_server/dns_server.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/dns_server/dns_server.c b/source4/dns_server/dns_server.c index 7ad4acae7a1..976774d020f 100644 --- a/source4/dns_server/dns_server.c +++ b/source4/dns_server/dns_server.c @@ -657,7 +657,7 @@ 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 loadparm_context *lp_ctx, +static NTSTATUS dns_startup_interfaces(struct dns_server *dns, struct interface *ifaces) { const struct model_ops *model_ops; @@ -687,8 +687,8 @@ static NTSTATUS dns_startup_interfaces(struct dns_server *dns, struct loadparm_c NT_STATUS_NOT_OK_RETURN(status); } } else { - const char **wcard; - wcard = iface_list_wildcard(tmp_ctx, lp_ctx); + char **wcard; + wcard = iface_list_wildcard(tmp_ctx); if (wcard == NULL) { DEBUG(0, ("No wildcard address available\n")); return NT_STATUS_INTERNAL_ERROR; @@ -891,7 +891,7 @@ static void dns_task_init(struct task_server *task) DLIST_ADD_END(dns->zones, z, NULL); } - status = dns_startup_interfaces(dns, task->lp_ctx, ifaces); + status = dns_startup_interfaces(dns, ifaces); if (!NT_STATUS_IS_OK(status)) { task_server_terminate(task, "dns failed to setup interfaces", true); return; |