svn commit: samba r11076 - in branches/SAMBA_4_0/source/auth/ntlmssp: .

[jra at samba.org]

Author: jra
Date: 2005-10-14 22:04:24 +0000 (Fri, 14 Oct 2005)
New Revision: 11076

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11076

Log:
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.

Modified:
   branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp_server.c


Changeset:
Modified: branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp_server.c
===================================================================
--- branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp_server.c	2005-10-14 21:59:36 UTC (rev 11075)
+++ branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp_server.c	2005-10-14 22:04:24 UTC (rev 11076)
@@ -186,13 +186,23 @@
 #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;