diff options
| author | Jeremy Allison <jra@samba.org> | 2005-10-14 22:04:24 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:44:44 -0500 |
| commit | 5de65d5801f77838dc5cc9f856290ac95c1b8660 (patch) | |
| tree | aa48f22e01725deb8f0852e0a3bbd2b45cc1c043 /source4/auth | |
| parent | 0aa0c5340fcf01023093a51d2f38df587193c3e3 (diff) | |
| download | samba-5de65d5801f77838dc5cc9f856290ac95c1b8660.tar.gz samba-5de65d5801f77838dc5cc9f856290ac95c1b8660.tar.bz2 samba-5de65d5801f77838dc5cc9f856290ac95c1b8660.zip | |
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)
Diffstat (limited to 'source4/auth')
| -rw-r--r-- | source4/auth/ntlmssp/ntlmssp_server.c | 14 |
1 files 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; |