summaryrefslogtreecommitdiff
path: root/source4/libnet
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-13 12:19:33 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:49:53 +0100
commita5b8999f23d56b4a19b87fc17b22c96f88e487e8 (patch)
tree2cfc01d253b8d41ed95c7ac90dd6691e27d88681 /source4/libnet
parentaa32619c5c910b9f5989f44de21621db5ef7c357 (diff)
downloadsamba-a5b8999f23d56b4a19b87fc17b22c96f88e487e8.tar.gz
samba-a5b8999f23d56b4a19b87fc17b22c96f88e487e8.tar.bz2
samba-a5b8999f23d56b4a19b87fc17b22c96f88e487e8.zip
r26427: Avoid global_smb_iconv_convenience.
(This used to be commit bf072c6fb37b3e6a71c0c747b9fbeaa01480229e)
Diffstat (limited to 'source4/libnet')
-rw-r--r--source4/libnet/libnet_samdump.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/libnet/libnet_samdump.c b/source4/libnet/libnet_samdump.c
index 93e25aa428..9d417d280d 100644
--- a/source4/libnet/libnet_samdump.c
+++ b/source4/libnet/libnet_samdump.c
@@ -185,7 +185,7 @@ NTSTATUS libnet_SamDump(struct libnet_context *ctx, TALLOC_CTX *mem_ctx,
if (strcasecmp_m(s->name, secret_name) != 0) {
continue;
}
- if (convert_string_talloc(mem_ctx, global_smb_iconv_convenience, CH_UTF16, CH_UNIX,
+ if (convert_string_talloc(mem_ctx, lp_iconv_convenience(ctx->lp_ctx), CH_UTF16, CH_UNIX,
s->secret.data, s->secret.length,
(void **)&secret_string) == -1) {
r->out.error_string = talloc_asprintf(mem_ctx,