diff options
author | Andrew Bartlett <abartlet@samba.org> | 2011-05-02 15:57:19 +1000 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2011-05-08 12:57:04 +0200 |
commit | 22cb631b4fd0647b70fbaaafaffda8712a84a999 (patch) | |
tree | 3522a34688c42b9698d267a8f0248b2f8c9b9dd4 /source4/cldap_server/cldap_server.c | |
parent | 897ef820a40afffbf337b5487a49d957464def67 (diff) | |
download | samba-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/cldap_server/cldap_server.c')
-rw-r--r-- | source4/cldap_server/cldap_server.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/cldap_server/cldap_server.c b/source4/cldap_server/cldap_server.c index 43eadf5aff..8e79af407e 100644 --- a/source4/cldap_server/cldap_server.c +++ b/source4/cldap_server/cldap_server.c @@ -153,7 +153,7 @@ static NTSTATUS cldapd_startup_interfaces(struct cldapd_server *cldapd, struct l TALLOC_CTX *tmp_ctx = talloc_new(cldapd); NTSTATUS status; - num_interfaces = iface_count(ifaces); + num_interfaces = iface_list_count(ifaces); /* if we are allowing incoming packets from any address, then we need to bind to the wildcard address */ @@ -165,7 +165,7 @@ static NTSTATUS cldapd_startup_interfaces(struct cldapd_server *cldapd, struct l /* now we have to also listen on the specific interfaces, so that replies always come from the right IP */ 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 = cldapd_add_socket(cldapd, lp_ctx, address); NT_STATUS_NOT_OK_RETURN(status); } @@ -184,9 +184,9 @@ static void cldapd_task_init(struct task_server *task) NTSTATUS status; struct interface *ifaces; - 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, "cldapd: no network interfaces configured", false); return; } |