diff options
| author |   gilles <gilles@openbsd.org> | 2018-12-02 11:34:21 +0000 |
|---|---|---|
| committer | gilles <gilles@openbsd.org> | 2018-12-02 11:34:21 +0000 |
| commit | 6279b358c93f9ab6044daa5f4cf88a129f2076be (patch) | |
| tree | 979b234a0f34e1b88ffac1a3af1b7ccaa6b0c7ad | |
| parent | Use strtonum(3) for -t seconds, improve errors on invalid number input (diff) | |
| download | wireguard-openbsd-6279b358c93f9ab6044daa5f4cf88a129f2076be.tar.xz wireguard-openbsd-6279b358c93f9ab6044daa5f4cf88a129f2076be.zip | |
err -> errx
diff from Lauri Tirkkonen <lotheac@iki.fi>
| -rw-r--r-- | usr.sbin/smtpd/mda_unpriv.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/smtpd/mda_unpriv.c b/usr.sbin/smtpd/mda_unpriv.c index 641034f7734..e519d4c26e5 100644 --- a/usr.sbin/smtpd/mda_unpriv.c +++ b/usr.sbin/smtpd/mda_unpriv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mda_unpriv.c,v 1.2 2018/06/04 15:57:46 gilles Exp $ */ +/* $OpenBSD: mda_unpriv.c,v 1.3 2018/12/02 11:34:21 gilles Exp $ */ /* * Copyright (c) 2018 Gilles Chehade <gilles@poolp.org> @@ -54,11 +54,11 @@ mda_unpriv(struct dispatcher *dsp, struct deliver *deliver, if (strlcpy(mda_exec, mda_command, sizeof (mda_exec)) >= sizeof (mda_exec)) - err(1, "mda command line too long"); + errx(1, "mda command line too long"); if (! mda_expand_format(mda_exec, sizeof mda_exec, deliver, &deliver->userinfo, NULL)) - err(1, "mda command line could not be expanded"); + errx(1, "mda command line could not be expanded"); mda_command = mda_exec; @@ -83,16 +83,16 @@ mda_unpriv(struct dispatcher *dsp, struct deliver *deliver, mda_command_wrap = dict_get(env->sc_mda_wrappers, dsp->u.local.mda_wrapper); if (mda_command_wrap == NULL) - err(1, "could not find wrapper %s", + errx(1, "could not find wrapper %s", dsp->u.local.mda_wrapper); if (strlcpy(mda_wrapper, mda_command_wrap, sizeof (mda_wrapper)) >= sizeof (mda_wrapper)) - err(1, "mda command line too long"); + errx(1, "mda command line too long"); if (! mda_expand_format(mda_wrapper, sizeof mda_wrapper, deliver, &deliver->userinfo, mda_command)) - err(1, "mda command line could not be expanded"); + errx(1, "mda command line could not be expanded"); mda_command = mda_wrapper; } execle("/bin/sh", "/bin/sh", "-c", mda_command, (char *)NULL, |