diff options
| author | ngie <ngie@FreeBSD.org> | 2017-07-19 20:44:50 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2017-07-19 20:44:50 +0000 |
| commit | d33c387645a6c73f935bca119c75d1fea6ee0b2c (patch) | |
| tree | 53d830369bfcae52eb2adb8818049252b303b4b1 | |
| parent | 9a8d16d28a66fb41f8cca956e48e8bce04968610 (diff) | |
| download | FreeBSD-src-d33c387645a6c73f935bca119c75d1fea6ee0b2c.zip FreeBSD-src-d33c387645a6c73f935bca119c75d1fea6ee0b2c.tar.gz | |
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.
| -rw-r--r-- | etc/pam.d/Makefile | 19 | ||||
| -rw-r--r-- | 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 7369022..b65e876 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 d1ff6ee..c8bee68 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 |
