diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2014-03-17 17:07:46 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2014-03-17 17:07:46 +0000 |
| commit | 4cc13ef8fb7ed5c410862bd9303546b2bd9609cb (patch) | |
| tree | 02e721f25069277774db5002d6dfe2412f746c05 /usr.sbin | |
| parent | be93d6a9c125d07dfc2cc9f217b29a90d316ae6f (diff) | |
the userland ppp(9) code goes awa. Having too much ppp choice in the
tree results in one-true-ppp not coming into existance. This code is
essentially un-audited and quite dangerous.
ok claudio sthen
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/Makefile | 4 | ||||
| -rw-r--r-- | usr.sbin/pppd/pppd.8 | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index afdc2f4fa38..ffe2fbfd7c8 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.174 2014/03/15 22:13:36 sthen Exp $ +# $OpenBSD: Makefile,v 1.175 2014/03/17 17:07:44 deraadt Exp $ .include <bsd.own.mk> @@ -11,7 +11,7 @@ SUBDIR= ac accton acpidump adduser amd apm apmd arp \ memconfig mksuncd mkuboot mopd mrinfo mrouted \ mtrace mtree ndp netgroup_mkdb \ nginx npppctl npppd nsd ntpd openssl ospfctl ospfd ospf6d ospf6ctl \ - pcidump pkg_add portmap ppp pppd pppoe procmap pstat pwd_mkdb \ + pcidump pkg_add portmap pppd procmap pstat pwd_mkdb \ quot quotaon rarpd rbootd rdate relayctl relayd repquota rip6query \ ripctl ripd rmt route6d rpc.bootparamd rpc.lockd rpc.statd rtadvd \ rtsold rwhod sa sasyncd sensorsd sliplogin slowcgi slstats smtpd \ diff --git a/usr.sbin/pppd/pppd.8 b/usr.sbin/pppd/pppd.8 index 3110fb28672..55fefdfbdc6 100644 --- a/usr.sbin/pppd/pppd.8 +++ b/usr.sbin/pppd/pppd.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pppd.8,v 1.42 2014/01/21 03:15:46 schwarze Exp $ +.\" $OpenBSD: pppd.8,v 1.43 2014/03/17 17:07:45 deraadt Exp $ .\" Id: pppd.8,v 1.27 1998/03/31 04:31:08 paulus Exp $ .\" .\" Copyright (c) 1993-2003 Paul Mackerras <paulus@samba.org> @@ -15,7 +15,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: January 21 2014 $ +.Dd $Mdocdate: March 17 2014 $ .Dt PPPD 8 .Os .Sh NAME @@ -1427,7 +1427,6 @@ This signal acts as a toggle. .Xr ppp 4 , .Xr tty 4 , .Xr chat 8 , -.Xr ppp 8 , .Xr syslogd 8 , .Xr tcpdump 8 .Rs |