diff options
| author | Jeremy Allison <jra@samba.org> | 2012-01-23 11:20:52 -0800 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2012-01-23 21:44:08 +0100 |
| commit | 2f90581a5e68da48d03127c453a0c3becb2170e2 (patch) | |
| tree | 335f6c9ac90e096b4ae7d861497725c2b682fe6e | |
| parent | d6f0ddae114ed77e0afec4f9c72b55a41fd800eb (diff) | |
| download | samba-2f90581a5e68da48d03127c453a0c3becb2170e2.tar.gz | |
Second part of fix for 8636 - When returning an ACL without SECINFO_DACL requested, we still set SEC_DESC_DACL_PRESENT in the type field.
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.
(cherry picked from commit 4eb17aff84dc0dccec23e066db7a88581cf7668c)
| -rw-r--r-- | source3/modules/vfs_acl_common.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c index 75917b7c09e..016bb9f5e2e 100644 --- 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. */ |