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/kdc | |
| 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/kdc')
| -rw-r--r-- | source4/kdc/kdc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c index 784b98b072..02c6f925a9 100644 --- a/source4/kdc/kdc.c +++ b/source4/kdc/kdc.c @@ -729,7 +729,7 @@ static NTSTATUS kdc_startup_interfaces(struct kdc_server *kdc, struct loadparm_c return NT_STATUS_INTERNAL_ERROR; } - 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 */ @@ -751,7 +751,7 @@ static NTSTATUS kdc_startup_interfaces(struct kdc_server *kdc, struct loadparm_c } 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)); if (kdc_port) { status = kdc_add_socket(kdc, model_ops, @@ -895,9 +895,9 @@ static void kdc_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, "kdc: no network interfaces configured", false); return; } |