svn commit: r321245 - in stable/10: etc/pam.d tools/build/mk

[Ngie Cooper]

Author: ngie
Date: Wed Jul 19 20:44:50 2017
New Revision: 321245
URL: https://svnweb.freebsd.org/changeset/base/321245

Log:
  MFC r269550:
  r269550 (by peter):
  
  Check gethostname(2) return code - but even if it succeeds it may not
  null terminate.
  
  Temporarily use "From: $user@$hostname" rather than "From: $user".
  The latter exposes incompatible behavior if using dma(8).  sendmail(8)
  (and other alternatives) canonify either form on submission (even
  if masquerading), but dma will leak a non-compliant address to
  the internet.

Modified:
  stable/10/etc/pam.d/Makefile
  stable/10/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/pam.d/Makefile
==============================================================================
--- stable/10/etc/pam.d/Makefile	Wed Jul 19 20:29:07 2017	(r321244)
+++ stable/10/etc/pam.d/Makefile	Wed Jul 19 20:44:50 2017	(r321245)
@@ -1,23 +1,34 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 NO_OBJ=
 
 FILES=	README \
-	atrun \
 	cron \
-	ftpd \
 	imap \
 	login \
 	other \
 	passwd pop3 \
 	rsh \
 	sshd su system \
-	telnetd \
 	xdm
 
+.if ${MK_AT} != "no"
+FILES+=	atrun
+.endif
+
+.if ${MK_FTP} != "no"
+FILES+=	ftpd
+LINKS=	${FILESDIR}/ftpd ${FILESDIR}/ftp
+.endif
+
+.if ${MK_TELNET} != "no"
+FILES+=	telnetd
+.endif
+
 FILESDIR=	/etc/pam.d
 FILESMODE=	644
 FILESMODE_README=	444
-LINKS=	${FILESDIR}/ftpd ${FILESDIR}/ftp
 
 .include <bsd.prog.mk>

Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Wed Jul 19 20:29:07 2017	(r321244)
+++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Wed Jul 19 20:44:50 2017	(r321245)
@@ -89,6 +89,7 @@ OLD_FILES+=usr/share/man/man8/amd64/apmconf.8.gz
 .endif
 
 .if ${MK_AT} == no
+OLD_FILES+=etc/pam.d/atrun
 OLD_FILES+=usr/bin/at
 OLD_FILES+=usr/bin/atq
 OLD_FILES+=usr/bin/atrm
@@ -1063,6 +1064,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
@@ -4778,6 +4781,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