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

advapi32: Improve the stub for CreateRestrictedToken.

This commit is contained in:
Hans Leidekker 2013-01-16 10:56:47 +01:00 committed by Alexandre Julliard
parent 0d0f05e523
commit bbb29e9d4c
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/advapi32/security.c
View File

@ -801,13 +801,25 @@ BOOL WINAPI CreateRestrictedToken(
PSID_AND_ATTRIBUTES restrictSids, PSID_AND_ATTRIBUTES restrictSids,
PHANDLE newToken) PHANDLE newToken)
{ {
TOKEN_TYPE type;
SECURITY_IMPERSONATION_LEVEL level = TokenImpersonationLevel;
DWORD size;
FIXME("(%p, 0x%x, %u, %p, %u, %p, %u, %p, %p): stub\n", FIXME("(%p, 0x%x, %u, %p, %u, %p, %u, %p, %p): stub\n",
baseToken, flags, nDisableSids, disableSids, baseToken, flags, nDisableSids, disableSids,
nDeletePrivs, deletePrivs, nDeletePrivs, deletePrivs,
nRestrictSids, restrictSids, nRestrictSids, restrictSids,
newToken); newToken);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE; size = sizeof(type);
if (!GetTokenInformation( baseToken, TokenType, &type, size, &size )) return FALSE;
if (type == TokenImpersonation)
{
size = sizeof(level);
if (!GetTokenInformation( baseToken, TokenImpersonationLevel, &level, size, &size ))
return FALSE;
}
return DuplicateTokenEx( baseToken, MAXIMUM_ALLOWED, NULL, level, type, newToken );
} }
/* ############################## /* ##############################

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

@ -4076,6 +4076,8 @@ static void test_CreateRestrictedToken(void)
HANDLE process_token, token, r_token; HANDLE process_token, token, r_token;
PTOKEN_GROUPS token_groups, groups2; PTOKEN_GROUPS token_groups, groups2;
SID_AND_ATTRIBUTES sattr; SID_AND_ATTRIBUTES sattr;
SECURITY_IMPERSONATION_LEVEL level;
TOKEN_TYPE type;
BOOL is_member; BOOL is_member;
DWORD size; DWORD size;
BOOL ret; BOOL ret;
@ -4126,7 +4128,7 @@ static void test_CreateRestrictedToken(void)
sattr.Attributes = 0; sattr.Attributes = 0;
r_token = NULL; r_token = NULL;
ret = pCreateRestrictedToken(token, 0, 1, &sattr, 0, NULL, 0, NULL, &r_token); ret = pCreateRestrictedToken(token, 0, 1, &sattr, 0, NULL, 0, NULL, &r_token);
todo_wine ok(ret, "got error %d\n", GetLastError()); ok(ret, "got error %d\n", GetLastError());
if (ret) if (ret)
{ {
@ -4134,7 +4136,7 @@ static void test_CreateRestrictedToken(void)
is_member = TRUE; is_member = TRUE;
ret = pCheckTokenMembership(r_token, token_groups->Groups[i].Sid, &is_member); ret = pCheckTokenMembership(r_token, token_groups->Groups[i].Sid, &is_member);
ok(ret, "got error %d\n", GetLastError()); ok(ret, "got error %d\n", GetLastError());
ok(!is_member, "not a member\n"); todo_wine ok(!is_member, "not a member\n");
ret = GetTokenInformation(r_token, TokenGroups, NULL, 0, &size); ret = GetTokenInformation(r_token, TokenGroups, NULL, 0, &size);
ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %d with error %d\n", ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %d with error %d\n",
@ -4149,12 +4151,22 @@ static void test_CreateRestrictedToken(void)
break; break;
} }
ok(groups2->Groups[j].Attributes & SE_GROUP_USE_FOR_DENY_ONLY, todo_wine ok(groups2->Groups[j].Attributes & SE_GROUP_USE_FOR_DENY_ONLY,
"got wrong attributes\n"); "got wrong attributes\n");
ok((groups2->Groups[j].Attributes & SE_GROUP_ENABLED) == 0, todo_wine ok((groups2->Groups[j].Attributes & SE_GROUP_ENABLED) == 0,
"got wrong attributes\n"); "got wrong attributes\n");
HeapFree(GetProcessHeap(), 0, groups2); HeapFree(GetProcessHeap(), 0, groups2);
size = sizeof(type);
ret = GetTokenInformation(r_token, TokenType, &type, size, &size);
ok(ret, "got error %d\n", GetLastError());
ok(type == TokenImpersonation, "got type %u\n", type);
size = sizeof(level);
ret = GetTokenInformation(r_token, TokenImpersonationLevel, &level, size, &size);
ok(ret, "got error %d\n", GetLastError());
ok(level == SecurityImpersonation, "got level %u\n", type);
} }
HeapFree(GetProcessHeap(), 0, token_groups); HeapFree(GetProcessHeap(), 0, token_groups);