summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortedu <tedu@openbsd.org>2016-01-06 18:43:10 +0000
committertedu <tedu@openbsd.org>2016-01-06 18:43:10 +0000
commit790b8d75e7c67db0711c04c8fe2737f718935f9e (patch)
treefd00880c3e347d08c5d61986ae7b83211744452f
parentremove unnecessary casts where the incoming type is void *. (diff)
downloadwireguard-openbsd-790b8d75e7c67db0711c04c8fe2737f718935f9e.tar.xz
wireguard-openbsd-790b8d75e7c67db0711c04c8fe2737f718935f9e.zip
turn off the whitepath code for now; we're not sure it's ready for release
ok deraadt
-rw-r--r--sys/kern/kern_pledge.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/kern/kern_pledge.c b/sys/kern/kern_pledge.c
index 8467f00d28f..1deadd0ac3d 100644
--- a/sys/kern/kern_pledge.c
+++ b/sys/kern/kern_pledge.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_pledge.c,v 1.143 2016/01/06 17:59:30 tedu Exp $ */
+/* $OpenBSD: kern_pledge.c,v 1.144 2016/01/06 18:43:10 tedu Exp $ */
/*
* Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org>
@@ -427,6 +427,8 @@ sys_pledge(struct proc *p, void *v, register_t *retval)
}
if (SCARG(uap, paths)) {
+ return (EINVAL);
+#if 0
const char **u = SCARG(uap, paths), *sp;
struct whitepaths *wl;
char *cwdpath = NULL, *path;
@@ -543,6 +545,7 @@ sys_pledge(struct proc *p, void *v, register_t *retval)
printf("pledge: %d=%s %lld\n", i, wl->wl_paths[i].name,
(long long)wl->wl_paths[i].len);
#endif
+#endif
}
p->p_p->ps_pledge = flags;