diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-10 04:33:16 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:49:01 +0100 |
| commit | b65dba2245bf382c47d65c95ac9b1efa43918fc0 (patch) | |
| tree | e2a474ba5bd99368423ad11d3632c55a51ed865c /source4/utils/nmblookup.c | |
| parent | 4a36b71675a5ea2a22d7cf2a79d61a3cd511e99f (diff) | |
| download | samba-b65dba2245bf382c47d65c95ac9b1efa43918fc0.tar.gz samba-b65dba2245bf382c47d65c95ac9b1efa43918fc0.tar.bz2 samba-b65dba2245bf382c47d65c95ac9b1efa43918fc0.zip | |
r26355: Eliminate global_loadparm in more places.
(This used to be commit 5d589a0d94bd76a9b4c9fc748854e8098ea43c4d)
Diffstat (limited to 'source4/utils/nmblookup.c')
| -rw-r--r-- | source4/utils/nmblookup.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/utils/nmblookup.c b/source4/utils/nmblookup.c index 9f121390f6..a3e33e2748 100644 --- a/source4/utils/nmblookup.c +++ b/source4/utils/nmblookup.c @@ -179,7 +179,7 @@ static NTSTATUS do_node_query(struct nbt_name_socket *nbtsock, } -static bool process_one(const char *name, int nbt_port) +static bool process_one(struct loadparm_context *lp_ctx, const char *name, int nbt_port) { TALLOC_CTX *tmp_ctx = talloc_new(NULL); enum nbt_name_type node_type = NBT_NAME_CLIENT; @@ -241,9 +241,9 @@ static bool process_one(const char *name, int nbt_port) status = do_node_query(nbtsock, options.unicast_address, nbt_port, node_name, node_type, false); } else { - int i, num_interfaces = iface_count(global_loadparm); + int i, num_interfaces = iface_count(lp_ctx); 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; status = do_node_query(nbtsock, bcast, nbt_port, node_name, node_type, true); @@ -353,7 +353,7 @@ int main(int argc, const char *argv[]) while (poptPeekArg(pc)) { const char *name = poptGetArg(pc); - ret &= process_one(name, lp_nbt_port(global_loadparm)); + ret &= process_one(cmdline_lp_ctx, name, lp_nbt_port(cmdline_lp_ctx)); } poptFreeContext(pc); |