summaryrefslogtreecommitdiff
path: root/source4/libcli/auth
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-21 15:45:32 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-21 15:45:32 +0100
commit263a77c5618daddb0c1e4f0ad0a922bca55faf0d (patch)
tree117a612740901f6822d346d6832e0e1fb33d4abc /source4/libcli/auth
parentede79ae482b16c3cea65d3019bc1a68f07354e89 (diff)
downloadsamba-263a77c5618daddb0c1e4f0ad0a922bca55faf0d.tar.gz
samba-263a77c5618daddb0c1e4f0ad0a922bca55faf0d.tar.bz2
samba-263a77c5618daddb0c1e4f0ad0a922bca55faf0d.zip
Remove more uses of global_loadparm.
(This used to be commit a1715b1f48ba44bd94844418cc9299649aaf1a5e)
Diffstat (limited to 'source4/libcli/auth')
-rw-r--r--source4/libcli/auth/smbencrypt.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/libcli/auth/smbencrypt.c b/source4/libcli/auth/smbencrypt.c
index c5223db63f..cefb55e205 100644
--- a/source4/libcli/auth/smbencrypt.c
+++ b/source4/libcli/auth/smbencrypt.c
@@ -100,7 +100,7 @@ _PUBLIC_ bool E_deshash(const char *passwd, uint8_t p16[16])
/* Password must be converted to DOS charset - null terminated, uppercase. */
push_string(lp_iconv_convenience(global_loadparm), dospwd, passwd, sizeof(dospwd), STR_ASCII|STR_UPPER|STR_TERMINATE);
- /* Only the fisrt 14 chars are considered, password need not be null terminated. */
+ /* Only the first 14 chars are considered, password need not be null terminated. */
E_P16((const uint8_t *)dospwd, p16);
if (strlen(dospwd) > 14) {
@@ -296,12 +296,13 @@ void SMBsesskeygen_lm_sess_key(const uint8_t lm_hash[16],
}
DATA_BLOB NTLMv2_generate_names_blob(TALLOC_CTX *mem_ctx,
+ struct smb_iconv_convenience *iconv_convenience,
const char *hostname,
const char *domain)
{
DATA_BLOB names_blob = data_blob_talloc(mem_ctx, NULL, 0);
- msrpc_gen(mem_ctx, lp_iconv_convenience(global_loadparm), &names_blob,
+ msrpc_gen(mem_ctx, iconv_convenience, &names_blob,
"aaa",
NTLMSSP_NAME_TYPE_DOMAIN, domain,
NTLMSSP_NAME_TYPE_SERVER, hostname,