Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Add FreeBSD required defines to mntent.h 

Linux and FreeBSD use different names for suid / setuid.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Matt Macy <mmacy@FreeBSD.org>
Closes #9632
This commit is contained in:
Matthew Macy 2019-11-30 15:49:09 -08:00 committed by Brian Behlendorf
parent 758699b6f1
commit 42a826eed3
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/sys/mntent.h
View File

@ -29,6 +29,8 @@
#ifndef _SYS_MNTENT_H #ifndef _SYS_MNTENT_H
#define _SYS_MNTENT_H #define _SYS_MNTENT_H
#define MNTMAXSTR 128
#define MNTTYPE_ZFS "zfs" /* ZFS file system */ #define MNTTYPE_ZFS "zfs" /* ZFS file system */
#define MOUNT_SUCCESS 0x00 /* Success */ #define MOUNT_SUCCESS 0x00 /* Success */
@ -71,8 +73,15 @@
#define MNTOPT_STRICTATIME "strictatime" /* strict access time updates */ #define MNTOPT_STRICTATIME "strictatime" /* strict access time updates */
#define MNTOPT_NOSTRICTATIME "nostrictatime" /* No strict access time updates */ #define MNTOPT_NOSTRICTATIME "nostrictatime" /* No strict access time updates */
#define MNTOPT_LAZYTIME "lazytime" /* Defer access time writing */ #define MNTOPT_LAZYTIME "lazytime" /* Defer access time writing */
#ifdef __linux__
#define MNTOPT_SETUID "suid" /* Both setuid and devices allowed */ #define MNTOPT_SETUID "suid" /* Both setuid and devices allowed */
#define MNTOPT_NOSETUID "nosuid" /* Neither setuid nor devices allowed */ #define MNTOPT_NOSETUID "nosuid" /* Neither setuid nor devices allowed */
#elif defined(__FreeBSD__)
#define MNTOPT_SETUID "setuid" /* Set uid allowed */
#define MNTOPT_NOSETUID "nosetuid" /* Set uid not allowed */
#else
#error "unknown OS"
#endif
#define MNTOPT_OWNER "owner" /* allow owner mount */ #define MNTOPT_OWNER "owner" /* allow owner mount */
#define MNTOPT_NOOWNER "noowner" /* do not allow owner mount */ #define MNTOPT_NOOWNER "noowner" /* do not allow owner mount */
#define MNTOPT_REMOUNT "remount" /* change mount options */ #define MNTOPT_REMOUNT "remount" /* change mount options */