Bug 281991. Fix for domain on Vista.

This commit is contained in:
Jim Norman 2007-08-08 21:38:22 +00:00
parent 3dd944a25b
commit 51529653f5

View File

@ -377,7 +377,7 @@ NPLogonNotify (
CP_UTF8, CP_UTF8,
0, 0,
pAuthInfo->UserName.Buffer, pAuthInfo->UserName.Buffer,
-1, pAuthInfo->UserName.Length/sizeof(WCHAR) + 1, //-1,
(LPSTR)&basicCredential.username, (LPSTR)&basicCredential.username,
NSSCS_MAX_USERID_LEN, NSSCS_MAX_USERID_LEN,
NULL, NULL,
@ -391,7 +391,7 @@ NPLogonNotify (
CP_UTF8, CP_UTF8,
0, 0,
pAuthInfo->Password.Buffer, pAuthInfo->Password.Buffer,
-1, pAuthInfo->Password.Length/sizeof(WCHAR) + 1, //-1,
(LPSTR)&basicCredential.password, (LPSTR)&basicCredential.password,
NSSCS_MAX_PWORD_LEN, NSSCS_MAX_PWORD_LEN,
NULL, NULL,
@ -431,11 +431,13 @@ NPLogonNotify (
if (pAuthInfo->LogonDomainName.Length != 0) if (pAuthInfo->LogonDomainName.Length != 0)
{ {
memset(domainCredential.id, 0, NSSCS_MAX_SECRET_ID_LEN);
domainCredential.len = WideCharToMultiByte( domainCredential.len = WideCharToMultiByte(
CP_UTF8, CP_UTF8,
0, 0,
pAuthInfo->LogonDomainName.Buffer, pAuthInfo->LogonDomainName.Buffer,
-1, pAuthInfo->LogonDomainName.Length/sizeof(WCHAR),
(LPSTR)&domainCredential.id, (LPSTR)&domainCredential.id,
NSSCS_MAX_SECRET_ID_LEN, NSSCS_MAX_SECRET_ID_LEN,
NULL, NULL,
@ -443,7 +445,7 @@ NPLogonNotify (
if (domainCredential.len) if (domainCredential.len)
{ {
// domainCredential.len++;
#ifdef _DEBUG #ifdef _DEBUG
DebugPrint("Domain exists - [%s], length %d\n", domainCredential.id, domainCredential.len); DebugPrint("Domain exists - [%s], length %d\n", domainCredential.id, domainCredential.len);