From 954e2a2724ac1cd31123f42bb751e6f59e59e72b Mon Sep 17 00:00:00 2001 From: millert Date: Fri, 2 Feb 2024 20:54:27 +0000 Subject: [PATCH] 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@ --- usr.sbin/smtpd/parse.y | 4 +--- 1 file changed, 1 insertion(+), 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 @@ -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, -- 2.20.1