Permalink
Browse files

Ignore fstab-specific mount options

Fixes: #96.
  • Loading branch information...
Nikratio committed Sep 26, 2017
1 parent a73dda4 commit 608e7ab89c7f6c4362f8e9a07133adcd26aa63da
Showing with 11 additions and 2 deletions.
  1. +3 −0 ChangeLog.rst
  2. +8 −2 sshfs.c
View
@@ -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)
------------------------
View
10 sshfs.c
@@ -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[] = {

0 comments on commit 608e7ab

Please sign in to comment.