diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-01-03 17:22:04 -0600 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2008-01-03 12:33:36 -0600 |
commit | 6f79af9d13cb400506e05f20fb68c7f97daccf38 (patch) | |
tree | 97855c54cc65fc5af21c210f43aeb6d773886e94 /source4/auth/ntlmssp/ntlmssp_server.c | |
parent | 425732f688865ebe2bfe568c8278edec50cbdedf (diff) | |
download | samba-6f79af9d13cb400506e05f20fb68c7f97daccf38.tar.gz samba-6f79af9d13cb400506e05f20fb68c7f97daccf38.tar.bz2 samba-6f79af9d13cb400506e05f20fb68c7f97daccf38.zip |
r26652: msrpc_parse/msrpc_gen: Add iconv_convenience argument.
(This used to be commit e886f1bc0dc694971979716d1991535c7d2e08de)
Diffstat (limited to 'source4/auth/ntlmssp/ntlmssp_server.c')
-rw-r--r-- | source4/auth/ntlmssp/ntlmssp_server.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source4/auth/ntlmssp/ntlmssp_server.c b/source4/auth/ntlmssp/ntlmssp_server.c index 1ee05cf66a..eb6dbc5bca 100644 --- a/source4/auth/ntlmssp/ntlmssp_server.c +++ b/source4/auth/ntlmssp/ntlmssp_server.c @@ -136,7 +136,9 @@ NTSTATUS ntlmssp_server_negotiate(struct gensec_security *gensec_security, #endif if (in.length) { - if ((in.length < 16) || !msrpc_parse(out_mem_ctx, &in, "Cdd", + if ((in.length < 16) || !msrpc_parse(out_mem_ctx, + lp_iconv_convenience(gensec_security->lp_ctx), + &in, "Cdd", "NTLMSSP", &ntlmssp_command, &neg_flags)) { @@ -201,6 +203,7 @@ NTSTATUS ntlmssp_server_negotiate(struct gensec_security *gensec_security, } msrpc_gen(out_mem_ctx, + lp_iconv_convenience(gensec_security->lp_ctx), &struct_blob, "aaaaa", NTLMSSP_NAME_TYPE_DOMAIN, target_name, NTLMSSP_NAME_TYPE_SERVER, gensec_ntlmssp_state->server_name, @@ -221,6 +224,7 @@ NTSTATUS ntlmssp_server_negotiate(struct gensec_security *gensec_security, } msrpc_gen(out_mem_ctx, + lp_iconv_convenience(gensec_security->lp_ctx), out, gen_string, "NTLMSSP", NTLMSSP_CHALLENGE, @@ -278,6 +282,7 @@ static NTSTATUS ntlmssp_server_preauth(struct gensec_ntlmssp_state *gensec_ntlms /* now the NTLMSSP encoded auth hashes */ if (!msrpc_parse(gensec_ntlmssp_state, + lp_iconv_convenience(gensec_ntlmssp_state->gensec_security->lp_ctx), &request, parse_string, "NTLMSSP", &ntlmssp_command, @@ -304,6 +309,7 @@ static NTSTATUS ntlmssp_server_preauth(struct gensec_ntlmssp_state *gensec_ntlms /* now the NTLMSSP encoded auth hashes */ if (!msrpc_parse(gensec_ntlmssp_state, + lp_iconv_convenience(gensec_ntlmssp_state->gensec_security->lp_ctx), &request, parse_string, "NTLMSSP", &ntlmssp_command, |