diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-21 15:45:32 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-21 15:45:32 +0100 |
commit | 263a77c5618daddb0c1e4f0ad0a922bca55faf0d (patch) | |
tree | 117a612740901f6822d346d6832e0e1fb33d4abc /source4/libcli/smb_composite | |
parent | ede79ae482b16c3cea65d3019bc1a68f07354e89 (diff) | |
download | samba-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/smb_composite')
-rw-r--r-- | source4/libcli/smb_composite/sesssetup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/libcli/smb_composite/sesssetup.c b/source4/libcli/smb_composite/sesssetup.c index ce7bcc143e..f5a976958d 100644 --- a/source4/libcli/smb_composite/sesssetup.c +++ b/source4/libcli/smb_composite/sesssetup.c @@ -223,7 +223,7 @@ static NTSTATUS session_setup_nt1(struct composite_context *c, NTSTATUS nt_status; struct sesssetup_state *state = talloc_get_type(c->private_data, struct sesssetup_state); const char *password = cli_credentials_get_password(io->in.credentials); - DATA_BLOB names_blob = NTLMv2_generate_names_blob(state, session->transport->socket->hostname, lp_workgroup(global_loadparm)); + DATA_BLOB names_blob = NTLMv2_generate_names_blob(state, lp_iconv_convenience(global_loadparm), session->transport->socket->hostname, lp_workgroup(global_loadparm)); DATA_BLOB session_key; int flags = CLI_CRED_NTLM_AUTH; if (lp_client_lanman_auth(global_loadparm)) { @@ -290,7 +290,7 @@ static NTSTATUS session_setup_old(struct composite_context *c, NTSTATUS nt_status; struct sesssetup_state *state = talloc_get_type(c->private_data, struct sesssetup_state); const char *password = cli_credentials_get_password(io->in.credentials); - DATA_BLOB names_blob = NTLMv2_generate_names_blob(state, session->transport->socket->hostname, lp_workgroup(global_loadparm)); + DATA_BLOB names_blob = NTLMv2_generate_names_blob(state, lp_iconv_convenience(global_loadparm), session->transport->socket->hostname, lp_workgroup(global_loadparm)); DATA_BLOB session_key; int flags = 0; if (lp_client_lanman_auth(global_loadparm)) { |