Module: wine Branch: master Commit: 9db9c9ef5a557aca0cde7c78350f52c80b13f575 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9db9c9ef5a557aca0cde7c7835...
Author: André Hentschel nerv@dawncrow.de Date: Wed Jun 22 23:35:33 2016 +0200
advapi32/tests: Allow MACHINE\Software to be owned by local system.
Signed-off-by: André Hentschel nerv@dawncrow.de Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/advapi32/tests/security.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 3639ebd..eebd163 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3652,8 +3652,9 @@ static void test_GetNamedSecurityInfoA(void) char admin_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES], *user; char system_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES]; char users_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES]; + SID_IDENTIFIER_AUTHORITY SIDAuthNT = { SECURITY_NT_AUTHORITY }; PSID admin_sid = (PSID) admin_ptr, users_sid = (PSID) users_ptr; - PSID system_sid = (PSID) system_ptr, user_sid; + PSID system_sid = (PSID) system_ptr, user_sid, localsys_sid; DWORD sid_size = sizeof(admin_ptr), user_size; char invalid_path[] = "/an invalid file path"; int users_ace_id = -1, admins_ace_id = -1, i; @@ -3958,10 +3959,15 @@ static void test_GetNamedSecurityInfoA(void) NULL, NULL, NULL, NULL, &pSD); ok(!error, "GetNamedSecurityInfo failed with error %d\n", error);
+ bret = AllocateAndInitializeSid(&SIDAuthNT, 1, SECURITY_LOCAL_SYSTEM_RID, 0, 0, 0, 0, 0, 0, 0, &localsys_sid); + ok(bret, "AllocateAndInitializeSid failed with error %d\n", GetLastError()); + bret = GetSecurityDescriptorOwner(pSD, &owner, &owner_defaulted); ok(bret, "GetSecurityDescriptorOwner failed with error %d\n", GetLastError()); ok(owner != NULL, "owner should not be NULL\n"); - ok(EqualSid(owner, admin_sid), "MACHINE\Software owner SID (%s) != Administrators SID (%s).\n", debugstr_sid(owner), debugstr_sid(admin_sid)); + ok(EqualSid(owner, admin_sid) || EqualSid(owner, localsys_sid), + "MACHINE\Software owner SID (%s) != Administrators SID (%s) or Local System Sid (%s).\n", + debugstr_sid(owner), debugstr_sid(admin_sid), debugstr_sid(localsys_sid));
bret = GetSecurityDescriptorGroup(pSD, &group, &group_defaulted); ok(bret, "GetSecurityDescriptorGroup failed with error %d\n", GetLastError()); @@ -4022,6 +4028,8 @@ static void test_GetNamedSecurityInfoA(void) ok(ace->Mask == KEY_ALL_ACCESS || broken(ace->Mask == GENERIC_ALL) /* w2k8 */, "Builtin Admins ACE has unexpected mask (0x%x != 0x%x)\n", ace->Mask, KEY_ALL_ACCESS); } + + FreeSid(localsys_sid); LocalFree(pSD); }