From owner-svn-src-head@freebsd.org Wed Dec 27 06:23:52 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 51103EA65F4; Wed, 27 Dec 2017 06:23:52 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 287E279AE3; Wed, 27 Dec 2017 06:23:52 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBR6Npf4032994; Wed, 27 Dec 2017 06:23:51 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBR6NoRX032990; Wed, 27 Dec 2017 06:23:50 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201712270623.vBR6NoRX032990@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Wed, 27 Dec 2017 06:23:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r327236 - in head: etc/mail libexec/dma/dmagent share/man/man5 usr.bin/mail X-SVN-Group: head X-SVN-Commit-Author: delphij X-SVN-Commit-Paths: in head: etc/mail libexec/dma/dmagent share/man/man5 usr.bin/mail X-SVN-Commit-Revision: 327236 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Dec 2017 06:23:52 -0000 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";