summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/compat/freebsd32/freebsd32_capability.c20
-rw-r--r--sys/compat/freebsd32/syscalls.master2
2 files changed, 21 insertions, 1 deletions
diff --git a/sys/compat/freebsd32/freebsd32_capability.c b/sys/compat/freebsd32/freebsd32_capability.c
index b23cf95..27c83c4 100644
--- a/sys/compat/freebsd32/freebsd32_capability.c
+++ b/sys/compat/freebsd32/freebsd32_capability.c
@@ -49,6 +49,18 @@ __FBSDID("$FreeBSD$");
MALLOC_DECLARE(M_FILECAPS);
int
+freebsd32_cap_enter(struct thread *td,
+ struct freebsd32_cap_enter_args *uap)
+{
+
+ /*
+ * We do not have an equivalent of capabilities.conf for freebsd32
+ * compatibility, so do not allow capability mode for now.
+ */
+ return (ENOSYS);
+}
+
+int
freebsd32_cap_ioctls_limit(struct thread *td,
struct freebsd32_cap_ioctls_limit_args *uap)
{
@@ -136,6 +148,14 @@ out:
#else /* !CAPABILITIES */
int
+freebsd32_cap_enter(struct thread *td,
+ struct freebsd32_cap_enter_args *uap)
+{
+
+ return (ENOSYS);
+}
+
+int
freebsd32_cap_ioctls_limit(struct thread *td,
struct freebsd32_cap_ioctls_limit_args *uap)
{
diff --git a/sys/compat/freebsd32/syscalls.master b/sys/compat/freebsd32/syscalls.master
index f537a54..c52256a 100644
--- a/sys/compat/freebsd32/syscalls.master
+++ b/sys/compat/freebsd32/syscalls.master
@@ -973,7 +973,7 @@
514 AUE_NULL OBSOL cap_new
515 AUE_CAP_RIGHTS_GET NOPROTO { int __cap_rights_get(int version, \
int fd, cap_rights_t *rightsp); }
-516 AUE_CAP_ENTER NOPROTO { int cap_enter(void); }
+516 AUE_CAP_ENTER STD { int freebsd32_cap_enter(void); }
517 AUE_CAP_GETMODE NOPROTO { int cap_getmode(u_int *modep); }
518 AUE_PDFORK NOPROTO { int pdfork(int *fdp, int flags); }
519 AUE_PDKILL NOPROTO { int pdkill(int fd, int signum); }
OpenPOWER on IntegriCloud