--- old-samba/source/smbd/sesssetup.c	Tue Apr 29 16:28:48 2003
+++ samba/source/smbd/sesssetup.c	Wed Apr 30 21:18:05 2003
@@ -615,8 +615,11 @@
 			nt_resp = data_blob(p+passlen1, passlen2);
 		} else {
 			pstring pass;
+			BOOL unic;
+			unic=SVAL(inbuf, smb_flg2) & FLAGS2_UNICODE_STRINGS;
 			srvstr_pull(inbuf, pass, smb_buf(inbuf), 
-				    sizeof(pass),  passlen1, STR_TERMINATE);
+				    sizeof(pass),  unic ? passlen2 : passlen1, 
+				    STR_TERMINATE);
 			plaintext_password = data_blob(pass, strlen(pass)+1);
 		}