summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCsaba Henk <csaba@redhat.com>2012-08-15 17:27:52 +0200
committerAnand Avati <avati@redhat.com>2012-08-19 09:30:52 -0700
commit6e3244a131b6d25141bef0cbc59968d3271f8ea3 (patch)
treed2c2da0a677a72200926337c10bc065f9da1cf3b
parent623dbe5afc1cfd1e22064a4e60750289b2ef6b0e (diff)
fuse: have setxattr on geo-rep related xattrs take effect
In http://review.gluster.com/3687 setxattr was made to a noop for geo-rep special clients, with the exception of some special ones, relevant to geo-rep. These exceptions were all in trusted namespace. That's no good, because with a mountbroker (unprivileged) setup, the relevant attributes are in system namespace. So here we just let setxattr through for any geo-rep related xattr, regardless of namespace. Change-Id: I261141293b7db955a2e8b2405b4510cb10a42694 BUG: 848447 Signed-off-by: Csaba Henk <csaba@redhat.com> Reviewed-on: http://review.gluster.com/3821 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Venky Shankar <vshankar@redhat.com> Reviewed-by: Anand Avati <avati@redhat.com>
-rw-r--r--xlators/mount/fuse/src/fuse-helpers.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/xlators/mount/fuse/src/fuse-helpers.c b/xlators/mount/fuse/src/fuse-helpers.c
index 832f57e1cdb..e4455b57426 100644
--- a/xlators/mount/fuse/src/fuse-helpers.c
+++ b/xlators/mount/fuse/src/fuse-helpers.c
@@ -559,10 +559,10 @@ fuse_ignore_xattr_set (fuse_private_t *priv, char *key)
goto out;
/* trusted NS check */
- if (!((fnmatch (PRIV_XA_NS".glusterfs.*.xtime", key, FNM_PERIOD) == 0)
- || (fnmatch (PRIV_XA_NS".glusterfs.volume-mark",
+ if (!((fnmatch ("*.glusterfs.*.xtime", key, FNM_PERIOD) == 0)
+ || (fnmatch ("*.glusterfs.volume-mark",
key, FNM_PERIOD) == 0)
- || (fnmatch (PRIV_XA_NS".glusterfs.volume-mark.*",
+ || (fnmatch ("*.glusterfs.volume-mark.*",
key, FNM_PERIOD) == 0)))
ret = -1;