diff options
| author |   tedu <tedu@openbsd.org> | 2016-09-17 00:42:35 +0000 |
|---|---|---|
| committer | tedu <tedu@openbsd.org> | 2016-09-17 00:42:35 +0000 |
| commit | 2009fb4912a29b7fb8c2aaed5cc7c548df620ab3 (patch) | |
| tree | a4eb5e5ba6f22786dc1afcd2d3a904495abb9196 | |
| parent | clean old cruft out of mbstat (diff) | |
| download | wireguard-openbsd-2009fb4912a29b7fb8c2aaed5cc7c548df620ab3.tar.xz wireguard-openbsd-2009fb4912a29b7fb8c2aaed5cc7c548df620ab3.zip | |
NPF > 0 is a better test than SMALL for presence of pf.
ok deraadt
| -rw-r--r-- | sys/kern/kern_pledge.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/kern/kern_pledge.c b/sys/kern/kern_pledge.c index 6de36a6d4c5..a94a9865de9 100644 --- a/sys/kern/kern_pledge.c +++ b/sys/kern/kern_pledge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_pledge.c,v 1.182 2016/09/04 17:22:40 jsing Exp $ */ +/* $OpenBSD: kern_pledge.c,v 1.183 2016/09/17 00:42:35 tedu Exp $ */ /* * Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org> @@ -65,6 +65,7 @@ #include <sys/pledge.h> #include "audio.h" +#include "pf.h" #include "pty.h" #if defined(__amd64__) @@ -1211,7 +1212,7 @@ pledge_ioctl(struct proc *p, long com, struct file *fp) } if ((p->p_p->ps_pledge & PLEDGE_PF)) { -#ifndef SMALL_KERNEL +#if NPF > 0 switch (com) { case DIOCADDRULE: case DIOCGETSTATUS: @@ -1231,7 +1232,7 @@ pledge_ioctl(struct proc *p, long com, struct file *fp) return (0); break; } -#endif /* !SMALL_KERNEL */ +#endif } if ((p->p_p->ps_pledge & PLEDGE_TTY)) { |