Have you verified there are *no other programs* in the entire greater ecosystem
using that name?
> On Tue, Mar 19 2019 07:26:41 -0600, Todd C. Miller wrote:
> > On Tue, 19 Mar 2019 10:33:07 +0200, Lauri Tirkkonen wrote:
> >
> > > ping - doesn't look removed yet :)
> >
> > Committed.
>
> thanks. that means no need for smtpctl and mailer.conf to check for it
> any more.
>
> diff --git a/etc/mailer.conf b/etc/mailer.conf
> index fff9e7adbd1..9c752022261 100644
> --- a/etc/mailer.conf
> +++ b/etc/mailer.conf
> @@ -3,7 +3,6 @@
> # Execute the "real" sendmail program, which is now smtpd by default
> #
> sendmail /usr/sbin/smtpctl
> -send-mail /usr/sbin/smtpctl
> mailq /usr/sbin/smtpctl
> makemap /usr/sbin/smtpctl
> newaliases /usr/sbin/smtpctl
> diff --git a/usr.sbin/mailwrapper/mailer.conf.5
> b/usr.sbin/mailwrapper/mailer.conf.5
> index 288ff4f4c2e..2c303dedbdc 100644
> --- a/usr.sbin/mailwrapper/mailer.conf.5
> +++ b/usr.sbin/mailwrapper/mailer.conf.5
> @@ -67,7 +67,6 @@ MTA suite:
> .Bd -literal
> # Emulate sendmail using smtpd
> sendmail /usr/sbin/smtpctl
> -send-mail /usr/sbin/smtpctl
> mailq /usr/sbin/smtpctl
> makemap /usr/sbin/smtpctl
> newaliases /usr/sbin/smtpctl
> @@ -80,7 +79,6 @@ MTA suite in place of
> .Bd -literal
> # Execute the "real" sendmail program
> sendmail /usr/local/libexec/sendmail/sendmail
> -send-mail /usr/local/libexec/sendmail/sendmail
> mailq /usr/local/libexec/sendmail/sendmail
> makemap /usr/local/libexec/sendmail/makemap
> newaliases /usr/local/libexec/sendmail/sendmail
> diff --git a/usr.sbin/smtpd/smtpctl.c b/usr.sbin/smtpd/smtpctl.c
> index 4b44d9dd30a..9ebef45f159 100644
> --- a/usr.sbin/smtpd/smtpctl.c
> +++ b/usr.sbin/smtpd/smtpctl.c
> @@ -1116,8 +1116,7 @@ sendmail_compat(int argc, char **argv)
> gid_t gid;
> int i, r;
>
> - if (strcmp(__progname, "sendmail") == 0 ||
> - strcmp(__progname, "send-mail") == 0) {
> + if (strcmp(__progname, "sendmail") == 0) {
> /*
> * determine whether we are called with flags
> * that should invoke makemap/newaliases.
>
> --
> Lauri Tirkkonen | lotheac @ IRCnet
>
