Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 1 Sep 2021 20:59:49 GMT
From:      Brooks Davis <brooks@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: df501bac6939 - main - syscalls.master: switch to CAPENABLED flags
Message-ID:  <202109012059.181KxnLF047581@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by brooks:

URL: https://cgit.FreeBSD.org/src/commit/?id=df501bac6939b5358d1afb66932e50151c54e514

commit df501bac6939b5358d1afb66932e50151c54e514
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2021-09-01 20:54:38 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2021-09-01 20:58:16 +0000

    syscalls.master: switch to CAPENABLED flags
    
    Switch the main syscall table to use CAPENABLED flags rather than
    capabilities.conf.  This avoid synchronization issues between
    syscalls.master and capabilities.conf (e.g. when renaming a syscall
    during development).
    
    For now, move capabilities.conf to sys/compat/freebsd32 and use it
    there.  Use of sys/compat/freebsd32/syscalls.master should be replaced
    by makesyscalls.lua enhancements to allow the main one to be used.
    
    This change results in no changes to generated files after running
    `make sysent`.
    
    Reviewed by:    kevans, emaste
    MFC after:      1 week
    Sponsored by:   DARPA
    Differential Revision:  https://reviews.freebsd.org/D31350
---
 sys/compat/freebsd32/Makefile                    |   1 +
 sys/{kern => compat/freebsd32}/capabilities.conf |   0
 sys/compat/freebsd32/syscalls.conf               |   2 +-
 sys/conf/sysent.mk                               |   1 -
 sys/kern/Makefile                                |   1 -
 sys/kern/syscalls.master                         | 558 +++++++++++------------
 6 files changed, 281 insertions(+), 282 deletions(-)

diff --git a/sys/compat/freebsd32/Makefile b/sys/compat/freebsd32/Makefile
index b0c5b818e1ee..8777b1992768 100644
--- a/sys/compat/freebsd32/Makefile
+++ b/sys/compat/freebsd32/Makefile
@@ -3,5 +3,6 @@
 # $FreeBSD$
 
 GENERATED_PREFIX=	freebsd32_
+CAPABILITIES_CONF=	capabilities.conf
 
 .include "../../conf/sysent.mk"
diff --git a/sys/kern/capabilities.conf b/sys/compat/freebsd32/capabilities.conf
similarity index 100%
rename from sys/kern/capabilities.conf
rename to sys/compat/freebsd32/capabilities.conf
diff --git a/sys/compat/freebsd32/syscalls.conf b/sys/compat/freebsd32/syscalls.conf
index 0b3d59f2fcf3..6817bd25b787 100644
--- a/sys/compat/freebsd32/syscalls.conf
+++ b/sys/compat/freebsd32/syscalls.conf
@@ -10,4 +10,4 @@ switchname="freebsd32_sysent"
 namesname="freebsd32_syscallnames"
 systrace="freebsd32_systrace_args.c"
 abi_func_prefix="freebsd32_"
-capabilities_conf="../../kern/capabilities.conf"
+capabilities_conf="capabilities.conf"
diff --git a/sys/conf/sysent.mk b/sys/conf/sysent.mk
index 761905f3ffa6..489504da2ec8 100644
--- a/sys/conf/sysent.mk
+++ b/sys/conf/sysent.mk
@@ -26,7 +26,6 @@ SRCS+=	${SYSENT_CONF}
 # even though it is not an explicit input to makesyscalls.lua.  For some
 # targets, like Linux system calls, this is unnecessary, but a spurious rebuild
 # is both rare and harmless.
-CAPABILITIES_CONF?= ${SYSDIR}/kern/capabilities.conf
 SRCS+=	${CAPABILITIES_CONF}
 
 MAKESYSCALLS_INTERP?=	${LUA}
diff --git a/sys/kern/Makefile b/sys/kern/Makefile
index 5e14eb2d9ed2..453a6d8251c1 100644
--- a/sys/kern/Makefile
+++ b/sys/kern/Makefile
@@ -3,7 +3,6 @@
 #
 # Makefile for init_sysent
 
-SRCS+=		capabilities.conf
 SYSENT_CONF=
 GENERATED=	init_sysent.c			\
 		syscalls.c			\
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index 6cc462a206c9..8a06b4b3ab70 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -87,22 +87,22 @@
 0	AUE_NULL	STD {
 		int nosys(void);
 	} syscall nosys_args int
-1	AUE_EXIT	STD {
+1	AUE_EXIT	STD|CAPENABLED {
 		void sys_exit(
 		    int rval
 		);
 	} exit sys_exit_args void
-2	AUE_FORK	STD {
+2	AUE_FORK	STD|CAPENABLED {
 		int fork(void);
 	}
-3	AUE_READ	STD {
+3	AUE_READ	STD|CAPENABLED {
 		ssize_t read(
 		    int fd,
 		    _Out_writes_bytes_(nbyte) void *buf,
 		    size_t nbyte
 		);
 	}
-4	AUE_WRITE	STD {
+4	AUE_WRITE	STD|CAPENABLED {
 		ssize_t write(
 		    int fd,
 		    _In_reads_bytes_(nbyte) const void *buf,
@@ -118,7 +118,7 @@
 	}
 ; XXX should be		{ int open(const char *path, int flags, ...); }
 ; but we're not ready for varargs.
-6	AUE_CLOSE	STD {
+6	AUE_CLOSE	STD|CAPENABLED {
 		int close(
 		    int fd
 		);
@@ -179,7 +179,7 @@
 		    int gid
 		);
 	}
-17	AUE_NULL	STD {
+17	AUE_NULL	STD|CAPENABLED {
 		void *break(
 		    _In_ char *nsize
 		);
@@ -191,14 +191,14 @@
 		    int mode
 		);
 	}
-19	AUE_LSEEK	COMPAT {
+19	AUE_LSEEK	COMPAT|CAPENABLED {
 		long lseek(
 		    int fd,
 		    long offset,
 		    int whence
 		);
 	}
-20	AUE_GETPID	STD {
+20	AUE_GETPID	STD|CAPENABLED {
 		pid_t getpid(void);
 	}
 21	AUE_MOUNT	STD {
@@ -215,15 +215,15 @@
 		    int flags
 		);
 	}
-23	AUE_SETUID	STD {
+23	AUE_SETUID	STD|CAPENABLED {
 		int setuid(
 		    uid_t uid
 		);
 	}
-24	AUE_GETUID	STD {
+24	AUE_GETUID	STD|CAPENABLED {
 		uid_t getuid(void);
 	}
-25	AUE_GETEUID	STD {
+25	AUE_GETEUID	STD|CAPENABLED {
 		uid_t geteuid(void);
 	}
 26	AUE_PTRACE	STD {
@@ -234,21 +234,21 @@
 		    int data
 		);
 	}
-27	AUE_RECVMSG	STD {
+27	AUE_RECVMSG	STD|CAPENABLED {
 		int recvmsg(
 		    int s,
 		    _Inout_ struct msghdr *msg,
 		    int flags
 		);
 	}
-28	AUE_SENDMSG	STD {
+28	AUE_SENDMSG	STD|CAPENABLED {
 		int sendmsg(
 		    int s,
 		    _In_ struct msghdr *msg,
 		    int flags
 		);
 	}
-29	AUE_RECVFROM	STD {
+29	AUE_RECVFROM	STD|CAPENABLED {
 		int recvfrom(
 		    int s,
 		    _Out_writes_bytes_(len) void *buf,
@@ -258,21 +258,21 @@
 		    _Inout_opt_ __socklen_t *fromlenaddr
 		);
 	}
-30	AUE_ACCEPT	STD {
+30	AUE_ACCEPT	STD|CAPENABLED {
 		int accept(
 		    int s,
 		    _Out_writes_bytes_opt_(*anamelen) struct sockaddr *name,
 		    _Inout_opt_ __socklen_t *anamelen
 		);
 	}
-31	AUE_GETPEERNAME	STD {
+31	AUE_GETPEERNAME	STD|CAPENABLED {
 		int getpeername(
 		    int fdes,
 		    _Out_writes_bytes_(*alen) struct sockaddr *asa,
 		    _Inout_opt_ __socklen_t *alen
 		);
 	}
-32	AUE_GETSOCKNAME	STD {
+32	AUE_GETSOCKNAME	STD|CAPENABLED {
 		int getsockname(
 		    int fdes,
 		    _Out_writes_bytes_(*alen) struct sockaddr *asa,
@@ -291,16 +291,16 @@
 		    u_long flags
 		);
 	}
-35	AUE_FCHFLAGS	STD {
+35	AUE_FCHFLAGS	STD|CAPENABLED {
 		int fchflags(
 		    int fd,
 		    u_long flags
 		);
 	}
-36	AUE_SYNC	STD {
+36	AUE_SYNC	STD|CAPENABLED {
 		int sync(void);
 	}
-37	AUE_KILL	STD {
+37	AUE_KILL	STD|CAPENABLED {
 		int kill(
 		    int pid,
 		    int signum
@@ -312,7 +312,7 @@
 		    _Out_ struct ostat *ub
 		);
 	}
-39	AUE_GETPPID	STD {
+39	AUE_GETPPID	STD|CAPENABLED {
 		pid_t getppid(void);
 	}
 40	AUE_LSTAT	COMPAT {
@@ -321,18 +321,18 @@
 		    _Out_ struct ostat *ub
 		);
 	}
-41	AUE_DUP		STD {
+41	AUE_DUP		STD|CAPENABLED {
 		int dup(
 		    u_int fd
 		);
 	}
-42	AUE_PIPE	COMPAT10 {
+42	AUE_PIPE	COMPAT10|CAPENABLED {
 		int pipe(void);
 	}
-43	AUE_GETEGID	STD {
+43	AUE_GETEGID	STD|CAPENABLED {
 		gid_t getegid(void);
 	}
-44	AUE_PROFILE	STD {
+44	AUE_PROFILE	STD|CAPENABLED {
 		int profil(
 		    _Out_writes_bytes_(size) char *samples,
 		    size_t size,
@@ -348,17 +348,17 @@
 		    int pid
 		);
 	}
-46	AUE_SIGACTION	COMPAT {
+46	AUE_SIGACTION	COMPAT|CAPENABLED {
 		int sigaction(
 		    int signum,
 		    _In_opt_ struct osigaction *nsa,
 		    _Out_opt_ struct osigaction *osa
 		);
 	}
-47	AUE_GETGID	STD {
+47	AUE_GETGID	STD|CAPENABLED {
 		gid_t getgid(void);
 	}
-48	AUE_SIGPROCMASK	COMPAT {
+48	AUE_SIGPROCMASK	COMPAT|CAPENABLED {
 		int sigprocmask(
 		    int how,
 		    osigset_t mask
@@ -367,7 +367,7 @@
 ; XXX note nonstandard (bogus) calling convention - the libc stub passes
 ; us the mask, not a pointer to it, and we return the old mask as the
 ; (int) return value.
-49	AUE_GETLOGIN	STD {
+49	AUE_GETLOGIN	STD|CAPENABLED {
 		int getlogin(
 		    _Out_writes_z_(namelen) char *namebuf,
 		    u_int namelen
@@ -383,16 +383,16 @@
 		    _In_z_ const char *path
 		);
 	}
-52	AUE_SIGPENDING	COMPAT {
+52	AUE_SIGPENDING	COMPAT|CAPENABLED {
 		int sigpending(void);
 	}
-53	AUE_SIGALTSTACK	STD {
+53	AUE_SIGALTSTACK	STD|CAPENABLED {
 		int sigaltstack(
 		    _In_opt_ stack_t *ss,
 		    _Out_opt_ stack_t *oss
 		);
 	}
-54	AUE_IOCTL	STD {
+54	AUE_IOCTL	STD|CAPENABLED {
 		int ioctl(
 		    int fd,
 		    u_long com,
@@ -429,7 +429,7 @@
 		    _In_z_ char **envv
 		);
 	}
-60	AUE_UMASK	STD {
+60	AUE_UMASK	STD|CAPENABLED {
 		int umask(
 		    mode_t newmask
 		);
@@ -439,7 +439,7 @@
 		    _In_z_ const char *path
 		);
 	}
-62	AUE_FSTAT	COMPAT {
+62	AUE_FSTAT	COMPAT|CAPENABLED {
 		int fstat(
 		    int fd,
 		    _Out_ struct ostat *sb
@@ -454,10 +454,10 @@
 		    int arg
 		);
 	}
-64	AUE_NULL	COMPAT {
+64	AUE_NULL	COMPAT|CAPENABLED {
 		int getpagesize(void);
 	}
-65	AUE_MSYNC	STD {
+65	AUE_MSYNC	STD|CAPENABLED {
 		int msync(
 		    _In_ void *addr,
 		    size_t len,
@@ -469,17 +469,17 @@
 	}
 67	AUE_NULL	OBSOL	vread
 68	AUE_NULL	OBSOL	vwrite
-69	AUE_SBRK	STD {
+69	AUE_SBRK	STD|CAPENABLED {
 		int sbrk(
 		    int incr
 		);
 	}
-70	AUE_SSTK	STD {
+70	AUE_SSTK	STD|CAPENABLED {
 		int sstk(
 		    int incr
 		);
 	}
-71	AUE_MMAP	COMPAT {
+71	AUE_MMAP	COMPAT|CAPENABLED {
 		void *mmap(
 		    _In_ void *addr,
 		    int len,
@@ -494,20 +494,20 @@
 		    int anom
 		);
 	}
-73	AUE_MUNMAP	STD {
+73	AUE_MUNMAP	STD|CAPENABLED {
 		int munmap(
 		    _In_ void *addr,
 		    size_t len
 		);
 	}
-74	AUE_MPROTECT	STD {
+74	AUE_MPROTECT	STD|CAPENABLED {
 		int mprotect(
 		    _In_ void *addr,
 		    size_t len,
 		    int prot
 		);
 	}
-75	AUE_MADVISE	STD {
+75	AUE_MADVISE	STD|CAPENABLED {
 		int madvise(
 		    _In_ void *addr,
 		    size_t len,
@@ -516,14 +516,14 @@
 	}
 76	AUE_NULL	OBSOL	vhangup
 77	AUE_NULL	OBSOL	vlimit
-78	AUE_MINCORE	STD {
+78	AUE_MINCORE	STD|CAPENABLED {
 		int mincore(
 		    _In_ const void *addr,
 		    size_t len,
 		    _Out_writes_bytes_(len/PAGE_SIZE) char *vec
 		);
 	}
-79	AUE_GETGROUPS	STD {
+79	AUE_GETGROUPS	STD|CAPENABLED {
 		int getgroups(
 		    int gidsetsize,
 		    _Out_writes_opt_(gidsetsize) gid_t *gidset
@@ -535,7 +535,7 @@
 		    _In_reads_(gidsetsize) gid_t *gidset
 		);
 	}
-81	AUE_GETPGRP	STD {
+81	AUE_GETPGRP	STD|CAPENABLED {
 		int getpgrp(void);
 	}
 82	AUE_SETPGRP	STD {
@@ -544,7 +544,7 @@
 		    int pgid
 		);
 	}
-83	AUE_SETITIMER	STD {
+83	AUE_SETITIMER	STD|CAPENABLED {
 		int setitimer(
 		    u_int which,
 		    _In_ struct itimerval *itv,
@@ -559,13 +559,13 @@
 		    _In_z_ const char *name
 		);
 	}
-86	AUE_GETITIMER	STD {
+86	AUE_GETITIMER	STD|CAPENABLED {
 		int getitimer(
 		    u_int which,
 		    _Out_ struct itimerval *itv
 		);
 	}
-87	AUE_SYSCTL	COMPAT {
+87	AUE_SYSCTL	COMPAT|CAPENABLED {
 		int gethostname(
 		    _Out_writes_z_(len) char *hostname,
 		    u_int len
@@ -577,17 +577,17 @@
 		    u_int len
 		);
 	}
-89	AUE_GETDTABLESIZE	STD {
+89	AUE_GETDTABLESIZE	STD|CAPENABLED {
 		int getdtablesize(void);
 	}
-90	AUE_DUP2	STD {
+90	AUE_DUP2	STD|CAPENABLED {
 		int dup2(
 		    u_int from,
 		    u_int to
 		);
 	}
 91	AUE_NULL	RESERVED
-92	AUE_FCNTL	STD {
+92	AUE_FCNTL	STD|CAPENABLED {
 		int fcntl(
 		    int fd,
 		    int cmd,
@@ -596,7 +596,7 @@
 	}
 ; XXX should be { int fcntl(int fd, int cmd, ...); }
 ; but we're not ready for varargs.
-93	AUE_SELECT	STD {
+93	AUE_SELECT	STD|CAPENABLED {
 		int select(
 		    int nd,
 		    _Inout_opt_ fd_set *in,
@@ -606,19 +606,19 @@
 		);
 	}
 94	AUE_NULL	RESERVED
-95	AUE_FSYNC	STD {
+95	AUE_FSYNC	STD|CAPENABLED {
 		int fsync(
 		    int fd
 		);
 	}
-96	AUE_SETPRIORITY	STD {
+96	AUE_SETPRIORITY	STD|CAPENABLED {
 		int setpriority(
 		    int which,
 		    int who,
 		    int prio
 		);
 	}
-97	AUE_SOCKET	STD {
+97	AUE_SOCKET	STD|CAPENABLED {
 		int socket(
 		    int domain,
 		    int type,
@@ -632,20 +632,20 @@
 		    int namelen
 		);
 	}
-99	AUE_ACCEPT	COMPAT {
+99	AUE_ACCEPT	COMPAT|CAPENABLED {
 		int accept(
 		    int s,
 		    _Out_writes_bytes_opt_(*anamelen) struct sockaddr *name,
 		    int *anamelen
 		);
 	}
-100	AUE_GETPRIORITY	STD {
+100	AUE_GETPRIORITY	STD|CAPENABLED {
 		int getpriority(
 		    int which,
 		    int who
 		);
 	}
-101	AUE_SEND	COMPAT {
+101	AUE_SEND	COMPAT|CAPENABLED {
 		int send(
 		    int s,
 		    _In_reads_bytes_(len) const void *buf,
@@ -653,7 +653,7 @@
 		    int flags
 		);
 	}
-102	AUE_RECV	COMPAT {
+102	AUE_RECV	COMPAT|CAPENABLED {
 		int recv(
 		    int s,
 		    _Out_writes_bytes_(len) void *buf,
@@ -661,7 +661,7 @@
 		    int flags
 		);
 	}
-103	AUE_SIGRETURN	COMPAT {
+103	AUE_SIGRETURN	COMPAT|CAPENABLED {
 		int sigreturn(
 		    _In_ struct osigcontext *sigcntxp
 		);
@@ -673,7 +673,7 @@
 		    int namelen
 		);
 	}
-105	AUE_SETSOCKOPT	STD {
+105	AUE_SETSOCKOPT	STD|CAPENABLED {
 		int setsockopt(
 		    int s,
 		    int level,
@@ -682,51 +682,51 @@
 		    int valsize
 		);
 	}
-106	AUE_LISTEN	STD {
+106	AUE_LISTEN	STD|CAPENABLED {
 		int listen(
 		    int s,
 		    int backlog
 		);
 	}
 107	AUE_NULL	OBSOL	vtimes
-108	AUE_NULL	COMPAT {
+108	AUE_NULL	COMPAT|CAPENABLED {
 		int sigvec(
 		    int signum,
 		    _In_opt_ struct sigvec *nsv,
 		    _Out_opt_ struct sigvec *osv
 		);
 	}
-109	AUE_NULL	COMPAT {
+109	AUE_NULL	COMPAT|CAPENABLED {
 		int sigblock(
 		    int mask
 		);
 	}
-110	AUE_NULL	COMPAT {
+110	AUE_NULL	COMPAT|CAPENABLED {
 		int sigsetmask(
 		    int mask
 		);
 	}
-111	AUE_NULL	COMPAT {
+111	AUE_NULL	COMPAT|CAPENABLED {
 		int sigsuspend(
 		    osigset_t mask
 		);
 	}
 ; XXX note nonstandard (bogus) calling convention - the libc stub passes
 ; us the mask, not a pointer to it.
-112	AUE_NULL	COMPAT {
+112	AUE_NULL	COMPAT|CAPENABLED {
 		int sigstack(
 		    _In_opt_ struct sigstack *nss,
 		    _Out_opt_ struct sigstack *oss
 		);
 	}
-113	AUE_RECVMSG	COMPAT {
+113	AUE_RECVMSG	COMPAT|CAPENABLED {
 		int recvmsg(
 		    int s,
 		    _Inout_ struct omsghdr *msg,
 		    int flags
 		);
 	}
-114	AUE_SENDMSG	COMPAT {
+114	AUE_SENDMSG	COMPAT|CAPENABLED {
 		int sendmsg(
 		    int s,
 		    _In_ const void *msg,
@@ -734,19 +734,19 @@
 		);
 	}
 115	AUE_NULL	OBSOL	vtrace
-116	AUE_GETTIMEOFDAY	STD {
+116	AUE_GETTIMEOFDAY	STD|CAPENABLED {
 		int gettimeofday(
 		    _Out_ struct timeval *tp,
 		    _Out_opt_ struct timezone *tzp
 		);
 	}
-117	AUE_GETRUSAGE	STD {
+117	AUE_GETRUSAGE	STD|CAPENABLED {
 		int getrusage(
 		    int who,
 		    _Out_ struct rusage *rusage
 		);
 	}
-118	AUE_GETSOCKOPT	STD {
+118	AUE_GETSOCKOPT	STD|CAPENABLED {
 		int getsockopt(
 		    int s,
 		    int level,
@@ -756,14 +756,14 @@
 		);
 	}
 119	AUE_NULL	RESERVED
-120	AUE_READV	STD {
+120	AUE_READV	STD|CAPENABLED {
 		int readv(
 		    int fd,
 		    _Inout_updates_(iovcnt) struct iovec *iovp,
 		    u_int iovcnt
 		);
 	}
-121	AUE_WRITEV	STD {
+121	AUE_WRITEV	STD|CAPENABLED {
 		int writev(
 		    int fd,
 		    _In_reads_opt_(iovcnt) struct iovec *iovp,
@@ -776,20 +776,20 @@
 		    _In_opt_ struct timezone *tzp
 		);
 	}
-123	AUE_FCHOWN	STD {
+123	AUE_FCHOWN	STD|CAPENABLED {
 		int fchown(
 		    int fd,
 		    int uid,
 		    int gid
 		);
 	}
-124	AUE_FCHMOD	STD {
+124	AUE_FCHMOD	STD|CAPENABLED {
 		int fchmod(
 		    int fd,
 		    mode_t mode
 		);
 	}
-125	AUE_RECVFROM	COMPAT|NOARGS {
+125	AUE_RECVFROM	COMPAT|NOARGS|CAPENABLED {
 		int recvfrom(
 		    int s,
 		    _Out_writes_(len) void *buf,
@@ -799,13 +799,13 @@
 		    _Inout_ int *fromlenaddr
 		);
 	} recvfrom recvfrom_args int
-126	AUE_SETREUID	STD {
+126	AUE_SETREUID	STD|CAPENABLED {
 		int setreuid(
 		    int ruid,
 		    int euid
 		);
 	}
-127	AUE_SETREGID	STD {
+127	AUE_SETREGID	STD|CAPENABLED {
 		int setregid(
 		    int rgid,
 		    int egid
@@ -823,13 +823,13 @@
 		    long length
 		);
 	}
-130	AUE_FTRUNCATE	COMPAT {
+130	AUE_FTRUNCATE	COMPAT|CAPENABLED {
 		int ftruncate(
 		    int fd,
 		    long length
 		);
 	}
-131	AUE_FLOCK	STD {
+131	AUE_FLOCK	STD|CAPENABLED {
 		int flock(
 		    int fd,
 		    int how
@@ -841,7 +841,7 @@
 		    mode_t mode
 		);
 	}
-133	AUE_SENDTO	STD {
+133	AUE_SENDTO	STD|CAPENABLED {
 		int sendto(
 		    int s,
 		    _In_reads_bytes_(len) const void *buf,
@@ -851,13 +851,13 @@
 		    int tolen
 		);
 	}
-134	AUE_SHUTDOWN	STD {
+134	AUE_SHUTDOWN	STD|CAPENABLED {
 		int shutdown(
 		    int s,
 		    int how
 		);
 	}
-135	AUE_SOCKETPAIR	STD {
+135	AUE_SOCKETPAIR	STD|CAPENABLED {
 		int socketpair(
 		    int domain,
 		    int type,
@@ -889,14 +889,14 @@
 		    _Out_opt_ struct timeval *olddelta
 		);
 	}
-141	AUE_GETPEERNAME	COMPAT {
+141	AUE_GETPEERNAME	COMPAT|CAPENABLED {
 		int getpeername(
 		    int fdes,
 		    _Out_writes_bytes_(*alen) struct sockaddr *asa,
 		    _Inout_opt_ int *alen
 		);
 	}
-142	AUE_SYSCTL	COMPAT {
+142	AUE_SYSCTL	COMPAT|CAPENABLED {
 		long gethostid(void);
 	}
 143	AUE_SYSCTL	COMPAT {
@@ -904,13 +904,13 @@
 		    long hostid
 		);
 	}
-144	AUE_GETRLIMIT	COMPAT {
+144	AUE_GETRLIMIT	COMPAT|CAPENABLED {
 		int getrlimit(
 		    u_int which,
 		    _Out_ struct orlimit *rlp
 		);
 	}
-145	AUE_SETRLIMIT	COMPAT {
+145	AUE_SETRLIMIT	COMPAT|CAPENABLED {
 		int setrlimit(
 		    u_int which,
 		    _Out_ struct orlimit *rlp
@@ -922,7 +922,7 @@
 		    int signum
 		);
 	}
-147	AUE_SETSID	STD {
+147	AUE_SETSID	STD|CAPENABLED {
 		int setsid(void);
 	}
 148	AUE_QUOTACTL	STD {
@@ -936,7 +936,7 @@
 149	AUE_O_QUOTA	COMPAT {
 		int quota(void);
 	}
-150	AUE_GETSOCKNAME	COMPAT|NOARGS {
+150	AUE_GETSOCKNAME	COMPAT|NOARGS|CAPENABLED {
 		int getsockname(
 		    int fdec,
 		    _Out_writes_bytes_(*alen) struct sockaddr *asa,
@@ -961,7 +961,7 @@
 		    _In_ void *argp
 		);
 	}
-156	AUE_GETDIRENTRIES	COMPAT {
+156	AUE_GETDIRENTRIES	COMPAT|CAPENABLED {
 		int getdirentries(
 		    int fd,
 		    _Out_writes_bytes_(count) char *buf,
@@ -975,7 +975,7 @@
 		    _Out_ struct ostatfs *buf
 		);
 	}
-158	AUE_FSTATFS	COMPAT4 {
+158	AUE_FSTATFS	COMPAT4|CAPENABLED {
 		int fstatfs(
 		    int fd,
 		    _Out_ struct ostatfs *buf
@@ -994,7 +994,7 @@
 		    _Out_ struct fhandle *fhp
 		);
 	}
-162	AUE_SYSCTL	COMPAT4 {
+162	AUE_SYSCTL	COMPAT4|CAPENABLED {
 		int getdomainname(
 		    _Out_writes_z_(len) char *domainname,
 		    int len
@@ -1011,13 +1011,13 @@
 		    _Out_ struct utsname *name
 		);
 	}
-165	AUE_SYSARCH	STD {
+165	AUE_SYSARCH	STD|CAPENABLED {
 		int sysarch(
 		    int op,
 		    _In_z_ char *parms
 		);
 	}
-166	AUE_RTPRIO	STD {
+166	AUE_RTPRIO	STD|CAPENABLED {
 		int rtprio(
 		    int function,
 		    pid_t pid,
@@ -1056,7 +1056,7 @@
 	}
 ; XXX should be { int shmsys(int which, ...); }
 172	AUE_NULL	RESERVED
-173	AUE_PREAD	COMPAT6 {
+173	AUE_PREAD	COMPAT6|CAPENABLED {
 		ssize_t pread(
 		    int fd,
 		    _Out_writes_bytes_(nbyte) void *buf,
@@ -1065,7 +1065,7 @@
 		    off_t offset
 		);
 	}
-174	AUE_PWRITE	COMPAT6 {
+174	AUE_PWRITE	COMPAT6|CAPENABLED {
 		ssize_t pwrite(
 		    int fd,
 		    _In_reads_bytes_(nbyte) const void *buf,
@@ -1085,17 +1085,17 @@
 		);
 	}
 177-180	AUE_NULL	RESERVED
-181	AUE_SETGID	STD {
+181	AUE_SETGID	STD|CAPENABLED {
 		int setgid(
 		    gid_t gid
 		);
 	}
-182	AUE_SETEGID	STD {
+182	AUE_SETEGID	STD|CAPENABLED {
 		int setegid(
 		    gid_t egid
 		);
 	}
-183	AUE_SETEUID	STD {
+183	AUE_SETEUID	STD|CAPENABLED {
 		int seteuid(
 		    uid_t euid
 		);
@@ -1110,7 +1110,7 @@
 		    _Out_ struct freebsd11_stat *ub
 		);
 	}
-189	AUE_FSTAT	COMPAT11 {
+189	AUE_FSTAT	COMPAT11|CAPENABLED {
 		int fstat(
 		    int fd,
 		    _Out_ struct freebsd11_stat *sb
@@ -1128,26 +1128,26 @@
 		    int name
 		);
 	}
-192	AUE_FPATHCONF	STD {
+192	AUE_FPATHCONF	STD|CAPENABLED {
 		int fpathconf(
 		    int fd,
 		    int name
 		);
 	}
 193	AUE_NULL	RESERVED
-194	AUE_GETRLIMIT	STD {
+194	AUE_GETRLIMIT	STD|CAPENABLED {
 		int getrlimit(
 		    u_int which,
 		    _Out_ struct rlimit *rlp
 		);
 	} getrlimit __getrlimit_args int
-195	AUE_SETRLIMIT	STD {
+195	AUE_SETRLIMIT	STD|CAPENABLED {
 		int setrlimit(
 		    u_int which,
 		    _In_ struct rlimit *rlp
 		);
 	} setrlimit __setrlimit_args int
-196	AUE_GETDIRENTRIES	COMPAT11 {
+196	AUE_GETDIRENTRIES	COMPAT11|CAPENABLED {
 		int getdirentries(
 		    int fd,
 		    _Out_writes_bytes_(count) char *buf,
@@ -1155,7 +1155,7 @@
 		    _Out_ long *basep
 		);
 	}
-197	AUE_MMAP	COMPAT6 {
+197	AUE_MMAP	COMPAT6|CAPENABLED {
 		void *mmap(
 		    _In_ void *addr,
 		    size_t len,
@@ -1169,7 +1169,7 @@
 198	AUE_NULL	NOPROTO {
 		int nosys(void);
 	} __syscall __syscall_args int
-199	AUE_LSEEK	COMPAT6 {
+199	AUE_LSEEK	COMPAT6|CAPENABLED {
 		off_t lseek(
 		    int fd,
 		    int pad,
@@ -1184,14 +1184,14 @@
 		    off_t length
 		);
 	}
-201	AUE_FTRUNCATE	COMPAT6 {
+201	AUE_FTRUNCATE	COMPAT6|CAPENABLED {
 		int ftruncate(
 		    int fd,
 		    int pad,
 		    off_t length
 		);
 	}
-202	AUE_SYSCTL	STD {
+202	AUE_SYSCTL	STD|CAPENABLED {
 		int __sysctl(
 		    _In_reads_(namelen) int *name,
 		    u_int namelen,
@@ -1201,13 +1201,13 @@
 		    size_t newlen
 		);
 	} __sysctl sysctl_args int
-203	AUE_MLOCK	STD {
+203	AUE_MLOCK	STD|CAPENABLED {
 		int mlock(
 		    _In_ const void *addr,
 		    size_t len
 		);
 	}
-204	AUE_MUNLOCK	STD {
+204	AUE_MUNLOCK	STD|CAPENABLED {
 		int munlock(
 		    _In_ const void *addr,
 		    size_t len
@@ -1218,19 +1218,19 @@
 		    _In_z_ const char *path
 		);
 	}
-206	AUE_FUTIMES	STD {
+206	AUE_FUTIMES	STD|CAPENABLED {
 		int futimes(
 		    int fd,
 		    _In_reads_(2) struct timeval *tptr
 		);
 	}
-207	AUE_GETPGID	STD {
+207	AUE_GETPGID	STD|CAPENABLED {
 		int getpgid(
 		    pid_t pid
 		);
 	}
 208	AUE_NULL	RESERVED
-209	AUE_POLL	STD {
+209	AUE_POLL	STD|CAPENABLED {
 		int poll(
 		    _Inout_updates_(nfds) struct pollfd *fds,
 		    u_int nfds,
@@ -1330,7 +1330,7 @@
 		    int shmflg
 		);
 	}
-232	AUE_NULL	STD {
*** 1300 LINES SKIPPED ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109012059.181KxnLF047581>