diff options
author | ru <ru@FreeBSD.org> | 2004-12-21 12:01:15 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2004-12-21 12:01:15 +0000 |
commit | b74e87102d00fdd46ad107c6ed10dedbe5e61add (patch) | |
tree | b744377e118a38520d1937f3bf3f23e718209a64 /share | |
parent | a90b1e36568bbf68413166df0db874fdf3e841c2 (diff) | |
download | FreeBSD-src-b74e87102d00fdd46ad107c6ed10dedbe5e61add.zip FreeBSD-src-b74e87102d00fdd46ad107c6ed10dedbe5e61add.tar.gz |
Overhaul ppp(8) build options so they are safe to use in
/etc/make.conf:
NOALIAS -> retired (support provided by PPP_NO_NAT)
NOATM -> PPP_NO_ATM (also subject to NO_ATM global)
NODES -> PPP_NO_DES (support was broken, now recovered)
NOI4B -> PPP_NO_I4B (also subject to NO_I4B global)
NOKLDLOAD -> PPP_NO_KLDLOAD
NONAT -> PPP_NO_NAT
NONETGRAPH -> PPP_NO_NETGRAPH
NOPAM -> PPP_NO_PAM (will be subject to NO_PAM global)
NORADIUS -> PPP_NO_RADIUS
NOSUID -> retired (support provided by PPP_NO_SUID)
PPP_NOSUID -> PPP_NO_SUID
Diffstat (limited to 'share')
-rw-r--r-- | share/examples/etc/make.conf | 9 | ||||
-rw-r--r-- | share/man/man5/make.conf.5 | 32 |
2 files changed, 17 insertions, 24 deletions
diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf index f0f5a39..cab2916 100644 --- a/share/examples/etc/make.conf +++ b/share/examples/etc/make.conf @@ -145,11 +145,10 @@ #NO_USB= # do not build usbd(8) and related programs # # Variables that control how ppp(8) is built. -#NOALIAS= # do not build with NAT support (see make.conf(5)) -#NONAT= # do not build with NAT support (see make.conf(5)) -#NONETGRAPH= # do not build with NETGRAPH support -#NORADUIS= # do not build with RADUIS support -#PPP_NOSUID= # build with normal permissions +#PPP_NO_NAT= # do not build with NAT support (see make.conf(5)) +#PPP_NO_NETGRAPH= # do not build with Netgraph support +#PPP_NO_RADUIS= # do not build with RADIUS support +#PPP_NO_SUID= # build with normal permissions # # Variables to control whether parts of the base BIND are built. # Defining NO_BIND makes all of the following BIND variables obsolete. diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5 index 302fe2b..4090f5d 100644 --- a/share/man/man5/make.conf.5 +++ b/share/man/man5/make.conf.5 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 14, 2004 +.Dd December 21, 2004 .Dt MAKE.CONF 5 .Os .Sh NAME @@ -458,11 +458,6 @@ compilers, debuggers etc. .Pq Vt bool Set to not build programs and libraries related to IPv6 networking. -.It Va NOALIAS -.Pq Vt bool -Build -.Xr ppp 8 -without support for network address translation (NAT). .It Va NO_ATM .Pq Vt bool Set to not build @@ -633,27 +628,26 @@ and .It Va WITH_BIND_LIBS .Pq Vt bool Set to install BIND libraries and include files. -.It Va NONAT -.It Vt bool -This is an alias for -.Va NONAT -and can break when building -.Xr ppp 8 . -.It Va NONETGRAPH +.It Va PPP_NO_NAT +.Pq Vt bool +Build +.Xr ppp 8 +without support for network address translation (NAT). +.It Va PPP_NO_NETGRAPH .Pq Vt bool Set to build .Xr ppp 8 -without support for netgraph. -.It Va NORADIUS -.Pq Va bool +without support for Netgraph. +.It Va PPP_NO_RADIUS +.Pq Vt bool Set to build .Xr ppp 8 -without support for radius. -.It Va PPP_NOSUID +without support for RADIUS. +.It Va PPP_NO_SUID .Pq Vt bool Set to disable the installation of .Xr ppp 8 -as an suid root program. +as a set-user-ID root program. .It Va SENDMAIL_MC .Pq Vt str The default |