summaryrefslogtreecommitdiff
path: root/sys/kern/kern_sysctl.c
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2015-10-09 01:10:28 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2015-10-09 01:10:28 +0000
commit11ffd90184916e72409bd0c4fb5589b4b5bb565c (patch)
treef8b218c0d5ef85602345bab0b6f711bad3d28d25 /sys/kern/kern_sysctl.c
parenta0d0134849c987c92c72ad5425a500229bba1275 (diff)
Rename tame() to pledge(). This fairly interface has evolved to be more
strict than anticipated. It allows a programmer to pledge/promise/covenant that their program will operate within an easily defined subset of the Unix environment, or it pays the price.
Diffstat (limited to 'sys/kern/kern_sysctl.c')
-rw-r--r--sys/kern/kern_sysctl.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c
index 3a716b0ac6a..b5258b5309c 100644
--- a/sys/kern/kern_sysctl.c
+++ b/sys/kern/kern_sysctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_sysctl.c,v 1.295 2015/09/28 16:59:35 deraadt Exp $ */
+/* $OpenBSD: kern_sysctl.c,v 1.296 2015/10/09 01:10:27 deraadt Exp $ */
/* $NetBSD: kern_sysctl.c,v 1.17 1996/05/20 17:49:05 mrg Exp $ */
/*-
@@ -69,7 +69,7 @@
#include <sys/socket.h>
#include <sys/domain.h>
#include <sys/protosw.h>
-#include <sys/tame.h>
+#include <sys/pledge.h>
#include <sys/timetc.h>
#include <sys/evcount.h>
#include <sys/un.h>
@@ -174,8 +174,8 @@ sys_sysctl(struct proc *p, void *v, register_t *retval)
if (error)
return (error);
- if (tame_sysctl_check(p, SCARG(uap, namelen), name, SCARG(uap, new)))
- return (tame_fail(p, EPERM, TAME_SELF));
+ if (pledge_sysctl_check(p, SCARG(uap, namelen), name, SCARG(uap, new)))
+ return (pledge_fail(p, EPERM, PLEDGE_SELF));
switch (name[0]) {
case CTL_KERN: