Author: ngie
Date: Fri Apr 14 06:42:46 2017
New Revision: 316818
URL: https://svnweb.freebsd.org/changeset/base/316818
Log:
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.
MFC after: 7 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/etc/pam.d/Makefile
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/etc/pam.d/Makefile
==============================================================================
--- head/etc/pam.d/Makefile Fri Apr 14 06:33:15 2017 (r316817)
+++ head/etc/pam.d/Makefile Fri Apr 14 06:42:46 2017 (r316818)
@@ -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>
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc Fri Apr 14 06:33:15
2017 (r316817)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Fri Apr 14 06:42:46
2017 (r316818)
@@ -1613,6 +1613,8 @@ OLD_FILES+=usr/share/man/man8/fmtree.8.g
.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/tcs
.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
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
