From a9a7c8c0a19b8d94267e654d04d8cd4481e442b1 Mon Sep 17 00:00:00 2001 From: Xin LI Date: Wed, 27 Dec 2017 06:23:50 +0000 Subject: [PATCH] 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 --- etc/mail/mailer.conf | 1 - libexec/dma/dmagent/mailer.conf | 1 - share/man/man5/mailer.conf.5 | 7 +------ usr.bin/mail/names.c | 2 +- 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/etc/mail/mailer.conf b/etc/mail/mailer.conf index 3fa69223046c..3f4bd392639b 100644 --- a/etc/mail/mailer.conf +++ b/etc/mail/mailer.conf @@ -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 diff --git a/libexec/dma/dmagent/mailer.conf b/libexec/dma/dmagent/mailer.conf index 53f42c251ce6..20ebf5cb673e 100644 --- a/libexec/dma/dmagent/mailer.conf +++ b/libexec/dma/dmagent/mailer.conf @@ -1,5 +1,4 @@ # $FreeBSD$ sendmail /usr/libexec/dma -send-mail /usr/libexec/dma mailq /usr/libexec/dma diff --git a/share/man/man5/mailer.conf.5 b/share/man/man5/mailer.conf.5 index 476bb77d759c..c57dab0e067c 100644 --- a/share/man/man5/mailer.conf.5 +++ b/share/man/man5/mailer.conf.5 @@ -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 diff --git a/usr.bin/mail/names.c b/usr.bin/mail/names.c index b6cde21ce9d6..9e08b0870c50 100644 --- a/usr.bin/mail/names.c +++ b/usr.bin/mail/names.c @@ -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";