From b622c1ef49761d32b7bf9d22a1692d1108cb9754 Mon Sep 17 00:00:00 2001
From: ngie <ngie@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Wed, 19 Jul 2017 20:44:50 +0000
Subject: [PATCH] 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.


git-svn-id: svn://svn.freebsd.org/base/stable/10@321245 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 etc/pam.d/Makefile                       | 19 +++++++++++++++----
 tools/build/mk/OptionalObsoleteFiles.inc |  4 ++++
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/etc/pam.d/Makefile b/etc/pam.d/Makefile
index 7369022cc..b65e87654 100644
--- a/etc/pam.d/Makefile
+++ b/etc/pam.d/Makefile
@@ -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>
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index d1ff6eee3..c8bee6859 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -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
-- 
2.42.0