From c6896f357c15f2c1107ecb70297e6d140a0065b0 Mon Sep 17 00:00:00 2001 From: Erich Hoover Date: Sat, 27 Apr 2013 21:09:28 -0600 Subject: [PATCH] advapi32: Fix default DACL test on win2k and w2k8 server editions. --- dlls/advapi32/tests/security.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 32dfb2aa30e..30da864ca6b 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3232,13 +3232,16 @@ static void test_GetNamedSecurityInfoA(void) bret = EqualSid(&ace->SidStart, admin_sid); if (bret) admins_ace_id = i; } - ok(users_ace_id != -1, "Bultin Users ACE not found.\n"); + ok(users_ace_id != -1 || broken(users_ace_id == -1) /* win2k */, + "Bultin Users ACE not found.\n"); if (users_ace_id != -1) { bret = pGetAce(pDacl, users_ace_id, (VOID **)&ace); ok(bret, "Failed to get Builtin Users ACE.\n"); - ok(((ACE_HEADER *)ace)->AceFlags == (INHERIT_ONLY_ACE|CONTAINER_INHERIT_ACE), - "Builtin Users ACE has unexpected flags (0x%x != 0x%x)\n", ((ACE_HEADER *)ace)->AceFlags, + flags = ((ACE_HEADER *)ace)->AceFlags; + ok(flags == (INHERIT_ONLY_ACE|CONTAINER_INHERIT_ACE) + || broken(flags == (INHERIT_ONLY_ACE|CONTAINER_INHERIT_ACE|INHERITED_ACE)) /* w2k8 */, + "Builtin Users ACE has unexpected flags (0x%x != 0x%x)\n", flags, INHERIT_ONLY_ACE|CONTAINER_INHERIT_ACE); ok(ace->Mask == GENERIC_READ, "Builtin Users ACE has unexpected mask (0x%x != 0x%x)\n", ace->Mask, GENERIC_READ);