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/scripting | |
| 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/scripting')
| -rw-r--r-- | source4/scripting/python/pyglue.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/scripting/python/pyglue.c b/source4/scripting/python/pyglue.c index f89785f971..03460db8ff 100644 --- a/source4/scripting/python/pyglue.c +++ b/source4/scripting/python/pyglue.c @@ -149,22 +149,22 @@ static PyObject *py_interface_ips(PyObject *self, PyObject *args) return NULL; } - load_interfaces(tmp_ctx, lpcfg_interfaces(lp_ctx), &ifaces); + load_interface_list(tmp_ctx, lpcfg_interfaces(lp_ctx), &ifaces); - count = iface_count(ifaces); + count = iface_list_count(ifaces); /* first count how many are not loopback addresses */ for (ifcount = i = 0; i<count; i++) { - const char *ip = iface_n_ip(ifaces, i); - if (!(!all_interfaces && iface_same_net(ip, "127.0.0.1", "255.0.0.0"))) { + const char *ip = iface_list_n_ip(ifaces, i); + if (!(!all_interfaces && iface_list_same_net(ip, "127.0.0.1", "255.0.0.0"))) { ifcount++; } } pylist = PyList_New(ifcount); for (ifcount = i = 0; i<count; i++) { - const char *ip = iface_n_ip(ifaces, i); - if (!(!all_interfaces && iface_same_net(ip, "127.0.0.1", "255.0.0.0"))) { + const char *ip = iface_list_n_ip(ifaces, i); + if (!(!all_interfaces && iface_list_same_net(ip, "127.0.0.1", "255.0.0.0"))) { PyList_SetItem(pylist, ifcount, PyString_FromString(ip)); ifcount++; } |