21ab4e
From e1155ff4b07729a5af162c368f6e04da8b3ee13e Mon Sep 17 00:00:00 2001
21ab4e
From: Soumya Koduri <skoduri@redhat.com>
21ab4e
Date: Thu, 8 Jun 2017 22:19:17 +0530
21ab4e
Subject: [PATCH 509/509] posix-acl: Whitelist virtual ACL xattrs
21ab4e
21ab4e
Similar to system.posix_acl_* xattrs, all users should get
21ab4e
permission to be able to read glusterfs.posix.acl* xattrs too.
21ab4e
21ab4e
This is backport of below mainline patch -
21ab4e
https://review.gluster.org/17493
21ab4e
21ab4e
>BUG: 1459971
21ab4e
>Signed-off-by: Soumya Koduri <skoduri@redhat.com>
21ab4e
>Reviewed-on: https://review.gluster.org/17493
21ab4e
>Smoke: Gluster Build System <jenkins@build.gluster.org>
21ab4e
>Reviewed-by: jiffin tony Thottan <jthottan@redhat.com>
21ab4e
>NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
21ab4e
>CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
21ab4e
>Reviewed-by: Raghavendra Talur <rtalur@redhat.com>
21ab4e
>Reviewed-by: Niels de Vos <ndevos@redhat.com>
21ab4e
>(cherry picked from commit 68f2192df570b5ee615d440c2e0c88d49a75a34f)
21ab4e
21ab4e
release-3.11 : https://review.gluster.org/#/c/17512/
21ab4e
21ab4e
release-3.10 : https://review.gluster.org/#/c/17513/
21ab4e
21ab4e
release-3.8 : https://review.gluster.org/#/c/17514/
21ab4e
21ab4e
BUG: 1459972
21ab4e
Change-Id: I0f9118463357e393f10c74583e16c50e2c7bba68
21ab4e
Signed-off-by: Soumya Koduri <skoduri@redhat.com>
21ab4e
Reviewed-on: https://code.engineering.redhat.com/gerrit/108787
21ab4e
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
21ab4e
---
21ab4e
 xlators/system/posix-acl/src/posix-acl.c | 4 ++++
21ab4e
 1 file changed, 4 insertions(+)
21ab4e
21ab4e
diff --git a/xlators/system/posix-acl/src/posix-acl.c b/xlators/system/posix-acl/src/posix-acl.c
21ab4e
index 8a21202..1c82e8b 100644
21ab4e
--- a/xlators/system/posix-acl/src/posix-acl.c
21ab4e
+++ b/xlators/system/posix-acl/src/posix-acl.c
21ab4e
@@ -62,6 +62,10 @@ whitelisted_xattr (const char *key)
21ab4e
                 return 1;
21ab4e
         if (strcmp (POSIX_ACL_DEFAULT_XATTR, key) == 0)
21ab4e
                 return 1;
21ab4e
+        if (strcmp (GF_POSIX_ACL_ACCESS, key) == 0)
21ab4e
+                return 1;
21ab4e
+        if (strcmp (GF_POSIX_ACL_DEFAULT, key) == 0)
21ab4e
+                return 1;
21ab4e
         return 0;
21ab4e
 }
21ab4e
 
21ab4e
-- 
21ab4e
1.8.3.1
21ab4e