summaryrefslogtreecommitdiffstats
path: root/xlators/system/posix-acl/src
diff options
context:
space:
mode:
authorSoumya Koduri <skoduri@redhat.com>2017-06-08 22:19:17 +0530
committerRaghavendra Talur <rtalur@redhat.com>2017-06-20 04:56:43 +0000
commitef331f945bfd4e5664d557ce8e5a4bd275792e13 (patch)
tree84abc028448b86631964bce104a6197f409595a8 /xlators/system/posix-acl/src
parent89b55994bf84a489b10b3b40d3a6245681eb4c4c (diff)
posix-acl: Whitelist virtual ACL xattrs
Similar to system.posix_acl_* xattrs, all users should get permission to be able to read glusterfs.posix.acl* xattrs too. This is backport of below mainline patch - https://review.gluster.org/17493 >BUG: 1459971 >Signed-off-by: Soumya Koduri <skoduri@redhat.com> >Reviewed-on: https://review.gluster.org/17493 >Smoke: Gluster Build System <jenkins@build.gluster.org> >Reviewed-by: jiffin tony Thottan <jthottan@redhat.com> >NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> >CentOS-regression: Gluster Build System <jenkins@build.gluster.org> >Reviewed-by: Raghavendra Talur <rtalur@redhat.com> >Reviewed-by: Niels de Vos <ndevos@redhat.com> >(cherry picked from commit 68f2192df570b5ee615d440c2e0c88d49a75a34f) BUG: 1460649 Change-Id: I1fc2b67c8a12113910e4ec57cd114e4baefe0d38 Signed-off-by: Soumya Koduri <skoduri@redhat.com> Reviewed-on: https://review.gluster.org/17513 NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> Smoke: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: Raghavendra Talur <rtalur@redhat.com>
Diffstat (limited to 'xlators/system/posix-acl/src')
-rw-r--r--xlators/system/posix-acl/src/posix-acl.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/xlators/system/posix-acl/src/posix-acl.c b/xlators/system/posix-acl/src/posix-acl.c
index dbe0e716e2b..f691c599086 100644
--- a/xlators/system/posix-acl/src/posix-acl.c
+++ b/xlators/system/posix-acl/src/posix-acl.c
@@ -62,6 +62,10 @@ whitelisted_xattr (const char *key)
return 1;
if (strcmp (POSIX_ACL_DEFAULT_XATTR, key) == 0)
return 1;
+ if (strcmp (GF_POSIX_ACL_ACCESS, key) == 0)
+ return 1;
+ if (strcmp (GF_POSIX_ACL_DEFAULT, key) == 0)
+ return 1;
return 0;
}