From 68af3aa7e4a900cb696a8a31d5f23bae1897f916 Mon Sep 17 00:00:00 2001 From: Mikolaj Zalewski Date: Thu, 27 Sep 2007 11:55:11 -0700 Subject: [PATCH] advapi32: in ConvertStringSecurityDescriptorToSecurityDescriptor "AU" should be checked before "A" --- dlls/advapi32/security.c | 2 +- dlls/advapi32/tests/security.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index ac189de..5b2f7dd 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -3070,9 +3070,9 @@ static DWORD ParseAclStringFlags(LPCWSTR */ static const ACEFLAG AceType[] = { - { SDDL_ACCESS_ALLOWED, ACCESS_ALLOWED_ACE_TYPE }, { SDDL_ALARM, SYSTEM_ALARM_ACE_TYPE }, { SDDL_AUDIT, SYSTEM_AUDIT_ACE_TYPE }, + { SDDL_ACCESS_ALLOWED, ACCESS_ALLOWED_ACE_TYPE }, { SDDL_ACCESS_DENIED, ACCESS_DENIED_ACE_TYPE }, /* { SDDL_OBJECT_ACCESS_ALLOWED, ACCESS_ALLOWED_OBJECT_ACE_TYPE }, diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 4f430e1..b364774 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1922,6 +1922,11 @@ static void test_ConvertStringSecurityDe "D:(A;;0xFFFFFFFF;;;WD)", SDDL_REVISION_1, &pSD, NULL); ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); LocalFree(pSD); + SetLastError(0xdeadbeef); + ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( + "S:(AU;;0xFFFFFFFF;;;WD)", SDDL_REVISION_1, &pSD, NULL); + ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); + LocalFree(pSD); /* test ACE string access right error case */ SetLastError(0xdeadbeef); -- 1.4.1