diff options
| author | sjg <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
| commit | d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2 (patch) | |
| tree | b04f4bd7cd887f50e7d98af35f46b9834ff86c80 /usr.sbin/ppp | |
| parent | 3c8e37b1d04827f33c0c9a7594bd1b1ef7cdb3d3 (diff) | |
| parent | 4fbde208c6460d576f64d6dc3cdc6cab085a4283 (diff) | |
| download | FreeBSD-src-d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2.zip FreeBSD-src-d7cd1d425cc1ea9451fa235e3af9b6625c3e0de2.tar.gz | |
Merge head from 7/28
Diffstat (limited to 'usr.sbin/ppp')
| -rw-r--r-- | usr.sbin/ppp/Makefile | 3 | ||||
| -rw-r--r-- | usr.sbin/ppp/ppp.8 | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile index a61ebf5..beea0ab 100644 --- a/usr.sbin/ppp/Makefile +++ b/usr.sbin/ppp/Makefile @@ -76,8 +76,7 @@ CFLAGS+=-DNOSUID SRCS+= id.c .endif -.if defined(RELEASE_CRUNCH) || ${MK_OPENSSL} == "no" || \ - defined(PPP_NO_DES) +.if ${MK_OPENSSL} == "no" || defined(PPP_NO_DES) CFLAGS+=-DNODES .else SRCS+= chap_ms.c mppe.c diff --git a/usr.sbin/ppp/ppp.8 b/usr.sbin/ppp/ppp.8 index c4ebe50..59eeaed 100644 --- a/usr.sbin/ppp/ppp.8 +++ b/usr.sbin/ppp/ppp.8 @@ -6061,14 +6061,14 @@ This socket is used to pass links between different instances of .Xr vipw 8 .Sh HISTORY This program was originally written by -.An Toshiharu OHNO Aq tony-o@iij.ad.jp , +.An Toshiharu OHNO Aq Mt tony-o@iij.ad.jp , and was submitted to .Fx 2.0.5 by -.An Atsushi Murai Aq amurai@spec.co.jp . +.An Atsushi Murai Aq Mt amurai@spec.co.jp . .Pp It was substantially modified during 1997 by -.An Brian Somers Aq brian@Awfulhak.org , +.An Brian Somers Aq Mt brian@Awfulhak.org , and was ported to .Ox in November that year |
