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@

diff --git a/usr.sbin/smtpd/parse.y b/usr.sbin/smtpd/parse.y
index a8744c0..2d7e8be 100644 (file)
--- 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,