diff options
| author | Nikolaus Rath <Nikolaus@rath.org> | 2017-09-26 12:41:30 +0100 |
|---|---|---|
| committer | Nikolaus Rath <Nikolaus@rath.org> | 2017-09-26 12:41:30 +0100 |
| commit | 608e7ab89c7f6c4362f8e9a07133adcd26aa63da (patch) | |
| tree | 82010ee910c7aabe6be0e9a90703c8c7ef7197f2 | |
| parent | a73dda48bd9b9bdc925b180fd7dab4c9689da09f (diff) | |
| download | sshfs-608e7ab89c7f6c4362f8e9a07133adcd26aa63da.tar sshfs-608e7ab89c7f6c4362f8e9a07133adcd26aa63da.tar.gz sshfs-608e7ab89c7f6c4362f8e9a07133adcd26aa63da.tar.bz2 sshfs-608e7ab89c7f6c4362f8e9a07133adcd26aa63da.zip | |
Ignore fstab-specific mount options
Fixes: #96.
| -rw-r--r-- | ChangeLog.rst | 3 | ||||
| -rw-r--r-- | sshfs.c | 10 |
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog.rst b/ChangeLog.rst index 76a0bb1..2eb4fbb 100644 --- a/ChangeLog.rst +++ b/ChangeLog.rst @@ -2,6 +2,9 @@ Unreleased Changes ------------------ * Manpage is now installed in correct directory. +* SSHFS now supports (or rather: ignores) some options that it may + receive as result of being mounted from ``/etc/mtab``. This includes + things like ``user``, ``netdev``, or ``auto``. SSHFS 3.3.0 (2017-09-20) ------------------------ @@ -428,9 +428,15 @@ static struct fuse_opt sshfs_opts[] = { FUSE_OPT_KEY("writeback_cache=no", FUSE_OPT_KEY_DISCARD), FUSE_OPT_KEY("unreliable_append", FUSE_OPT_KEY_DISCARD), - - FUSE_OPT_END + /* These may come in from /etc/fstab - we just ignore them */ + FUSE_OPT_KEY("auto", FUSE_OPT_KEY_DISCARD), + FUSE_OPT_KEY("noauto", FUSE_OPT_KEY_DISCARD), + FUSE_OPT_KEY("user", FUSE_OPT_KEY_DISCARD), + FUSE_OPT_KEY("nouser", FUSE_OPT_KEY_DISCARD), + FUSE_OPT_KEY("users", FUSE_OPT_KEY_DISCARD), + FUSE_OPT_KEY("_netdev", FUSE_OPT_KEY_DISCARD), + FUSE_OPT_END }; static struct fuse_opt workaround_opts[] = { |