Second part of fix for 8636 - When returning an ACL without SECINFO_DACL requested...

Ensure we always ask for the set:

OWNER_SECURITY_INFORMATION |
GROUP_SECURITY_INFORMATION |
DACL_SECURITY_INFORMATION  |
SACL_SECURITY_INFORMATION

when getting an ACL inside the module.

diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index 75917b7c09e9ddaae6f8d32ebc7c8c03bceeaddd..016bb9f5e2ea29eb902a50d692f1c53e84bbe0e5 100644 (file)
--- a/source3/modules/vfs_acl_common.c
+++ b/source3/modules/vfs_acl_common.c
@@ -539,7 +539,8 @@ static NTSTATUS get_parent_acl_common(vfs_handle_struct *handle,
                                        parent_name,
                                        (SECINFO_OWNER |
                                         SECINFO_GROUP |
-                                        SECINFO_DACL),
+                                        SECINFO_DACL  |
+                                        SECINFO_SACL),
                                        pp_parent_desc);
 
        if (!NT_STATUS_IS_OK(status)) {
@@ -622,7 +623,8 @@ static int open_acl_common(vfs_handle_struct *handle,
                                fname,
                                (SECINFO_OWNER |
                                 SECINFO_GROUP |
-                                SECINFO_DACL),
+                                SECINFO_DACL  |
+                                SECINFO_SACL),
                                &pdesc);
         if (NT_STATUS_IS_OK(status)) {
                /* See if we can access it. */