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

advapi32: Make ConvertStringSidToSid not to ignore the first subauthority.

Browse Source
This commit is contained in:
Mikolaj Zalewski 2007-09-24 19:04:11 -07:00 committed by Alexandre Julliard
parent 57ca9ae92d
commit ff3ab48081
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/advapi32/security.c
View File

@ -3900,12 +3900,12 @@ static BOOL ParseStringSidToSid(LPCWSTR StringSid, PSID pSid, LPDWORD cBytes)
while (*StringSid) while (*StringSid)
{ {
pisid->SubAuthority[i++] = atoiW(StringSid);
while (*StringSid && *StringSid != '-') while (*StringSid && *StringSid != '-')
StringSid++; StringSid++;
if (*StringSid == '-') if (*StringSid == '-')
StringSid++; StringSid++;
pisid->SubAuthority[i++] = atoiW(StringSid);
} }
if (i != pisid->SubAuthorityCount) if (i != pisid->SubAuthorityCount)

8
dlls/advapi32/tests/security.c
View File

@ -148,6 +148,7 @@ static void test_sid(void)
const char noSubAuthStr[] = "S-1-5"; const char noSubAuthStr[] = "S-1-5";
unsigned int i; unsigned int i;
PSID psid = NULL; PSID psid = NULL;
SID *pisid;
BOOL r; BOOL r;
LPSTR str = NULL; LPSTR str = NULL;
@ -185,6 +186,13 @@ static void test_sid(void)
"expected GetLastError() is ERROR_INVALID_SID, got %d\n", "expected GetLastError() is ERROR_INVALID_SID, got %d\n",
GetLastError() ); GetLastError() );
ok(pConvertStringSidToSidA("S-1-5-21-93476-23408-4576", &psid), "ConvertStringSidToSidA failed\n");
pisid = (SID *)psid;
ok(pisid->SubAuthorityCount == 4, "Invalid sub authority count - expected 4, got %d\n", pisid->SubAuthorityCount);
ok(pisid->SubAuthority[0] == 21, "Invalid subauthority 0 - expceted 21, got %d\n", pisid->SubAuthority[0]);
ok(pisid->SubAuthority[3] == 4576, "Invalid subauthority 0 - expceted 4576, got %d\n", pisid->SubAuthority[3]);
LocalFree(str);
for( i = 0; i < sizeof(refs) / sizeof(refs[0]); i++ ) for( i = 0; i < sizeof(refs) / sizeof(refs[0]); i++ )
{ {
PISID pisid; PISID pisid;