summaryrefslogtreecommitdiff
path: root/source4/dns_server
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-05-02 15:57:19 +1000
committerAndrew Tridgell <tridge@samba.org>2011-05-08 12:57:04 +0200
commit22cb631b4fd0647b70fbaaafaffda8712a84a999 (patch)
tree3522a34688c42b9698d267a8f0248b2f8c9b9dd4 /source4/dns_server
parent897ef820a40afffbf337b5487a49d957464def67 (diff)
downloadsamba-22cb631b4fd0647b70fbaaafaffda8712a84a999.tar.gz
samba-22cb631b4fd0647b70fbaaafaffda8712a84a999.tar.bz2
samba-22cb631b4fd0647b70fbaaafaffda8712a84a999.zip
s4-interfaces Rename interfaces code so not to conflict with source3/
The iface_count, iface_n_bcast, and load_interfaces functions conflicted with functions of the same name in source3, so the source4 functions were renamed. Hopefully we can actually wrap one around the other in future. Andrew Bartlett
Diffstat (limited to 'source4/dns_server')
-rw-r--r--source4/dns_server/dns_server.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/dns_server/dns_server.c b/source4/dns_server/dns_server.c
index 0e5def15c0..2c0a379fda 100644
--- a/source4/dns_server/dns_server.c
+++ b/source4/dns_server/dns_server.c
@@ -559,10 +559,10 @@ static NTSTATUS dns_startup_interfaces(struct dns_server *dns, struct loadparm_c
return NT_STATUS_INTERNAL_ERROR;
}
- num_interfaces = iface_count(ifaces);
+ num_interfaces = iface_list_count(ifaces);
for (i=0; i<num_interfaces; i++) {
- const char *address = talloc_strdup(tmp_ctx, iface_n_ip(ifaces, i));
+ const char *address = talloc_strdup(tmp_ctx, iface_list_n_ip(ifaces, i));
status = dns_add_socket(dns, model_ops, "dns", address, DNS_SERVICE_PORT);
NT_STATUS_NOT_OK_RETURN(status);
@@ -617,9 +617,9 @@ static void dns_task_init(struct task_server *task)
break;
}
- load_interfaces(task, lpcfg_interfaces(task->lp_ctx), &ifaces);
+ load_interface_list(task, lpcfg_interfaces(task->lp_ctx), &ifaces);
- if (iface_count(ifaces) == 0) {
+ if (iface_list_count(ifaces) == 0) {
task_server_terminate(task, "dns: no network interfaces configured", false);
return;
}