summaryrefslogtreecommitdiff
path: root/usr.sbin/smtpd
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2024-02-02 20:54:28 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2024-02-02 20:54:28 +0000
commit403831088ccc61e997648aa9f566017935e1e814 (patch)
tree9fae131d0378db89d2966e7fc15646634769a3bc /usr.sbin/smtpd
parent13d38bcf063d0dc2ed5e4d111815e1ac391d5aa8 (diff)
Run lmtp deliveries as the recipient user, not SMTPD_USER (_smtpd).
This is a backout of revision 1.278. Delivery via lmtp is not limited to running mail.lmtp, it may also be modified by a user's .forward file (if any). OK gilles@
Diffstat (limited to 'usr.sbin/smtpd')
-rw-r--r--usr.sbin/smtpd/parse.y4
1 files changed, 1 insertions, 3 deletions
diff --git a/usr.sbin/smtpd/parse.y b/usr.sbin/smtpd/parse.y
index a8744c05ae7..2d7e8be1cb0 100644
--- a/usr.sbin/smtpd/parse.y
+++ b/usr.sbin/smtpd/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.296 2023/12/03 11:52:16 op Exp $ */
+/* $OpenBSD: parse.y,v 1.297 2024/02/02 20:54:27 millert Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -697,12 +697,10 @@ MBOX {
| LMTP STRING {
asprintf(&dsp->u.local.command,
"/usr/libexec/mail.lmtp -d %s -u", $2);
- dsp->u.local.user = SMTPD_USER;
} dispatcher_local_options
| LMTP STRING RCPT_TO {
asprintf(&dsp->u.local.command,
"/usr/libexec/mail.lmtp -d %s -r", $2);
- dsp->u.local.user = SMTPD_USER;
} dispatcher_local_options
| MDA STRING {
asprintf(&dsp->u.local.command,