summaryrefslogtreecommitdiffstats
path: root/source4/libcli/auth
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-21 14:50:57 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-21 14:50:57 +0100
commit921b17648456027b6b46a582aa1d13024a5e9a90 (patch)
tree637fe02b288cf87c33fabd6e6875f5e6d011eae5 /source4/libcli/auth
parent37deca2d41d74faa7abe060a21340263bd6d66f7 (diff)
downloadsamba-921b17648456027b6b46a582aa1d13024a5e9a90.tar.gz
samba-921b17648456027b6b46a582aa1d13024a5e9a90.tar.xz
samba-921b17648456027b6b46a582aa1d13024a5e9a90.zip
Remove more uses of global_loadparm.
(This used to be commit 47d05ecf6fef66c90994f666b8c63e2e7b5a6cd8)
Diffstat (limited to 'source4/libcli/auth')
-rw-r--r--source4/libcli/auth/smbencrypt.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source4/libcli/auth/smbencrypt.c b/source4/libcli/auth/smbencrypt.c
index 4ccf568d8c..c5223db63f 100644
--- a/source4/libcli/auth/smbencrypt.c
+++ b/source4/libcli/auth/smbencrypt.c
@@ -125,6 +125,8 @@ bool ntv2_owf_gen(const uint8_t owf[16],
HMACMD5Context ctx;
TALLOC_CTX *mem_ctx = talloc_init("ntv2_owf_gen for %s\\%s", domain_in, user_in);
+ struct smb_iconv_convenience *iconv_convenience = lp_iconv_convenience(global_loadparm);
+
if (!mem_ctx) {
return false;
}
@@ -151,14 +153,14 @@ bool ntv2_owf_gen(const uint8_t owf[16],
}
}
- user_byte_len = push_ucs2_talloc(mem_ctx, lp_iconv_convenience(global_loadparm), &user, user_in);
+ user_byte_len = push_ucs2_talloc(mem_ctx, iconv_convenience, &user, user_in);
if (user_byte_len == (ssize_t)-1) {
DEBUG(0, ("push_uss2_talloc() for user returned -1 (probably talloc() failure)\n"));
talloc_free(mem_ctx);
return false;
}
- domain_byte_len = push_ucs2_talloc(mem_ctx, lp_iconv_convenience(global_loadparm), &domain, domain_in);
+ domain_byte_len = push_ucs2_talloc(mem_ctx, iconv_convenience, &domain, domain_in);
if (domain_byte_len == (ssize_t)-1) {
DEBUG(0, ("push_ucs2_talloc() for domain returned -1 (probably talloc() failure)\n"));
talloc_free(mem_ctx);