ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

advapi32: Return the computer name as referenced domain name in LookupAccountName.

This commit is contained in:
Hans Leidekker 2010-12-10 12:53:25 +01:00 committed by Alexandre Julliard
parent b0c925cdb2
commit eba814763a
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dlls/advapi32/security.c
View File

@ -2629,9 +2629,8 @@ static BOOL lookup_user_account_name(PSID Sid, PDWORD cbSid, LPWSTR ReferencedDo
HANDLE token; HANDLE token;
BOOL ret; BOOL ret;
PSID pSid; PSID pSid;
static const WCHAR dm[] = {'D','O','M','A','I','N',0}; WCHAR domainName[MAX_COMPUTERNAME_LENGTH + 1];
DWORD nameLen; DWORD nameLen;
LPCWSTR domainName;
if (!OpenThreadToken(GetCurrentThread(), TOKEN_READ, TRUE, &token)) if (!OpenThreadToken(GetCurrentThread(), TOKEN_READ, TRUE, &token))
{ {
@ -2655,9 +2654,12 @@ static BOOL lookup_user_account_name(PSID Sid, PDWORD cbSid, LPWSTR ReferencedDo
} }
*cbSid = GetLengthSid(pSid); *cbSid = GetLengthSid(pSid);
domainName = dm; nameLen = MAX_COMPUTERNAME_LENGTH + 1;
nameLen = strlenW(domainName); if (!GetComputerNameW(domainName, &nameLen))
{
domainName[0] = 0;
nameLen = 0;
}
if (*cchReferencedDomainName <= nameLen || !ret) if (*cchReferencedDomainName <= nameLen || !ret)
{ {
SetLastError(ERROR_INSUFFICIENT_BUFFER); SetLastError(ERROR_INSUFFICIENT_BUFFER);
@ -2683,9 +2685,8 @@ static BOOL lookup_computer_account_name(PSID Sid, PDWORD cbSid, LPWSTR Referenc
{ {
MAX_SID local; MAX_SID local;
BOOL ret; BOOL ret;
static const WCHAR dm[] = {'D','O','M','A','I','N',0}; WCHAR domainName[MAX_COMPUTERNAME_LENGTH + 1];
DWORD nameLen; DWORD nameLen;
LPCWSTR domainName;
if ((ret = ADVAPI_GetComputerSid(&local))) if ((ret = ADVAPI_GetComputerSid(&local)))
{ {
@ -2699,9 +2700,12 @@ static BOOL lookup_computer_account_name(PSID Sid, PDWORD cbSid, LPWSTR Referenc
*cbSid = GetLengthSid(&local); *cbSid = GetLengthSid(&local);
} }
domainName = dm; nameLen = MAX_COMPUTERNAME_LENGTH + 1;
nameLen = strlenW(domainName); if (!GetComputerNameW(domainName, &nameLen))
{
domainName[0] = 0;
nameLen = 0;
}
if (*cchReferencedDomainName <= nameLen || !ret) if (*cchReferencedDomainName <= nameLen || !ret)
{ {
SetLastError(ERROR_INSUFFICIENT_BUFFER); SetLastError(ERROR_INSUFFICIENT_BUFFER);
@ -2898,11 +2902,12 @@ BOOL WINAPI LookupAccountNameW( LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSI
BOOL ret, handled; BOOL ret, handled;
LSA_UNICODE_STRING account; LSA_UNICODE_STRING account;
FIXME("%s %s %p %p %p %p %p - stub\n", debugstr_w(lpSystemName), debugstr_w(lpAccountName), TRACE("%s %s %p %p %p %p %p\n", debugstr_w(lpSystemName), debugstr_w(lpAccountName),
Sid, cbSid, ReferencedDomainName, cchReferencedDomainName, peUse); Sid, cbSid, ReferencedDomainName, cchReferencedDomainName, peUse);
if (!ADVAPI_IsLocalComputer( lpSystemName )) if (!ADVAPI_IsLocalComputer( lpSystemName ))
{ {
FIXME("remote computer not supported\n");
SetLastError( RPC_S_SERVER_UNAVAILABLE ); SetLastError( RPC_S_SERVER_UNAVAILABLE );
return FALSE; return FALSE;
} }