Index: libsmb/ntlmssp.c
===================================================================
--- libsmb/ntlmssp.c	(revision 11075)
+++ libsmb/ntlmssp.c	(working copy)
@@ -419,7 +419,6 @@
 	fstring dnsname, dnsdomname;
 	uint32 neg_flags = 0;
 	uint32 ntlmssp_command, chal_flags;
-	char *cliname=NULL, *domname=NULL;
 	const uint8 *cryptkey;
 	const char *target_name;
 
@@ -429,40 +428,15 @@
 #endif
 
 	if (request.length) {
-		BOOL parse_ok = msrpc_parse(&request, "CddAA",
-				 "NTLMSSP",
-				 &ntlmssp_command,
-				 &neg_flags,
-				 &cliname,
-				 &domname);
-
-		if (!parse_ok) {
-			/* PocketPC 2003 sends the cliname and domname strings in unicode,
-			   but doesn't set the unicode bit. Try with a parse string of "CddUU" */
-			SAFE_FREE(cliname);
-			SAFE_FREE(domname);
-			parse_ok = msrpc_parse(&request, "CddUU",
-				 "NTLMSSP",
-				 &ntlmssp_command,
-				 &neg_flags,
-				 &cliname,
-				 &domname);
-		}
-
-		if (!parse_ok) {
-			DEBUG(1, ("ntlmssp_server_negotiate: failed to parse NTLMSSP Negotiate:\n"));
+		if ((request.length < 16) || !msrpc_parse(&request, "Cdd",
+							"NTLMSSP",
+							&ntlmssp_command,
+							&neg_flags)) {
+			DEBUG(1, ("ntlmssp_server_negotiate: failed to parse NTLMSSP Negotiate of length %u\n",
+				(unsigned int)request.length));
 			dump_data(2, (const char *)request.data, request.length);
-			SAFE_FREE(cliname);
-			SAFE_FREE(domname);
 			return NT_STATUS_INVALID_PARAMETER;
 		}
-		
-		DEBUG(10, ("ntlmssp_server_negotiate: client = %s, domain = %s\n",
-				cliname ? cliname : "", domname ? domname : ""));
-
-		SAFE_FREE(cliname);
-		SAFE_FREE(domname);
-		
 		debug_ntlmssp_flags(neg_flags);
 	}