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 /libcli | |
| 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 'libcli')
| -rw-r--r-- | libcli/nbt/tools/nmblookup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libcli/nbt/tools/nmblookup.c b/libcli/nbt/tools/nmblookup.c index 7950ab8001..f6117f2fa9 100644 --- a/libcli/nbt/tools/nmblookup.c +++ b/libcli/nbt/tools/nmblookup.c @@ -246,9 +246,9 @@ static bool process_one(struct loadparm_context *lp_ctx, struct tevent_context * } else { int i, num_interfaces; - num_interfaces = iface_count(ifaces); + num_interfaces = iface_list_count(ifaces); for (i=0;i<num_interfaces;i++) { - const char *bcast = iface_n_bcast(ifaces, i); + const char *bcast = iface_list_n_bcast(ifaces, i); if (bcast == NULL) continue; status = do_node_query(nbtsock, bcast, nbt_port, node_name, node_type, true); @@ -357,7 +357,7 @@ int main(int argc, const char *argv[]) exit(1); } - load_interfaces(NULL, lpcfg_interfaces(cmdline_lp_ctx), &ifaces); + load_interface_list(NULL, lpcfg_interfaces(cmdline_lp_ctx), &ifaces); ev = s4_event_context_init(talloc_autofree_context()); |