From c5bf20c5fe7eaa04cd11a7ce4f365aa6ffd7b124 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 6 Dec 2007 23:57:22 +0100
Subject: r26325: Remove use of global_loadparm in netif. (This used to be
 commit e452cb28594f23add7c00247ed39e8323aea78a6)

---
 source4/libcli/resolve/bcast.c   | 7 ++++---
 source4/libcli/resolve/nbtlist.c | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'source4/libcli/resolve')

diff --git a/source4/libcli/resolve/bcast.c b/source4/libcli/resolve/bcast.c
index 3193d70789..ad574e4c9e 100644
--- a/source4/libcli/resolve/bcast.c
+++ b/source4/libcli/resolve/bcast.c
@@ -23,15 +23,16 @@
 #include "libcli/resolve/resolve.h"
 #include "system/network.h"
 #include "lib/socket/netif.h"
+#include "param/param.h"
 
-/*
+/**
   broadcast name resolution method - async send
  */
 struct composite_context *resolve_name_bcast_send(TALLOC_CTX *mem_ctx, 
 						  struct event_context *event_ctx,
 						  struct nbt_name *name)
 {
-	int num_interfaces = iface_count();
+	int num_interfaces = iface_count(global_loadparm);
 	const char **address_list;
 	struct composite_context *c;
 	int i, count=0;
@@ -40,7 +41,7 @@ struct composite_context *resolve_name_bcast_send(TALLOC_CTX *mem_ctx,
 	if (address_list == NULL) return NULL;
 
 	for (i=0;i<num_interfaces;i++) {
-		const char *bcast = iface_n_bcast(i);
+		const char *bcast = iface_n_bcast(global_loadparm, i);
 		if (bcast == NULL) continue;
 		address_list[count] = talloc_strdup(address_list, bcast);
 		if (address_list[count] == NULL) {
diff --git a/source4/libcli/resolve/nbtlist.c b/source4/libcli/resolve/nbtlist.c
index 13010eec3e..daa602f97c 100644
--- a/source4/libcli/resolve/nbtlist.c
+++ b/source4/libcli/resolve/nbtlist.c
@@ -77,7 +77,7 @@ static void nbtlist_handler(struct nbt_name_request *req)
 	/* favor a local address if possible */
 	state->reply_addr = NULL;
 	for (i=0;i<q->out.num_addrs;i++) {
-		if (iface_is_local(q->out.reply_addrs[i])) {
+		if (iface_is_local(global_loadparm, q->out.reply_addrs[i])) {
 			state->reply_addr = talloc_steal(state, 
 							 q->out.reply_addrs[i]);
 			break;
-- 
cgit