diff options
| author | ngie <ngie@FreeBSD.org> | 2017-07-19 20:49:04 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2017-07-19 20:49:04 +0000 |
| commit | 6dbfe7540258954707a5d2486baaf1bff43132ab (patch) | |
| tree | b5eb624bc1a10eb5f05db6949f824e2e6c6099c9 | |
| parent | dd563492d0b9ba3c2d40de575eab26550ccf1516 (diff) | |
| download | FreeBSD-src-6dbfe7540258954707a5d2486baaf1bff43132ab.zip FreeBSD-src-6dbfe7540258954707a5d2486baaf1bff43132ab.tar.gz | |
MFC r316818:
Conditionally install /etc/pam.d/ftp* and /etc/pam.d/telnetd
/etc/pam.d/ftp* should be installed with MK_FTP != no and
/etc/pam.d/telnetd should be installed when MK_TELNET != no.
| -rw-r--r-- | etc/pam.d/Makefile | 20 | ||||
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 3 |
2 files changed, 20 insertions, 3 deletions
diff --git a/etc/pam.d/Makefile b/etc/pam.d/Makefile index ebec3a7..51a2195 100644 --- a/etc/pam.d/Makefile +++ b/etc/pam.d/Makefile @@ -8,13 +8,11 @@ FILESGROUPS= FILES FILES= README \ cron \ - ftpd \ imap \ login \ other \ passwd pop3 \ sshd su system \ - telnetd \ xdm FILESDIR= /etc/pam.d @@ -28,6 +26,15 @@ ATDIR= ${FILESDIR} ATMODE= ${FILESMODE} .endif +.if ${MK_FTP} != "no" +FILESGROUPS+= FTP +FTP+= ftpd +FTPPACKAGE+= ftp +FTPDIR= ${FILESDIR} +FTPMODE= ${FILESMODE} +LINKS= ${FILESDIR}/ftpd ${FILESDIR}/ftp +.endif + .if ${MK_RCMDS} != "no" FILESGROUPS+= RCMDS RCMDS+= rsh @@ -36,7 +43,14 @@ RCMDSDIR= ${FILESDIR} RCMDSMODE= ${FILESMODE} .endif +.if ${MK_TELNET} != "no" +FILESGROUPS+= TELNET +TELNET+= telnetd +TELNETPACKAGE+= telnet +TELNETDIR= ${FILESDIR} +TELNETMODE= ${FILESMODE} +.endif + FILESMODE_README= 444 -LINKS= ${FILESDIR}/ftpd ${FILESDIR}/ftp .include <bsd.prog.mk> diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index a1e4887..c357e6a 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1607,6 +1607,8 @@ OLD_FILES+=usr/share/man/man8/fmtree.8.gz .if ${MK_FTP} == no OLD_FILES+=etc/ftpusers +OLD_FILES+=etc/pam.d/ftp +OLD_FILES+=etc/pam.d/ftpd OLD_FILES+=etc/rc.d/ftpd OLD_FILES+=usr/bin/ftp OLD_FILES+=usr/bin/gate-ftp @@ -7725,6 +7727,7 @@ OLD_FILES+=usr/share/nls/uk_UA.UTF-8/tcsh.cat .endif .if ${MK_TELNET} == no +OLD_FILES+=etc/pam.d/telnetd OLD_FILES+=usr/bin/telnet OLD_FILES+=usr/libexec/telnetd OLD_FILES+=usr/share/man/man1/telnet.1.gz |
