From 5de65d5801f77838dc5cc9f856290ac95c1b8660 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 14 Oct 2005 22:04:24 +0000 Subject: r11076: Still working on bug #1828, PPC hell. The PPC client sends the NTLMSSP client and domain strings as Unicode, even when setting flags as OEM. Cope with this. Jeremy. (This used to be commit 77399e1cecc44674c3398143d8a5bb59c600abcd) --- source4/auth/ntlmssp/ntlmssp_server.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/source4/auth/ntlmssp/ntlmssp_server.c b/source4/auth/ntlmssp/ntlmssp_server.c index 9f106da37c..9a1e11aff6 100644 --- a/source4/auth/ntlmssp/ntlmssp_server.c +++ b/source4/auth/ntlmssp/ntlmssp_server.c @@ -186,13 +186,23 @@ NTSTATUS ntlmssp_server_negotiate(struct gensec_security *gensec_security, #endif if (in.length) { - if (!msrpc_parse(out_mem_ctx, + BOOL parse_ok = msrpc_parse(out_mem_ctx, &in, "CddAA", "NTLMSSP", &ntlmssp_command, &neg_flags, &cliname, - &domname)) { + &domname); + if (!parse_ok) { + parse_ok = msrpc_parse(out_mem_ctx, + &in, "CddUU", + "NTLMSSP", + &ntlmssp_command, + &neg_flags, + &cliname, + &domname); + } + if (!parse_ok) { DEBUG(1, ("ntlmssp_server_negotiate: failed to parse NTLMSSP:\n")); dump_data(2, in.data, in.length); return NT_STATUS_INVALID_PARAMETER; -- cgit