diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-21 17:17:37 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-21 17:17:37 +0100 |
| commit | c38c2765d1059b33f044a42c6555f3d10d339911 (patch) | |
| tree | a97496f0b1cf0294900dfcad47675eef1b8f4ec8 /source4/libcli/resolve/nbtlist.c | |
| parent | d63321a41e5e7d39a8a4e79a980cf92b1da7dfc0 (diff) | |
| download | samba-c38c2765d1059b33f044a42c6555f3d10d339911.tar.gz samba-c38c2765d1059b33f044a42c6555f3d10d339911.tar.bz2 samba-c38c2765d1059b33f044a42c6555f3d10d339911.zip | |
Remove yet more uses of global_loadparm.
(This used to be commit e01c1e87c0fe9709df7eb5b863f7ce85564174cd)
Diffstat (limited to 'source4/libcli/resolve/nbtlist.c')
| -rw-r--r-- | source4/libcli/resolve/nbtlist.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source4/libcli/resolve/nbtlist.c b/source4/libcli/resolve/nbtlist.c index e1452c09d2..34578e953a 100644 --- a/source4/libcli/resolve/nbtlist.c +++ b/source4/libcli/resolve/nbtlist.c @@ -102,6 +102,7 @@ struct composite_context *resolve_name_nbtlist_send(TALLOC_CTX *mem_ctx, const char **address_list, struct interface *ifaces, uint16_t nbt_port, + int nbt_timeout, bool broadcast, bool wins_lookup) { @@ -161,7 +162,7 @@ struct composite_context *resolve_name_nbtlist_send(TALLOC_CTX *mem_ctx, state->io_queries[i].in.broadcast = broadcast; state->io_queries[i].in.wins_lookup = wins_lookup; - state->io_queries[i].in.timeout = lp_parm_int(global_loadparm, NULL, "nbt", "timeout", 1); + state->io_queries[i].in.timeout = nbt_timeout; state->io_queries[i].in.retries = 2; state->queries[i] = nbt_name_query_send(state->nbtsock, &state->io_queries[i]); @@ -201,12 +202,14 @@ NTSTATUS resolve_name_nbtlist(struct nbt_name *name, const char **address_list, struct interface *ifaces, uint16_t nbt_port, + int nbt_timeout, bool broadcast, bool wins_lookup, const char **reply_addr) { struct composite_context *c = resolve_name_nbtlist_send(mem_ctx, NULL, name, address_list, ifaces, nbt_port, + nbt_timeout, broadcast, wins_lookup); return resolve_name_nbtlist_recv(c, mem_ctx, reply_addr); } |