summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSoumya Koduri <skoduri@redhat.com>2017-06-08 22:19:17 +0530
committerShyamsundar Ranganathan <srangana@redhat.com>2017-06-20 13:46:15 +0000
commit51eee2bf5c878920e83b118422e193fd087e0778 (patch)
tree33d9d30dab87b1a10a17a9deadfce5b576b951ff
parentcd5c913ebc964c6a2907ef1c11aff1d2015a14b1 (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 >Change-Id: I1fc2b67c8a12113910e4ec57cd114e4baefe0d38 >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) Change-Id: I0e22e28d053481d201223631342362a27a4a8f36 BUG: 1460647 Signed-off-by: Soumya Koduri <skoduri@redhat.com> Reviewed-on: https://review.gluster.org/17512 NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> Smoke: Gluster Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: Shyamsundar Ranganathan <srangana@redhat.com>
-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 5883bcb..5dac688 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;
}