d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace send-mail with the more standarized sendmail, we do not create

Browse Source 
links for send-mail in mailwrapper so it did not work anyway.

MFC after:	2 weeks
This commit is contained in:
delphij 2017-12-27 06:23:50 +00:00
parent 4999d25b1f
commit 32a7549145
4 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etc/mail/mailer.conf
View File

@ -3,7 +3,6 @@
# Execute the "real" sendmail program, named /usr/libexec/sendmail/sendmail # Execute the "real" sendmail program, named /usr/libexec/sendmail/sendmail
# #
sendmail /usr/libexec/sendmail/sendmail sendmail /usr/libexec/sendmail/sendmail
send-mail /usr/libexec/sendmail/sendmail
mailq /usr/libexec/sendmail/sendmail mailq /usr/libexec/sendmail/sendmail
newaliases /usr/libexec/sendmail/sendmail newaliases /usr/libexec/sendmail/sendmail
hoststat /usr/libexec/sendmail/sendmail hoststat /usr/libexec/sendmail/sendmail

1
libexec/dma/dmagent/mailer.conf
View File

@ -1,5 +1,4 @@
# $FreeBSD$ # $FreeBSD$
sendmail /usr/libexec/dma sendmail /usr/libexec/dma
send-mail /usr/libexec/dma
mailq /usr/libexec/dma mailq /usr/libexec/dma

7
share/man/man5/mailer.conf.5
View File

@ -31,7 +31,7 @@
.\" .\"
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.Dd February 18, 2016 .Dd December 26, 2017
.Dt MAILER.CONF 5 .Dt MAILER.CONF 5
.Os .Os
.Sh NAME .Sh NAME
@ -96,7 +96,6 @@ program:
# Execute the "real" sendmail program located in # Execute the "real" sendmail program located in
# /usr/libexec/sendmail/sendmail # /usr/libexec/sendmail/sendmail
sendmail /usr/libexec/sendmail/sendmail sendmail /usr/libexec/sendmail/sendmail
send-mail /usr/libexec/sendmail/sendmail
mailq /usr/libexec/sendmail/sendmail mailq /usr/libexec/sendmail/sendmail
newaliases /usr/libexec/sendmail/sendmail newaliases /usr/libexec/sendmail/sendmail
.Ed .Ed
@ -109,7 +108,6 @@ to replace
.Bd -literal -offset indent .Bd -literal -offset indent
# Emulate sendmail using postfix # Emulate sendmail using postfix
sendmail /usr/local/sbin/sendmail sendmail /usr/local/sbin/sendmail
send-mail /usr/local/sbin/sendmail
mailq /usr/local/sbin/sendmail mailq /usr/local/sbin/sendmail
newaliases /usr/local/sbin/sendmail newaliases /usr/local/sbin/sendmail
.Ed .Ed
@ -122,7 +120,6 @@ to replace
.Bd -literal -offset indent .Bd -literal -offset indent
# Emulate sendmail using exim # Emulate sendmail using exim
sendmail /usr/local/sbin/exim sendmail /usr/local/sbin/exim
send-mail /usr/local/sbin/exim
mailq /usr/local/sbin/exim -bp mailq /usr/local/sbin/exim -bp
newaliases /usr/bin/true newaliases /usr/bin/true
rmail /usr/local/sbin/exim -i -oee rmail /usr/local/sbin/exim -i -oee
@ -136,7 +133,6 @@ to replace
.Bd -literal -offset indent .Bd -literal -offset indent
# Send outgoing mail to a smart relay using mini_sendmail # Send outgoing mail to a smart relay using mini_sendmail
sendmail /usr/local/bin/mini_sendmail -srelayhost sendmail /usr/local/bin/mini_sendmail -srelayhost
send-mail /usr/local/bin/mini_sendmail -srelayhost
.Ed .Ed
.Pp .Pp
Using Using
@ -146,7 +142,6 @@ to replace
.Bd -literal -offset indent .Bd -literal -offset indent
# Execute dma instead of sendmail # Execute dma instead of sendmail
sendmail /usr/libexec/dma sendmail /usr/libexec/dma
send-mail /usr/libexec/dma
mailq /usr/libexec/dma mailq /usr/libexec/dma
newaliases /usr/libexec/dma newaliases /usr/libexec/dma
rmail /usr/libexec/dma rmail /usr/libexec/dma

2
usr.bin/mail/names.c
View File

@ -575,7 +575,7 @@ unpack(struct name *np)
extra++; extra++;
top = (char **)salloc((t + extra) * sizeof(*top)); top = (char **)salloc((t + extra) * sizeof(*top));
ap = top; ap = top;
*ap++ = "send-mail"; *ap++ = "sendmail";
*ap++ = "-i"; *ap++ = "-i";
if (metoo) if (metoo)
*ap++ = "-m"; *ap++ = "-m";