commit a006b060800c7d41c7509cd7ae3ad72b06b966b2
author Rob Shearman <rob@codeweavers.com> Tue Oct 16 09:50:28 2007 +0100
committer Alexandre Julliard <julliard@winehq.org> Tue Oct 16 13:17:14 2007 +0200
tree ed501a6985dbd7f6fc1d3c5b5bd9cb031e69629e
parent d1a3e2ede58865f159340cb254a0a9637358b4a0

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

dlls/advapi32/tests/security.c

diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
index 4c7b7bf..0fbd3f9 100644
--- a/dlls/advapi32/tests/security.c
+++ b/dlls/advapi32/tests/security.c
@@ -784,7 +784,6 @@
 
     /* 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);

dlls/ntdll/sec.c

diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c
index e4f6ddc..89d23dff 100644
--- a/dlls/ntdll/sec.c
+++ b/dlls/ntdll/sec.c
@@ -626,8 +626,9 @@
 		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;