ntdll: Apply owner and group regardless of the SE_OWNER_DEFAULTED or SE_GROUP_DEFAULTED flags.

Signed-off-by: Jonathan Doron <jond@wizery.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ntdll: Apply owner and group regardless of the SE_OWNER_DEFAULTED or SE_GROUP_DEFAULTED flags.
fbf2631d · Jonathan Doron · Alexandre Julliard · 6144addc · fbf2631d
Commit fbf2631d authored Sep 12, 2017 by Jonathan Doron Committed by Alexandre Julliard Sep 13, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 8 deletions

sync.c dlls/ntdll/sync.c +8 -8

No files found.
--- a/dlls/ntdll/sync.c
+++ b/dlls/ntdll/sync.c
@@ -77,9 +77,9 @@ NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct object_a
                                  data_size_t *ret_len )
 {
    unsigned int len = sizeof(**ret);
-    PSID owner, group;
+    PSID owner = NULL, group = NULL;
    ACL *dacl, *sacl;
-    BOOLEAN owner_present, group_present, dacl_present, sacl_present, defaulted;
+    BOOLEAN dacl_present, sacl_present, defaulted;
    PSECURITY_DESCRIPTOR sd;
    NTSTATUS status;

@@ -94,12 +94,12 @@ NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct object_a
    {
        len += sizeof(struct security_descriptor);

-        if ((status = RtlGetOwnerSecurityDescriptor( sd, &owner, &owner_present ))) return status;
-        if ((status = RtlGetGroupSecurityDescriptor( sd, &group, &group_present ))) return status;
+        if ((status = RtlGetOwnerSecurityDescriptor( sd, &owner, &defaulted ))) return status;
+        if ((status = RtlGetGroupSecurityDescriptor( sd, &group, &defaulted ))) return status;
        if ((status = RtlGetSaclSecurityDescriptor( sd, &sacl_present, &sacl, &defaulted ))) return status;
        if ((status = RtlGetDaclSecurityDescriptor( sd, &dacl_present, &dacl, &defaulted ))) return status;
-        if (owner_present) len += RtlLengthSid( owner );
-        if (group_present) len += RtlLengthSid( group );
+        if (owner) len += RtlLengthSid( owner );
+        if (group) len += RtlLengthSid( group );
        if (sacl_present && sacl) len += sacl->AclSize;
        if (dacl_present && dacl) len += dacl->AclSize;

@@ -126,8 +126,8 @@ NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct object_a
        unsigned char *ptr = (unsigned char *)(descr + 1);

        descr->control = ((SECURITY_DESCRIPTOR *)sd)->Control & ~SE_SELF_RELATIVE;
-        if (owner_present) descr->owner_len = RtlLengthSid( owner );
-        if (group_present) descr->group_len = RtlLengthSid( group );
+        if (owner) descr->owner_len = RtlLengthSid( owner );
+        if (group) descr->group_len = RtlLengthSid( group );
        if (sacl_present && sacl) descr->sacl_len = sacl->AclSize;
        if (dacl_present && dacl) descr->dacl_len = dacl->AclSize;