sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-12-18 08:23:51 +03:00
Code Activity

r26378: Remove use of global_loadparm.

Browse Source 
(This used to be commit 81333de535)
This commit is contained in:
Jelmer Vernooij
2007-12-10 18:41:33 +01:00
committed by Stefan Metzmacher
parent 51ef1b606f
commit eede6b87e1
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source4/libcli/resolve/bcast.c
View File

@@ -33,7 +33,8 @@ struct composite_context *resolve_name_bcast_send(TALLOC_CTX *mem_ctx,
void *userdata, void *userdata,
struct nbt_name *name) struct nbt_name *name)
{ {
int num_interfaces = iface_count(global_loadparm); struct loadparm_context *lp_ctx = userdata;
int num_interfaces = iface_count(lp_ctx);
const char **address_list; const char **address_list;
struct composite_context *c; struct composite_context *c;
int i, count=0; int i, count=0;
@@ -42,7 +43,7 @@ struct composite_context *resolve_name_bcast_send(TALLOC_CTX *mem_ctx,
if (address_list == NULL) return NULL; if (address_list == NULL) return NULL;
for (i=0;i<num_interfaces;i++) { for (i=0;i<num_interfaces;i++) {
const char *bcast = iface_n_bcast(global_loadparm, i); const char *bcast = iface_n_bcast(lp_ctx, i);
if (bcast == NULL) continue; if (bcast == NULL) continue;
address_list[count] = talloc_strdup(address_list, bcast); address_list[count] = talloc_strdup(address_list, bcast);
if (address_list[count] == NULL) { if (address_list[count] == NULL) {
@@ -79,8 +80,8 @@ NTSTATUS resolve_name_bcast(struct nbt_name *name,
return resolve_name_bcast_recv(c, mem_ctx, reply_addr); return resolve_name_bcast_recv(c, mem_ctx, reply_addr);
} }
bool resolve_context_add_bcast_method(struct resolve_context *ctx) bool resolve_context_add_bcast_method(struct resolve_context *ctx, struct loadparm_context *lp_ctx)
{ {
return resolve_context_add_method(ctx, resolve_name_bcast_send, resolve_name_bcast_recv, return resolve_context_add_method(ctx, resolve_name_bcast_send, resolve_name_bcast_recv,
NULL); lp_ctx);
} }

2
source4/libcli/resolve/resolve.c
View File

@@ -241,7 +241,7 @@ struct resolve_context *lp_resolve_context(struct loadparm_context *lp_ctx)
if (!strcmp(methods[i], "wins")) { if (!strcmp(methods[i], "wins")) {
resolve_context_add_wins_method(ret, lp_wins_server_list(lp_ctx)); resolve_context_add_wins_method(ret, lp_wins_server_list(lp_ctx));
} else if (!strcmp(methods[i], "bcast")) { } else if (!strcmp(methods[i], "bcast")) {
resolve_context_add_bcast_method(ret); resolve_context_add_bcast_method(ret, lp_ctx);
} else if (!strcmp(methods[i], "host")) { } else if (!strcmp(methods[i], "host")) {
resolve_context_add_host_method(ret); resolve_context_add_host_method(ret);
} else { } else {