summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorSebastian Benoit <benno@cvs.openbsd.org>2015-11-17 17:54:02 +0000
committerSebastian Benoit <benno@cvs.openbsd.org>2015-11-17 17:54:02 +0000
commitdc9d8c3dd6e55144de6f46c37258ab4bcf0994ed (patch)
tree486d73a9e099d69ac8fda9adf9d66be5e861f8df /usr.sbin
parente649ddc8ae7486b035e579ce1e1ab0ce4e4891f2 (diff)
pledge() esposes a design issue in bgpd that will take a moment to
get right, so disable the pledge() call in bgpd (parent process) for now. ok deraadt@
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/bgpd/bgpd.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/usr.sbin/bgpd/bgpd.c b/usr.sbin/bgpd/bgpd.c
index 6d2355046dc..bc556608f6c 100644
--- a/usr.sbin/bgpd/bgpd.c
+++ b/usr.sbin/bgpd/bgpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bgpd.c,v 1.180 2015/11/12 20:49:46 benno Exp $ */
+/* $OpenBSD: bgpd.c,v 1.181 2015/11/17 17:54:01 benno Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -243,9 +243,15 @@ main(int argc, char *argv[])
* pledge placed here because kr_init() does a setsockopt on the
* routing socket thats not allowed at all.
*/
+#if 0
+ /*
+ * disabled because we do ioctls on /dev/pf and SIOCSIFGATTR
+ * this needs some redesign of bgpd to be fixed.
+ */
if (pledge("stdio rpath wpath cpath fattr unix route recvfd sendfd "
"proc", NULL) == -1)
fatal("pledge");
+#endif
if (imsg_send_sockets(ibuf_se, ibuf_rde))
fatal("could not establish imsg links");