From 40dc94a53f4f0f5dee285daf486912b0996d5f3e Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 2 Jun 2011 15:40:28 +1000 Subject: s4-ipv6: update callers to load_interface_list() --- libcli/nbt/tools/nmblookup.c | 2 +- source4/cldap_server/cldap_server.c | 2 +- source4/cldap_server/netlogon.c | 2 +- source4/dns_server/dns_server.c | 2 +- source4/echo_server/echo_server.c | 2 +- source4/kdc/kdc.c | 2 +- source4/ldap_server/ldap_server.c | 2 +- source4/lib/socket/testsuite.c | 4 ++-- source4/libcli/resolve/bcast.c | 2 +- source4/libcli/resolve/wins.c | 2 +- source4/libcli/wrepl/winsrepl.c | 2 +- source4/nbt_server/nbt_server.c | 2 +- source4/nbt_server/wins/wins_ldb.c | 2 +- source4/nbt_server/wins/winsserver.c | 2 +- source4/rpc_server/dcerpc_server.c | 2 +- source4/scripting/python/pyglue.c | 2 +- source4/smb_server/service_smb.c | 2 +- source4/smb_server/smb_samba3.c | 2 +- source4/torture/nbt/dgram.c | 6 +++--- source4/torture/nbt/register.c | 4 ++-- source4/torture/nbt/wins.c | 2 +- source4/torture/nbt/winsbench.c | 2 +- source4/torture/nbt/winsreplication.c | 2 +- source4/torture/rpc/spoolss_notify.c | 2 +- source4/web_server/web_server.c | 2 +- source4/wrepl_server/wrepl_in_connection.c | 2 +- source4/wrepl_server/wrepl_server.c | 2 +- 27 files changed, 31 insertions(+), 31 deletions(-) diff --git a/libcli/nbt/tools/nmblookup.c b/libcli/nbt/tools/nmblookup.c index f6117f2fa9..9b875b08c4 100644 --- a/libcli/nbt/tools/nmblookup.c +++ b/libcli/nbt/tools/nmblookup.c @@ -357,7 +357,7 @@ int main(int argc, const char *argv[]) exit(1); } - load_interface_list(NULL, lpcfg_interfaces(cmdline_lp_ctx), &ifaces); + load_interface_list(NULL, cmdline_lp_ctx, &ifaces); ev = s4_event_context_init(talloc_autofree_context()); diff --git a/source4/cldap_server/cldap_server.c b/source4/cldap_server/cldap_server.c index d5aa9f410f..9370c59df2 100644 --- a/source4/cldap_server/cldap_server.c +++ b/source4/cldap_server/cldap_server.c @@ -189,7 +189,7 @@ static void cldapd_task_init(struct task_server *task) NTSTATUS status; struct interface *ifaces; - load_interface_list(task, lpcfg_interfaces(task->lp_ctx), &ifaces); + load_interface_list(task, task->lp_ctx, &ifaces); if (iface_list_count(ifaces) == 0) { task_server_terminate(task, "cldapd: no network interfaces configured", false); diff --git a/source4/cldap_server/netlogon.c b/source4/cldap_server/netlogon.c index 3f3da8bb41..e950d70ffc 100644 --- a/source4/cldap_server/netlogon.c +++ b/source4/cldap_server/netlogon.c @@ -291,7 +291,7 @@ NTSTATUS fill_netlogon_samlogon_response(struct ldb_context *sam_ctx, client_site = samdb_client_site_name(sam_ctx, mem_ctx, src_address, NULL); NT_STATUS_HAVE_NO_MEMORY(client_site); - load_interface_list(mem_ctx, lpcfg_interfaces(lp_ctx), &ifaces); + load_interface_list(mem_ctx, lp_ctx, &ifaces); /* * TODO: the caller should pass the address which the client * used to trigger this call, as the client is able to reach diff --git a/source4/dns_server/dns_server.c b/source4/dns_server/dns_server.c index 2c0a379fda..de8bc12542 100644 --- a/source4/dns_server/dns_server.c +++ b/source4/dns_server/dns_server.c @@ -617,7 +617,7 @@ static void dns_task_init(struct task_server *task) break; } - load_interface_list(task, lpcfg_interfaces(task->lp_ctx), &ifaces); + load_interface_list(task, task->lp_ctx, &ifaces); if (iface_list_count(ifaces) == 0) { task_server_terminate(task, "dns: no network interfaces configured", false); diff --git a/source4/echo_server/echo_server.c b/source4/echo_server/echo_server.c index 2a4a0bb19a..9393a972e2 100644 --- a/source4/echo_server/echo_server.c +++ b/source4/echo_server/echo_server.c @@ -308,7 +308,7 @@ static void echo_task_init(struct task_server *task) break; } - load_interface_list(task, lpcfg_interfaces(task->lp_ctx), &ifaces); + load_interface_list(task, task->lp_ctx, &ifaces); if (iface_list_count(ifaces) == 0) { task_server_terminate(task, diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c index 5620c0b288..7f7782ca9b 100644 --- a/source4/kdc/kdc.c +++ b/source4/kdc/kdc.c @@ -900,7 +900,7 @@ static void kdc_task_init(struct task_server *task) break; } - load_interface_list(task, lpcfg_interfaces(task->lp_ctx), &ifaces); + load_interface_list(task, task->lp_ctx, &ifaces); if (iface_list_count(ifaces) == 0) { task_server_terminate(task, "kdc: no network interfaces configured", false); diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c index 755eb441f4..2d45766b88 100644 --- a/source4/ldap_server/ldap_server.c +++ b/source4/ldap_server/ldap_server.c @@ -951,7 +951,7 @@ static void ldapsrv_task_init(struct task_server *task) int num_interfaces; int i; - load_interface_list(task, lpcfg_interfaces(task->lp_ctx), &ifaces); + load_interface_list(task, task->lp_ctx, &ifaces); num_interfaces = iface_list_count(ifaces); /* We have been given an interfaces line, and been diff --git a/source4/lib/socket/testsuite.c b/source4/lib/socket/testsuite.c index 518bc72501..357e4ae5df 100644 --- a/source4/lib/socket/testsuite.c +++ b/source4/lib/socket/testsuite.c @@ -42,7 +42,7 @@ static bool test_udp(struct torture_context *tctx) TALLOC_CTX *mem_ctx = tctx; struct interface *ifaces; - load_interface_list(tctx, lpcfg_interfaces(tctx->lp_ctx), &ifaces); + load_interface_list(tctx, tctx->lp_ctx, &ifaces); status = socket_create("ip", SOCKET_TYPE_DGRAM, &sock1, 0); torture_assert_ntstatus_ok(tctx, status, "creating DGRAM IP socket 1"); @@ -135,7 +135,7 @@ static bool test_tcp(struct torture_context *tctx) torture_assert_ntstatus_ok(tctx, status, "creating IP stream socket 1"); talloc_steal(mem_ctx, sock2); - load_interface_list(tctx, lpcfg_interfaces(tctx->lp_ctx), &ifaces); + load_interface_list(tctx, tctx->lp_ctx, &ifaces); localhost = socket_address_from_strings(sock1, sock1->backend_name, iface_list_best_ip(ifaces, "127.0.0.1"), 0); torture_assert(tctx, localhost, "Localhost not found"); diff --git a/source4/libcli/resolve/bcast.c b/source4/libcli/resolve/bcast.c index 794ef34e20..150705f8d8 100644 --- a/source4/libcli/resolve/bcast.c +++ b/source4/libcli/resolve/bcast.c @@ -101,6 +101,6 @@ bool resolve_context_add_bcast_method(struct resolve_context *ctx, struct interf bool resolve_context_add_bcast_method_lp(struct resolve_context *ctx, struct loadparm_context *lp_ctx) { struct interface *ifaces; - load_interface_list(ctx, lpcfg_interfaces(lp_ctx), &ifaces); + load_interface_list(ctx, lp_ctx, &ifaces); return resolve_context_add_bcast_method(ctx, ifaces, lpcfg_nbt_port(lp_ctx), lpcfg_parm_int(lp_ctx, NULL, "nbt", "timeout", 1)); } diff --git a/source4/libcli/resolve/wins.c b/source4/libcli/resolve/wins.c index 914386ce9c..a52b99a23e 100644 --- a/source4/libcli/resolve/wins.c +++ b/source4/libcli/resolve/wins.c @@ -77,6 +77,6 @@ bool resolve_context_add_wins_method(struct resolve_context *ctx, const char **a bool resolve_context_add_wins_method_lp(struct resolve_context *ctx, struct loadparm_context *lp_ctx) { struct interface *ifaces; - load_interface_list(ctx, lpcfg_interfaces(lp_ctx), &ifaces); + load_interface_list(ctx, lp_ctx, &ifaces); return resolve_context_add_wins_method(ctx, lpcfg_wins_server_list(lp_ctx), ifaces, lpcfg_nbt_port(lp_ctx), lpcfg_parm_int(lp_ctx, NULL, "nbt", "timeout", 1)); } diff --git a/source4/libcli/wrepl/winsrepl.c b/source4/libcli/wrepl/winsrepl.c index 2ccc50e71e..0dee2c56cf 100644 --- a/source4/libcli/wrepl/winsrepl.c +++ b/source4/libcli/wrepl/winsrepl.c @@ -136,7 +136,7 @@ NTSTATUS wrepl_socket_split_stream(struct wrepl_socket *wrepl_socket, const char *wrepl_best_ip(struct loadparm_context *lp_ctx, const char *peer_ip) { struct interface *ifaces; - load_interface_list(lp_ctx, lpcfg_interfaces(lp_ctx), &ifaces); + load_interface_list(lp_ctx, lp_ctx, &ifaces); return iface_list_best_ip(ifaces, peer_ip); } diff --git a/source4/nbt_server/nbt_server.c b/source4/nbt_server/nbt_server.c index 3274fdd99d..175ad5e4a4 100644 --- a/source4/nbt_server/nbt_server.c +++ b/source4/nbt_server/nbt_server.c @@ -41,7 +41,7 @@ static void nbtd_task_init(struct task_server *task) NTSTATUS status; struct interface *ifaces; - load_interface_list(task, lpcfg_interfaces(task->lp_ctx), &ifaces); + load_interface_list(task, task->lp_ctx, &ifaces); if (iface_list_count(ifaces) == 0) { task_server_terminate(task, "nbtd: no network interfaces configured", false); diff --git a/source4/nbt_server/wins/wins_ldb.c b/source4/nbt_server/wins/wins_ldb.c index ae90d04c76..6519f9e7f7 100644 --- a/source4/nbt_server/wins/wins_ldb.c +++ b/source4/nbt_server/wins/wins_ldb.c @@ -92,7 +92,7 @@ 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_interface_list(module, lpcfg_interfaces(lp_ctx), &ifaces); + load_interface_list(module, 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 c58cb2709a..604c86ea5d 100644 --- a/source4/nbt_server/wins/winsserver.c +++ b/source4/nbt_server/wins/winsserver.c @@ -1057,7 +1057,7 @@ NTSTATUS nbtd_winsserver_init(struct nbtd_server *nbtsrv) if (owner == NULL) { struct interface *ifaces; - load_interface_list(nbtsrv->task, lpcfg_interfaces(nbtsrv->task->lp_ctx), &ifaces); + load_interface_list(nbtsrv->task, nbtsrv->task->lp_ctx, &ifaces); owner = iface_list_n_ip(ifaces, 0); } diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c index 01ce989125..394a3511c2 100644 --- a/source4/rpc_server/dcerpc_server.c +++ b/source4/rpc_server/dcerpc_server.c @@ -1678,7 +1678,7 @@ static NTSTATUS dcesrv_add_ep_tcp(struct dcesrv_context *dce_ctx, int i; struct interface *ifaces; - load_interface_list(dce_ctx, lpcfg_interfaces(lp_ctx), &ifaces); + load_interface_list(dce_ctx, lp_ctx, &ifaces); num_interfaces = iface_list_count(ifaces); for(i = 0; i < num_interfaces; i++) { diff --git a/source4/scripting/python/pyglue.c b/source4/scripting/python/pyglue.c index 0f2048aa89..8a82f3502a 100644 --- a/source4/scripting/python/pyglue.c +++ b/source4/scripting/python/pyglue.c @@ -153,7 +153,7 @@ static PyObject *py_interface_ips(PyObject *self, PyObject *args) return NULL; } - load_interface_list(tmp_ctx, lpcfg_interfaces(lp_ctx), &ifaces); + load_interface_list(tmp_ctx, lp_ctx, &ifaces); count = iface_list_count(ifaces); diff --git a/source4/smb_server/service_smb.c b/source4/smb_server/service_smb.c index d2833d9be6..7e50318424 100644 --- a/source4/smb_server/service_smb.c +++ b/source4/smb_server/service_smb.c @@ -48,7 +48,7 @@ static void smbsrv_task_init(struct task_server *task) int i; struct interface *ifaces; - load_interface_list(task, lpcfg_interfaces(task->lp_ctx), &ifaces); + load_interface_list(task, task->lp_ctx, &ifaces); num_interfaces = iface_list_count(ifaces); diff --git a/source4/smb_server/smb_samba3.c b/source4/smb_server/smb_samba3.c index 35630ade05..1a99be644a 100644 --- a/source4/smb_server/smb_samba3.c +++ b/source4/smb_server/smb_samba3.c @@ -135,7 +135,7 @@ static void samba3_smb_task_init(struct task_server *task) int i; struct interface *ifaces; - load_interface_list(task, lpcfg_interfaces(task->lp_ctx), &ifaces); + load_interface_list(task, task->lp_ctx, &ifaces); num_interfaces = iface_list_count(ifaces); diff --git a/source4/torture/nbt/dgram.c b/source4/torture/nbt/dgram.c index b33afec68f..aa4759edaf 100644 --- a/source4/torture/nbt/dgram.c +++ b/source4/torture/nbt/dgram.c @@ -91,7 +91,7 @@ static bool nbt_test_netlogon(struct torture_context *tctx) &name, tctx, &address, tctx->ev), talloc_asprintf(tctx, "Failed to resolve %s", name.name)); - load_interface_list(tctx, lpcfg_interfaces(tctx->lp_ctx), &ifaces); + load_interface_list(tctx, tctx->lp_ctx, &ifaces); myaddress = talloc_strdup(dgmsock, iface_list_best_ip(ifaces, address)); @@ -187,7 +187,7 @@ static bool nbt_test_netlogon2(struct torture_context *tctx) &name, tctx, &address, tctx->ev), talloc_asprintf(tctx, "Failed to resolve %s", name.name)); - load_interface_list(tctx, lpcfg_interfaces(tctx->lp_ctx), &ifaces); + load_interface_list(tctx, tctx->lp_ctx, &ifaces); myaddress = talloc_strdup(dgmsock, iface_list_best_ip(ifaces, address)); socket_address = socket_address_from_strings(dgmsock, dgmsock->sock->backend_name, @@ -458,7 +458,7 @@ static bool nbt_test_ntlogon(struct torture_context *tctx) 0, 0, &name, tctx, &address, tctx->ev), talloc_asprintf(tctx, "Failed to resolve %s", name.name)); - load_interface_list(tctx, lpcfg_interfaces(tctx->lp_ctx), &ifaces); + load_interface_list(tctx, tctx->lp_ctx, &ifaces); myaddress = talloc_strdup(dgmsock, iface_list_best_ip(ifaces, address)); socket_address = socket_address_from_strings(dgmsock, dgmsock->sock->backend_name, diff --git a/source4/torture/nbt/register.c b/source4/torture/nbt/register.c index 8405d91c18..24ca328b30 100644 --- a/source4/torture/nbt/register.c +++ b/source4/torture/nbt/register.c @@ -54,7 +54,7 @@ static bool nbt_register_own(struct torture_context *tctx) if (!torture_nbt_get_name(tctx, &name, &address)) return false; - load_interface_list(tctx, lpcfg_interfaces(tctx->lp_ctx), &ifaces); + load_interface_list(tctx, tctx->lp_ctx, &ifaces); myaddress = iface_list_best_ip(ifaces, address); @@ -123,7 +123,7 @@ static bool nbt_refresh_own(struct torture_context *tctx) if (!torture_nbt_get_name(tctx, &name, &address)) return false; - load_interface_list(tctx, lpcfg_interfaces(tctx->lp_ctx), &ifaces); + load_interface_list(tctx, tctx->lp_ctx, &ifaces); myaddress = iface_list_best_ip(ifaces, address); diff --git a/source4/torture/nbt/wins.c b/source4/torture/nbt/wins.c index 635683ffbf..571249f562 100644 --- a/source4/torture/nbt/wins.c +++ b/source4/torture/nbt/wins.c @@ -65,7 +65,7 @@ static bool nbt_test_wins_name(struct torture_context *tctx, const char *address struct interface *ifaces; bool low_port = try_low_port; - load_interface_list(tctx, lpcfg_interfaces(tctx->lp_ctx), &ifaces); + load_interface_list(tctx, tctx->lp_ctx, &ifaces); myaddress = talloc_strdup(tctx, iface_list_best_ip(ifaces, address)); diff --git a/source4/torture/nbt/winsbench.c b/source4/torture/nbt/winsbench.c index 07c7e952cb..cb71d8755d 100644 --- a/source4/torture/nbt/winsbench.c +++ b/source4/torture/nbt/winsbench.c @@ -246,7 +246,7 @@ static bool bench_wins(struct torture_context *tctx) state->registered = talloc_zero_array(state, bool, state->num_names); state->wins_server = address; state->wins_port = lpcfg_nbt_port(tctx->lp_ctx); - load_interface_list(tctx, lpcfg_interfaces(tctx->lp_ctx), &ifaces); + load_interface_list(tctx, tctx->lp_ctx, &ifaces); state->my_ip = talloc_strdup(tctx, iface_list_best_ip(ifaces, address)); state->ttl = timelimit; diff --git a/source4/torture/nbt/winsreplication.c b/source4/torture/nbt/winsreplication.c index 40f7ac33ea..7165f10dbb 100644 --- a/source4/torture/nbt/winsreplication.c +++ b/source4/torture/nbt/winsreplication.c @@ -615,7 +615,7 @@ static struct test_wrepl_conflict_conn *test_create_conflict_ctx( ctx->nbtsock = nbt_name_socket_init(ctx, tctx->ev); if (!ctx->nbtsock) return NULL; - load_interface_list(tctx, lpcfg_interfaces(tctx->lp_ctx), &ifaces); + load_interface_list(tctx, tctx->lp_ctx, &ifaces); ctx->myaddr = socket_address_from_strings(tctx, ctx->nbtsock->sock->backend_name, iface_list_best_ip(ifaces, address), 0); if (!ctx->myaddr) return NULL; diff --git a/source4/torture/rpc/spoolss_notify.c b/source4/torture/rpc/spoolss_notify.c index 04cd01b4a3..cfb67716df 100644 --- a/source4/torture/rpc/spoolss_notify.c +++ b/source4/torture/rpc/spoolss_notify.c @@ -455,7 +455,7 @@ static bool test_start_dcerpc_server(struct torture_context *tctx, lpcfg_set_cmdline(tctx->lp_ctx, "dcerpc endpoint servers", "spoolss"); - load_interface_list(tctx, lpcfg_interfaces(tctx->lp_ctx), &ifaces); + load_interface_list(tctx, tctx->lp_ctx, &ifaces); address = iface_list_n_ip(ifaces, 0); torture_comment(tctx, "Listening for callbacks on %s\n", address); diff --git a/source4/web_server/web_server.c b/source4/web_server/web_server.c index c79f69a0e2..cdf6f9b7d0 100644 --- a/source4/web_server/web_server.c +++ b/source4/web_server/web_server.c @@ -319,7 +319,7 @@ static void websrv_task_init(struct task_server *task) int i; struct interface *ifaces; - load_interface_list(NULL, lpcfg_interfaces(task->lp_ctx), &ifaces); + load_interface_list(NULL, task->lp_ctx, &ifaces); num_interfaces = iface_list_count(ifaces); for(i = 0; i < num_interfaces; i++) { diff --git a/source4/wrepl_server/wrepl_in_connection.c b/source4/wrepl_server/wrepl_in_connection.c index 0837d0097f..9eaf10f52c 100644 --- a/source4/wrepl_server/wrepl_in_connection.c +++ b/source4/wrepl_server/wrepl_in_connection.c @@ -441,7 +441,7 @@ NTSTATUS wreplsrv_setup_sockets(struct wreplsrv_service *service, struct loadpar int i; struct interface *ifaces; - load_interface_list(task, lpcfg_interfaces(lp_ctx), &ifaces); + load_interface_list(task, lp_ctx, &ifaces); num_interfaces = iface_list_count(ifaces); diff --git a/source4/wrepl_server/wrepl_server.c b/source4/wrepl_server/wrepl_server.c index 45cf8a94d2..7b420e3d91 100644 --- a/source4/wrepl_server/wrepl_server.c +++ b/source4/wrepl_server/wrepl_server.c @@ -78,7 +78,7 @@ static NTSTATUS wreplsrv_open_winsdb(struct wreplsrv_service *service, if (owner == NULL) { struct interface *ifaces; - load_interface_list(service, lpcfg_interfaces(lp_ctx), &ifaces); + load_interface_list(service, lp_ctx, &ifaces); owner = iface_list_n_ip(ifaces, 0); } -- cgit