summaryrefslogtreecommitdiff
path: root/source3/modules
diff options
context:
space:
mode:
authorAlexander Werth <alexander.werth@de.ibm.com>2012-01-20 19:17:21 +0100
committerChristian Ambach <ambi@samba.org>2012-05-08 22:37:05 +0200
commite8c2f81ef3e44fdd31047582f933276a48192e89 (patch)
treed32227194196c3c98e54a38f8678e468506f5ee3 /source3/modules
parentd36aecc9c5211ce1c4cd76380e3a9a966d248bce (diff)
downloadsamba-e8c2f81ef3e44fdd31047582f933276a48192e89.tar.gz
samba-e8c2f81ef3e44fdd31047582f933276a48192e89.tar.bz2
samba-e8c2f81ef3e44fdd31047582f933276a48192e89.zip
s3:vfs/gpfs: Have inherited deny ACE's show up in ACLs
Don't use the mode for the get_acl call that surpresses inherited deny ACE's. This is now possible since the inherited ACE flag exists now in GPFS and Samba.
Diffstat (limited to 'source3/modules')
-rw-r--r--source3/modules/vfs_gpfs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index 80f6d6e653..4b0f9ebaf7 100644
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -232,7 +232,7 @@ static struct gpfs_acl *gpfs_getacl_alloc(const char *fname, gpfs_aclType_t type
acl->acl_version = 0;
acl->acl_type = type;
- ret = smbd_gpfs_getacl((char *)fname, GPFS_GETACL_STRUCT | GPFS_ACL_SAMBA, acl);
+ ret = smbd_gpfs_getacl((char *)fname, GPFS_GETACL_STRUCT, acl);
if ((ret != 0) && (errno == ENOSPC)) {
struct gpfs_acl *new_acl = (struct gpfs_acl *)TALLOC_SIZE(
mem_ctx, acl->acl_len + sizeof(struct gpfs_acl));
@@ -247,7 +247,7 @@ static struct gpfs_acl *gpfs_getacl_alloc(const char *fname, gpfs_aclType_t type
new_acl->acl_type = acl->acl_type;
acl = new_acl;
- ret = smbd_gpfs_getacl((char *)fname, GPFS_GETACL_STRUCT | GPFS_ACL_SAMBA, acl);
+ ret = smbd_gpfs_getacl((char *)fname, GPFS_GETACL_STRUCT, acl);
}
if (ret != 0)
{