Author: delphij
Date: Wed Dec 27 06:23:50 2017
New Revision: 327236
URL: https://svnweb.freebsd.org/changeset/base/327236
Log:
Replace send-mail with the more standarized sendmail, we do not create
links for send-mail in mailwrapper so it did not work anyway.
MFC after: 2 weeks
Modified:
head/etc/mail/mailer.conf
head/libexec/dma/dmagent/mailer.conf
head/share/man/man5/mailer.conf.5
head/usr.bin/mail/names.c
Modified: head/etc/mail/mailer.conf
==============================================================================
--- head/etc/mail/mailer.conf Wed Dec 27 05:59:47 2017 (r327235)
+++ head/etc/mail/mailer.conf Wed Dec 27 06:23:50 2017 (r327236)
@@ -3,7 +3,6 @@
# Execute the "real" sendmail program, named /usr/libexec/sendmail/sendmail
#
sendmail /usr/libexec/sendmail/sendmail
-send-mail /usr/libexec/sendmail/sendmail
mailq /usr/libexec/sendmail/sendmail
newaliases /usr/libexec/sendmail/sendmail
hoststat /usr/libexec/sendmail/sendmail
Modified: head/libexec/dma/dmagent/mailer.conf
==============================================================================
--- head/libexec/dma/dmagent/mailer.conf Wed Dec 27 05:59:47 2017
(r327235)
+++ head/libexec/dma/dmagent/mailer.conf Wed Dec 27 06:23:50 2017
(r327236)
@@ -1,5 +1,4 @@
# $FreeBSD$
sendmail /usr/libexec/dma
-send-mail /usr/libexec/dma
mailq /usr/libexec/dma
Modified: head/share/man/man5/mailer.conf.5
==============================================================================
--- head/share/man/man5/mailer.conf.5 Wed Dec 27 05:59:47 2017
(r327235)
+++ head/share/man/man5/mailer.conf.5 Wed Dec 27 06:23:50 2017
(r327236)
@@ -31,7 +31,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd February 18, 2016
+.Dd December 26, 2017
.Dt MAILER.CONF 5
.Os
.Sh NAME
@@ -96,7 +96,6 @@ program:
# Execute the "real" sendmail program located in
# /usr/libexec/sendmail/sendmail
sendmail /usr/libexec/sendmail/sendmail
-send-mail /usr/libexec/sendmail/sendmail
mailq /usr/libexec/sendmail/sendmail
newaliases /usr/libexec/sendmail/sendmail
.Ed
@@ -109,7 +108,6 @@ to replace
.Bd -literal -offset indent
# Emulate sendmail using postfix
sendmail /usr/local/sbin/sendmail
-send-mail /usr/local/sbin/sendmail
mailq /usr/local/sbin/sendmail
newaliases /usr/local/sbin/sendmail
.Ed
@@ -122,7 +120,6 @@ to replace
.Bd -literal -offset indent
# Emulate sendmail using exim
sendmail /usr/local/sbin/exim
-send-mail /usr/local/sbin/exim
mailq /usr/local/sbin/exim -bp
newaliases /usr/bin/true
rmail /usr/local/sbin/exim -i -oee
@@ -136,7 +133,6 @@ to replace
.Bd -literal -offset indent
# Send outgoing mail to a smart relay using mini_sendmail
sendmail /usr/local/bin/mini_sendmail -srelayhost
-send-mail /usr/local/bin/mini_sendmail -srelayhost
.Ed
.Pp
Using
@@ -146,7 +142,6 @@ to replace
.Bd -literal -offset indent
# Execute dma instead of sendmail
sendmail /usr/libexec/dma
-send-mail /usr/libexec/dma
mailq /usr/libexec/dma
newaliases /usr/libexec/dma
rmail /usr/libexec/dma
Modified: head/usr.bin/mail/names.c
==============================================================================
--- head/usr.bin/mail/names.c Wed Dec 27 05:59:47 2017 (r327235)
+++ head/usr.bin/mail/names.c Wed Dec 27 06:23:50 2017 (r327236)
@@ -575,7 +575,7 @@ unpack(struct name *np)
extra++;
top = (char **)salloc((t + extra) * sizeof(*top));
ap = top;
- *ap++ = "send-mail";
+ *ap++ = "sendmail";
*ap++ = "-i";
if (metoo)
*ap++ = "-m";
_______________________________________________
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"
