diff options
-rw-r--r-- | sys/kern/vfs_mount.c | 4 | ||||
-rw-r--r-- | sys/sys/mount.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 7dadf12..6a453e4 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -702,11 +702,11 @@ vfs_domount( return (error); } /* - * Silently enforce MNT_NODEV, MNT_NOSUID and MNT_USER for + * Silently enforce MNT_NOSUID and MNT_USER for * unprivileged users. */ if (suser(td) != 0) - fsflags |= MNT_NODEV | MNT_NOSUID | MNT_USER; + fsflags |= MNT_NOSUID | MNT_USER; /* * Get vnode to be covered */ diff --git a/sys/sys/mount.h b/sys/sys/mount.h index 13036ed..237ba6b 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -184,7 +184,7 @@ struct vnode *__mnt_vnode_next(struct vnode **nvp, struct mount *mp); #define MNT_SYNCHRONOUS 0x00000002 /* filesystem written synchronously */ #define MNT_NOEXEC 0x00000004 /* can't exec from filesystem */ #define MNT_NOSUID 0x00000008 /* don't honor setuid bits on fs */ -#define MNT_NODEV 0x00000010 /* don't interpret special files */ +#define MNT_NODEV 0 /* Deprecated option */ #define MNT_UNION 0x00000020 /* union with underlying filesystem */ #define MNT_ASYNC 0x00000040 /* filesystem written asynchronously */ #define MNT_SUIDDIR 0x00100000 /* special handling of SUID on dirs */ @@ -224,7 +224,7 @@ struct vnode *__mnt_vnode_next(struct vnode **nvp, struct mount *mp); * but the 'mount' program may need changing to handle this. */ #define MNT_VISFLAGMASK (MNT_RDONLY | MNT_SYNCHRONOUS | MNT_NOEXEC | \ - MNT_NOSUID | MNT_NODEV | MNT_UNION | \ + MNT_NOSUID | MNT_UNION | \ MNT_ASYNC | MNT_EXRDONLY | MNT_EXPORTED | \ MNT_DEFEXPORTED | MNT_EXPORTANON| MNT_EXKERB | \ MNT_LOCAL | MNT_USER | MNT_QUOTA | \ @@ -234,7 +234,7 @@ struct vnode *__mnt_vnode_next(struct vnode **nvp, struct mount *mp); MNT_JAILDEVFS | MNT_MULTILABEL | MNT_ACLS) /* Mask of flags that can be updated. */ -#define MNT_UPDATEMASK (MNT_NOSUID | MNT_NOEXEC | MNT_NODEV | \ +#define MNT_UPDATEMASK (MNT_NOSUID | MNT_NOEXEC | \ MNT_SYNCHRONOUS | MNT_UNION | MNT_ASYNC | \ MNT_NOATIME | \ MNT_NOSYMFOLLOW | MNT_IGNORE | MNT_JAILDEVFS | \ |