diff options
| author |   gilles <gilles@openbsd.org> | 2020-02-01 12:54:38 +0000 |
|---|---|---|
| committer | gilles <gilles@openbsd.org> | 2020-02-01 12:54:38 +0000 |
| commit | fea078e1595ad08f6d149b2f2291e1017bb6e7b6 (patch) | |
| tree | 9c76c05291cc138da9e497904310203b25b67b15 /usr.sbin/smtpd | |
| parent | Tweak regress to match change made to tls13_key_share_peer_public(). (diff) | |
| download | wireguard-openbsd-fea078e1595ad08f6d149b2f2291e1017bb6e7b6.tar.xz wireguard-openbsd-fea078e1595ad08f6d149b2f2291e1017bb6e7b6.zip | |
condition to enter mda_mbox() is too strict, if user have commands in their
forward file they're not supposed to enter that code path.
Diffstat (limited to 'usr.sbin/smtpd')
| -rw-r--r-- | usr.sbin/smtpd/smtpd.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.sbin/smtpd/smtpd.c b/usr.sbin/smtpd/smtpd.c index 98b734222db..5341b6c6649 100644 --- a/usr.sbin/smtpd/smtpd.c +++ b/usr.sbin/smtpd/smtpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.c,v 1.329 2020/01/31 22:01:20 gilles Exp $ */ +/* $OpenBSD: smtpd.c,v 1.330 2020/02/01 12:54:38 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org> @@ -1534,7 +1534,9 @@ forkmda(struct mproc *p, uint64_t id, struct deliver *deliver) /* avoid hangs by setting 5m timeout */ alarm(300); - if (dsp->u.local.is_mbox && dsp->u.local.mda_wrapper == NULL) + if (dsp->u.local.is_mbox && + dsp->u.local.mda_wrapper == NULL && + deliver->mda_exec[0] == '\0') mda_mbox(deliver); else mda_unpriv(dsp, deliver, pw_name, pw_dir); |