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/nbt_server/wins | |
parent | 897ef820a40afffbf337b5487a49d957464def67 (diff) | |
download | samba-22cb631b4fd0647b70fbaaafaffda8712a84a999.tar.gz |
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/nbt_server/wins')
-rw-r--r-- | source4/nbt_server/wins/wins_ldb.c | 4 | ||||
-rw-r--r-- | source4/nbt_server/wins/winsserver.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source4/nbt_server/wins/wins_ldb.c b/source4/nbt_server/wins/wins_ldb.c index 0896e1d74e5..ae90d04c76d 100644 --- a/source4/nbt_server/wins/wins_ldb.c +++ b/source4/nbt_server/wins/wins_ldb.c @@ -92,8 +92,8 @@ static int wins_ldb_init(struct ldb_module *module) owner = lpcfg_parm_string(lp_ctx, NULL, "winsdb", "local_owner"); if (!owner) { struct interface *ifaces; - load_interfaces(module, lpcfg_interfaces(lp_ctx), &ifaces); - owner = iface_n_ip(ifaces, 0); + load_interface_list(module, lpcfg_interfaces(lp_ctx), &ifaces); + owner = iface_list_n_ip(ifaces, 0); if (!owner) { owner = "0.0.0.0"; } diff --git a/source4/nbt_server/wins/winsserver.c b/source4/nbt_server/wins/winsserver.c index 1e6a0cfca87..c58cb2709ab 100644 --- a/source4/nbt_server/wins/winsserver.c +++ b/source4/nbt_server/wins/winsserver.c @@ -688,7 +688,7 @@ static void nbtd_wins_randomize1Clist(struct loadparm_context *lp_ctx, bool same; /* if the current one is in the same subnet, use it */ - same = iface_same_net(addresses[idx], src->addr, mask); + same = iface_list_same_net(addresses[idx], src->addr, mask); if (same) { sidx = idx; break; @@ -1057,8 +1057,8 @@ NTSTATUS nbtd_winsserver_init(struct nbtd_server *nbtsrv) if (owner == NULL) { struct interface *ifaces; - load_interfaces(nbtsrv->task, lpcfg_interfaces(nbtsrv->task->lp_ctx), &ifaces); - owner = iface_n_ip(ifaces, 0); + load_interface_list(nbtsrv->task, lpcfg_interfaces(nbtsrv->task->lp_ctx), &ifaces); + owner = iface_list_n_ip(ifaces, 0); } nbtsrv->winssrv->wins_db = winsdb_connect(nbtsrv->winssrv, nbtsrv->task->event_ctx, |