diff options
| -rw-r--r-- | usr.sbin/dhcpd/dhcpd.c | 8 | ||||
| -rw-r--r-- | usr.sbin/dhcpd/udpsock.c | 5 |
2 files changed, 3 insertions, 10 deletions
diff --git a/usr.sbin/dhcpd/dhcpd.c b/usr.sbin/dhcpd/dhcpd.c index 5ffc2155770..d137d0e39b7 100644 --- a/usr.sbin/dhcpd/dhcpd.c +++ b/usr.sbin/dhcpd/dhcpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dhcpd.c,v 1.50 2016/02/06 23:50:10 krw Exp $ */ +/* $OpenBSD: dhcpd.c,v 1.51 2016/04/27 10:16:10 mestre Exp $ */ /* * Copyright (c) 2004 Henning Brauer <henning@cvs.openbsd.org> @@ -240,12 +240,8 @@ main(int argc, char *argv[]) } } - if (udpsockmode) { + if (udpsockmode) udpsock_startup(udpaddr); - } else { - if (pledge("stdio rpath inet sendfd proc id", NULL) == -1) - err(1, "pledge"); - } icmp_startup(1, lease_pinged); diff --git a/usr.sbin/dhcpd/udpsock.c b/usr.sbin/dhcpd/udpsock.c index 61602292e7f..2c4c0503218 100644 --- a/usr.sbin/dhcpd/udpsock.c +++ b/usr.sbin/dhcpd/udpsock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: udpsock.c,v 1.6 2016/04/04 14:00:42 mestre Exp $ */ +/* $OpenBSD: udpsock.c,v 1.7 2016/04/27 10:16:10 mestre Exp $ */ /* * Copyright (c) 2014 YASUOKA Masahiko <yasuoka@openbsd.org> @@ -65,9 +65,6 @@ udpsock_startup(struct in_addr bindaddr) error("setsocketopt IP_RECVIF failed for udp: %s", strerror(errno)); - if (pledge("stdio rpath inet route sendfd proc id", NULL) == -1) - error("pledge: %s", strerror(errno)); - sin4.sin_family = AF_INET; sin4.sin_len = sizeof(sin4); sin4.sin_addr = bindaddr; |