summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
Diffstat (limited to 'source4')
-rw-r--r--source4/libcli/finddcs.c11
-rw-r--r--source4/libnet/libnet_lookup.c3
-rw-r--r--source4/winbind/wb_dom_info.c1
3 files changed, 12 insertions, 3 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);
}
diff --git a/source4/libnet/libnet_lookup.c b/source4/libnet/libnet_lookup.c
index 409cc7575b..cab4d9e73f 100644
--- a/source4/libnet/libnet_lookup.c
+++ b/source4/libnet/libnet_lookup.c
@@ -197,7 +197,8 @@ struct composite_context* libnet_LookupDCs_send(struct libnet_context *ctx,
c = finddcs_send(mem_ctx, lp_netbios_name(ctx->lp_ctx), lp_nbt_port(ctx->lp_ctx),
io->in.domain_name, io->in.name_type,
- NULL, ctx->resolve_ctx, ctx->event_ctx, msg_ctx);
+ NULL, lp_iconv_convenience(ctx->lp_ctx),
+ ctx->resolve_ctx, ctx->event_ctx, msg_ctx);
return c;
}
diff --git a/source4/winbind/wb_dom_info.c b/source4/winbind/wb_dom_info.c
index 7558fc9d62..4fcbf3a6e5 100644
--- a/source4/winbind/wb_dom_info.c
+++ b/source4/winbind/wb_dom_info.c
@@ -71,6 +71,7 @@ struct composite_context *wb_get_dom_info_send(TALLOC_CTX *mem_ctx,
lp_nbt_port(service->task->lp_ctx),
domain_name, NBT_NAME_LOGON,
dom_sid,
+ lp_iconv_convenience(service->task->lp_ctx),
lp_resolve_context(service->task->lp_ctx),
service->task->event_ctx,
service->task->msg_ctx);