sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-10-22 07:33:16 +03:00
Code Activity

r26325: Remove use of global_loadparm in netif.

Browse Source
This commit is contained in:
Jelmer Vernooij
2007-12-06 23:57:22 +01:00
committed by Stefan Metzmacher
parent 8089283784
commit e452cb2859
27 changed files with 76 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/libcli/resolve/bcast.c
View File

@@ -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) {

2
source/libcli/resolve/nbtlist.c
View File

@@ -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;