ntdll: Fix the return code from RtlSetDaclSecurityDescriptor when daclpresent is FALSE.

a006b060 · Rob Shearman · Alexandre Julliard · d1a3e2ed · a006b060 · a006b060
Commit a006b060 authored Oct 16, 2007 by Rob Shearman Committed by Alexandre Julliard Oct 16, 2007
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

security.c dlls/advapi32/tests/security.c +0 -1

sec.c dlls/ntdll/sec.c +3 -2

No files found.
--- a/dlls/advapi32/tests/security.c
+++ b/dlls/advapi32/tests/security.c
@@ -784,7 +784,6 @@ static void test_AccessCheck(void)

    /* sd with no dacl present */
    ret = SetSecurityDescriptorDacl(SecurityDescriptor, FALSE, NULL, FALSE);
-    todo_wine
    ok(ret, "SetSecurityDescriptorDacl failed with error %d\n", GetLastError());
    ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping,
                      PrivSet, &PrivSetLen, &Access, &AccessStatus);

--- a/dlls/ntdll/sec.c
+++ b/dlls/ntdll/sec.c
@@ -626,8 +626,9 @@ NTSTATUS WINAPI RtlSetDaclSecurityDescriptor (
 		return STATUS_INVALID_SECURITY_DESCR;

 	if (!daclpresent)
-	{	lpsd->Control &= ~SE_DACL_PRESENT;
-		return TRUE;
+	{
+		lpsd->Control &= ~SE_DACL_PRESENT;
+		return STATUS_SUCCESS;
 	}

 	lpsd->Control |= SE_DACL_PRESENT;