diff options
author | Enji Cooper <ngie@FreeBSD.org> | 2015-02-04 06:53:45 +0000 |
---|---|---|
committer | Enji Cooper <ngie@FreeBSD.org> | 2015-02-04 06:53:45 +0000 |
commit | 31a741f47311cb5a2f1d4ef2a2b9067a8dcb7cb6 (patch) | |
tree | 13a99d0de7b9fe7dc568cca539171da6aa1a82b0 | |
parent | 79fe80ef1084ced4d21aa303f1ad5f5db5b6b872 (diff) | |
download | src-test2-31a741f47311cb5a2f1d4ef2a2b9067a8dcb7cb6.tar.gz src-test2-31a741f47311cb5a2f1d4ef2a2b9067a8dcb7cb6.zip |
Conditionalize building radius support into libpam, ppp, etc via
MK_RADIUS_SUPPORT
MFC after: 1 week
Sponsored by: EMC / Isilon Storage Division
Notes
Notes:
svn path=/head/; revision=278182
-rw-r--r-- | Makefile.inc1 | 6 | ||||
-rw-r--r-- | lib/Makefile | 8 | ||||
-rw-r--r-- | lib/libpam/modules/modules.inc | 2 | ||||
-rw-r--r-- | share/mk/src.opts.mk | 1 | ||||
-rw-r--r-- | tools/build/options/WITHOUT_RADIUS_SUPPORT | 5 | ||||
-rw-r--r-- | usr.sbin/ppp/Makefile | 3 |
6 files changed, 22 insertions, 3 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 0d0aea476918..8ecd7a66e53a 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1634,7 +1634,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} \ ${_lib_libcapsicum} \ lib/ncurses/ncurses lib/ncurses/ncursesw \ lib/libopie lib/libpam ${_lib_libthr} \ - lib/libradius lib/libsbuf lib/libtacplus \ + ${_lib_libradius} lib/libsbuf lib/libtacplus \ lib/libgeom \ ${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \ ${_cddl_lib_libuutil} \ @@ -1657,6 +1657,10 @@ lib/libgeom__L: lib/libexpat__L _lib_libthr= lib/libthr .endif +.if ${MK_RADIUS_SUPPORT} != "no" +_lib_libradius= lib/libradius +.endif + .if ${MK_OFED} != "no" _ofed_lib= contrib/ofed/usr.lib/ .endif diff --git a/lib/Makefile b/lib/Makefile index 90e217ebc94e..cd0f4a13c14a 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -82,7 +82,7 @@ SUBDIR= ${SUBDIR_ORDERED} \ ${_libpmc} \ ${_libproc} \ libprocstat \ - libradius \ + ${_libradius} \ librpcsvc \ librt \ ${_librtld_db} \ @@ -142,7 +142,7 @@ SUBDIR_DEPEND_liblibrpcsec_gss= libgssapi SUBDIR_DEPEND_libmagic= libz SUBDIR_DEPEND_libmemstat= libkvm SUBDIR_DEPEND_libopie= libmd -SUBDIR_DEPEND_libpam= libcrypt libopie libradius librpcsvc libtacplus libutil ${_libypclnt} ${_libcom_err} +SUBDIR_DEPEND_libpam= libcrypt libopie ${_libradius} librpcsvc libtacplus libutil ${_libypclnt} ${_libcom_err} SUBDIR_DEPEND_libpjdlog= libutil SUBDIR_DEPEND_libprocstat= libkvm libutil SUBDIR_DEPEND_libradius= libmd @@ -286,6 +286,10 @@ _libmp= libmp _libpmc= libpmc .endif +.if ${MK_RADIUS_SUPPORT} != "no" +_libradius= libradius +.endif + .if ${MK_SENDMAIL} != "no" _libmilter= libmilter _libsm= libsm diff --git a/lib/libpam/modules/modules.inc b/lib/libpam/modules/modules.inc index 66fc63c89dc9..02debf7a4330 100644 --- a/lib/libpam/modules/modules.inc +++ b/lib/libpam/modules/modules.inc @@ -21,7 +21,9 @@ MODULES += pam_opie MODULES += pam_opieaccess MODULES += pam_passwdqc MODULES += pam_permit +.if ${MK_RADIUS_SUPPORT} != "no" MODULES += pam_radius +.endif MODULES += pam_rhosts MODULES += pam_rootok MODULES += pam_securetty diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 0609a9e7de07..a276475f98ad 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -135,6 +135,7 @@ __DEFAULT_YES_OPTIONS = \ PORTSNAP \ PPP \ QUOTAS \ + RADIUS_SUPPORT \ RCMDS \ RCS \ RESCUE \ diff --git a/tools/build/options/WITHOUT_RADIUS_SUPPORT b/tools/build/options/WITHOUT_RADIUS_SUPPORT new file mode 100644 index 000000000000..31f5aab012b7 --- /dev/null +++ b/tools/build/options/WITHOUT_RADIUS_SUPPORT @@ -0,0 +1,5 @@ +.\" $FreeBSD$ +Set to not build radius support into various applications, like +.Xr pam_radius 8 +and +.Xr ppp 8 . diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile index 30de68cc7f80..e0772af2e53e 100644 --- a/usr.sbin/ppp/Makefile +++ b/usr.sbin/ppp/Makefile @@ -31,6 +31,9 @@ PPP_NO_NETGRAPH= .if ${MK_PAM_SUPPORT} == "no" PPP_NO_PAM= .endif +.if ${MK_RADIUS_SUPPORT} == "no" +PPP_NO_RADIUS= +.endif .if defined(PPP_NO_SUID) BINMODE=554 |