system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-16 06:52:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Conditionally install /etc/pam.d/ftp* and /etc/pam.d/telnetd

Browse source 
/etc/pam.d/ftp* should be installed with MK_FTP != no and
/etc/pam.d/telnetd should be installed when MK_TELNET != no.

MFC after:	7 weeks
Sponsored by:	Dell EMC Isilon
This commit is contained in:
Enji Cooper 2017-04-14 06:42:46 +00:00
parent 269960e4b7
commit 2f4a73322e
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=316818
2 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
etc/pam.d/Makefile
View file

@ -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>

3
tools/build/mk/OptionalObsoleteFiles.inc
View file

@ -1613,6 +1613,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
@ -8037,6 +8039,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