From baa49d21aa15f07e88fb609d40a46b860974d501 Mon Sep 17 00:00:00 2001 From: Csaba Henk Date: Thu, 6 Apr 2006 00:12:44 +0000 Subject: [PATCH] More "no" prefixes for FreBSD mount routine --- ChangeLog | 5 +++++ lib/mount_bsd.c | 19 ++++++++++++------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 66f8aac..97fdce3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-04-06 Csaba Henk + + * lib: Let FreeBSD mount option parsing routine recognize "no" + prefixes for FUSE specific options as well + 2006-04-01 Miklos Szeredi * lib: Add missing rwlock initialization. Patch by Ryan Bradetich diff --git a/lib/mount_bsd.c b/lib/mount_bsd.c index 8b3a6d1..aefc69f 100644 --- a/lib/mount_bsd.c +++ b/lib/mount_bsd.c @@ -71,6 +71,13 @@ static const struct fuse_opt fuse_mount_opts[] = { FUSE_OPT_KEY("ro", KEY_KERN), FUSE_OPT_KEY("rw", KEY_KERN), FUSE_OPT_KEY("auto", KEY_KERN), + /* options supported under both Linux and FBSD */ + FUSE_OPT_KEY("allow_other", KEY_KERN), + FUSE_OPT_KEY("default_permissions", KEY_KERN), + /* FBSD FUSE specific mount options */ + FUSE_OPT_KEY("private", KEY_KERN), + FUSE_OPT_KEY("neglect_shares", KEY_KERN), + FUSE_OPT_KEY("push_symlinks_in", KEY_KERN), /* stock FBSD mountopt parsing routine lets anything be negated... */ FUSE_OPT_KEY("nodev", KEY_KERN), FUSE_OPT_KEY("noasync", KEY_KERN), @@ -95,13 +102,11 @@ static const struct fuse_opt fuse_mount_opts[] = { FUSE_OPT_KEY("noro", KEY_KERN), FUSE_OPT_KEY("norw", KEY_KERN), FUSE_OPT_KEY("noauto", KEY_KERN), - /* options supported under both Linux and FBSD */ - FUSE_OPT_KEY("allow_other", KEY_KERN), - FUSE_OPT_KEY("default_permissions", KEY_KERN), - /* FBSD FUSE specific mount options */ - FUSE_OPT_KEY("private", KEY_KERN), - FUSE_OPT_KEY("neglect_shares", KEY_KERN), - FUSE_OPT_KEY("push_symlinks_in", KEY_KERN), + FUSE_OPT_KEY("noallow_other", KEY_KERN), + FUSE_OPT_KEY("nodefault_permissions", KEY_KERN), + FUSE_OPT_KEY("noprivate", KEY_KERN), + FUSE_OPT_KEY("noneglect_shares", KEY_KERN), + FUSE_OPT_KEY("nopush_symlinks_in", KEY_KERN), /* Linux specific mount options, but let just the mount util handle them */ FUSE_OPT_KEY("fsname=", KEY_KERN), FUSE_OPT_KEY("nonempty", KEY_KERN), -- 2.30.2