summaryrefslogtreecommitdiff
path: root/source4/libcli
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-28 21:02:49 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-28 21:02:49 +0100
commit7e045915205264efdd96d7e55a9e342c2748c93e (patch)
treec7a3de56dea258a2cc763d0c118a162a44c483a2 /source4/libcli
parent2946a11dc7d367128d8c002966ac19e3e36450dd (diff)
downloadsamba-7e045915205264efdd96d7e55a9e342c2748c93e.tar.gz
samba-7e045915205264efdd96d7e55a9e342c2748c93e.tar.bz2
samba-7e045915205264efdd96d7e55a9e342c2748c93e.zip
Remove use of global_loadparm.
(This used to be commit 3cf3922c806d0e33439073d204b44bf0af3102d5)
Diffstat (limited to 'source4/libcli')
-rw-r--r--source4/libcli/finddcs.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/source4/libcli/finddcs.c b/source4/libcli/finddcs.c
index 67ba47ddc6..56f931ce19 100644
--- a/source4/libcli/finddcs.c
+++ b/source4/libcli/finddcs.c
@@ -41,6 +41,8 @@ struct finddcs_state {
struct nbtd_getdcname r;
struct nbt_name_status node_status;
+ struct smb_iconv_convenience *iconv_convenience;
+
int num_dcs;
struct nbt_dc_name *dcs;
uint16_t nbt_port;
@@ -67,6 +69,7 @@ struct composite_context *finddcs_send(TALLOC_CTX *mem_ctx,
const char *domain_name,
int name_type,
struct dom_sid *domain_sid,
+ struct smb_iconv_convenience *iconv_convenience,
struct resolve_context *resolve_ctx,
struct event_context *event_ctx,
struct messaging_context *msg_ctx)
@@ -87,6 +90,7 @@ struct composite_context *finddcs_send(TALLOC_CTX *mem_ctx,
state->nbt_port = nbt_port;
state->my_netbios_name = talloc_strdup(state, my_netbios_name);
state->domain_name = talloc_strdup(state, domain_name);
+ state->iconv_convenience = iconv_convenience;
if (composite_nomem(state->domain_name, c)) return c;
if (domain_sid) {
@@ -197,7 +201,7 @@ static void fallback_node_status(struct finddcs_state *state)
state->node_status.in.retries = 2;
nbtsock = nbt_name_socket_init(state, state->ctx->event_ctx,
- lp_iconv_convenience(global_loadparm));
+ state->iconv_convenience);
if (composite_nomem(nbtsock, state->ctx)) return;
name_req = nbt_name_status_send(nbtsock, &state->node_status);
@@ -255,6 +259,7 @@ NTSTATUS finddcs(TALLOC_CTX *mem_ctx,
uint16_t nbt_port,
const char *domain_name, int name_type,
struct dom_sid *domain_sid,
+ struct smb_iconv_convenience *iconv_convenience,
struct resolve_context *resolve_ctx,
struct event_context *event_ctx,
struct messaging_context *msg_ctx,
@@ -264,7 +269,9 @@ NTSTATUS finddcs(TALLOC_CTX *mem_ctx,
my_netbios_name,
nbt_port,
domain_name, name_type,
- domain_sid, resolve_ctx,
+ domain_sid,
+ iconv_convenience,
+ resolve_ctx,
event_ctx, msg_ctx);
return finddcs_recv(c, mem_ctx, num_dcs, dcs);
}