summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikolaus Rath <Nikolaus@rath.org>2019-01-04 13:33:01 +0000
committerNikolaus Rath <Nikolaus@rath.org>2019-01-04 13:34:34 +0000
commit41e3e7c00e8a6b74352b76b656525f6bfd66b4c8 (patch)
tree47fae9d4954dea3582518dc0a732e04b5ac9d152
parent06fc40705f23cb7e9af4df2febae8e6889b1a95d (diff)
downloadfuse-41e3e7c00e8a6b74352b76b656525f6bfd66b4c8.tar.gz
Added OpenAFS to type whitelist
Fixes: #336.
-rw-r--r--ChangeLog3
-rw-r--r--util/fusermount.c1
2 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 7faf386..cc59e36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
Unreleased Changes
==================
+
+* Added OpenAFS to whitelist (so users can now mount FUSE filesystems
+ on mountpoints within OpenAFS filesystems).
* Added a test of `seekdir` to test_syscalls.
* Fixed `readdir` bug when non-zero offsets are given to filler and the
filesystem client, after reading a whole directory, re-reads it from a
diff --git a/util/fusermount.c b/util/fusermount.c
index 245aeea..4b799d9 100644
--- a/util/fusermount.c
+++ b/util/fusermount.c
@@ -1028,6 +1028,7 @@ static int check_perm(const char **mntp, struct stat *stbuf, int *mountpoint_fd)
* the ecryptfs mount helper
* (https://bazaar.launchpad.net/~ecryptfs/ecryptfs/trunk/view/head:/src/utils/mount.ecryptfs_private.c#L225). */
typeof(fs_buf.f_type) f_type_whitelist[] = {
+ 0x5346414f /* OPENAFS_SUPER_MAGIC */,
0x61756673 /* AUFS_SUPER_MAGIC */,
0x9123683E /* BTRFS_SUPER_MAGIC */,
0x00C36400 /* CEPH_SUPER_MAGIC */,