diff options
| author |   natano <natano@openbsd.org> | 2017-04-19 05:36:12 +0000 |
|---|---|---|
| committer | natano <natano@openbsd.org> | 2017-04-19 05:36:12 +0000 |
| commit | 7b08a90aae262418a4b5fe9eae6b24d21fd1dcd4 (patch) | |
| tree | 188724e650bbfb6b5975903479b8a0e42be691c9 /usr.sbin/npppd | |
| parent | Bump numbers for /usr/obj allocation with *big* compilers. (diff) | |
| download | wireguard-openbsd-7b08a90aae262418a4b5fe9eae6b24d21fd1dcd4.tar.xz wireguard-openbsd-7b08a90aae262418a4b5fe9eae6b24d21fd1dcd4.zip | |
Switch base tools from /dev/bpf0 to /dev/bpf. Now that /dev/bpf has been
around for two releases, it should be safe to do so.
ok bluhm deraadt sthen tb yasuoka
Diffstat (limited to 'usr.sbin/npppd')
| -rw-r--r-- | usr.sbin/npppd/npppd/privsep.c | 4 | ||||
| -rw-r--r-- | usr.sbin/npppd/pppoe/pppoed.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/npppd/npppd/privsep.c b/usr.sbin/npppd/npppd/privsep.c index d248b724bed..5b934469ef1 100644 --- a/usr.sbin/npppd/npppd/privsep.c +++ b/usr.sbin/npppd/npppd/privsep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: privsep.c,v 1.22 2016/05/28 07:00:18 natano Exp $ */ +/* $OpenBSD: privsep.c,v 1.23 2017/04/19 05:36:13 natano Exp $ */ /* * Copyright (c) 2010 Yasuoka Masahiko <yasuoka@openbsd.org> @@ -983,7 +983,7 @@ privsep_npppd_check_open(struct PRIVSEP_OPEN_ARG *arg) int readonly; } const allow_paths[] = { { NPPPD_DIR "/", 1, 1 }, - { "/dev/bpf0", 0, 0 }, + { "/dev/bpf", 0, 0 }, { "/etc/resolv.conf", 0, 1 }, { "/dev/tun", 1, 0 }, { "/dev/pppx", 1, 0 } diff --git a/usr.sbin/npppd/pppoe/pppoed.c b/usr.sbin/npppd/pppoe/pppoed.c index ec4e90e496b..75b6fa97f0c 100644 --- a/usr.sbin/npppd/pppoe/pppoed.c +++ b/usr.sbin/npppd/pppoe/pppoed.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pppoed.c,v 1.20 2016/05/28 07:00:18 natano Exp $ */ +/* $OpenBSD: pppoed.c,v 1.21 2017/04/19 05:36:13 natano Exp $ */ /*- * Copyright (c) 2009 Internet Initiative Japan Inc. @@ -28,7 +28,7 @@ /**@file * This file provides the PPPoE(RFC2516) server(access concentrator) * implementaion. - * $Id: pppoed.c,v 1.20 2016/05/28 07:00:18 natano Exp $ + * $Id: pppoed.c,v 1.21 2017/04/19 05:36:13 natano Exp $ */ #include <sys/param.h> /* ALIGN */ #include <sys/types.h> @@ -273,7 +273,7 @@ pppoed_listener_start(pppoed_listener *_this, int restart) goto fail; } - if ((_this->bpf = priv_open("/dev/bpf0", O_RDWR)) == -1) { + if ((_this->bpf = priv_open("/dev/bpf", O_RDWR)) == -1) { pppoed_log(_pppoed, log_level, "Cannot open bpf: %m"); goto fail; } |