Date: Wed, 10 Jan 2018 09:06:08 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r327765 - in stable/11: etc/mail libexec/dma/dmagent share/man/man5 usr.bin/mail Message-ID: <201801100906.w0A968CB006853@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: delphij Date: Wed Jan 10 09:06:07 2018 New Revision: 327765 URL: https://svnweb.freebsd.org/changeset/base/327765 Log: MFC r327236: Replace send-mail with the more standarized sendmail, we do not create links for send-mail in mailwrapper so it did not work anyway. Modified: stable/11/etc/mail/mailer.conf stable/11/libexec/dma/dmagent/mailer.conf stable/11/share/man/man5/mailer.conf.5 stable/11/usr.bin/mail/names.c Directory Properties: stable/11/ (props changed) Modified: stable/11/etc/mail/mailer.conf ============================================================================== --- stable/11/etc/mail/mailer.conf Wed Jan 10 08:10:18 2018 (r327764) +++ stable/11/etc/mail/mailer.conf Wed Jan 10 09:06:07 2018 (r327765) @@ -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: stable/11/libexec/dma/dmagent/mailer.conf ============================================================================== --- stable/11/libexec/dma/dmagent/mailer.conf Wed Jan 10 08:10:18 2018 (r327764) +++ stable/11/libexec/dma/dmagent/mailer.conf Wed Jan 10 09:06:07 2018 (r327765) @@ -1,5 +1,4 @@ # $FreeBSD$ sendmail /usr/libexec/dma -send-mail /usr/libexec/dma mailq /usr/libexec/dma Modified: stable/11/share/man/man5/mailer.conf.5 ============================================================================== --- stable/11/share/man/man5/mailer.conf.5 Wed Jan 10 08:10:18 2018 (r327764) +++ stable/11/share/man/man5/mailer.conf.5 Wed Jan 10 09:06:07 2018 (r327765) @@ -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: stable/11/usr.bin/mail/names.c ============================================================================== --- stable/11/usr.bin/mail/names.c Wed Jan 10 08:10:18 2018 (r327764) +++ stable/11/usr.bin/mail/names.c Wed Jan 10 09:06:07 2018 (r327765) @@ -573,7 +573,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";
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801100906.w0A968CB006853>