From 75fc53af618b853dea52fcb8a333b0158c22bd04 Mon Sep 17 00:00:00 2001 From: gilles Date: Sat, 1 Sep 2018 21:20:32 +0000 Subject: [PATCH] properly deal with MAILER-DAEMON sender in LMTP reported and fix tested by Mark Kane --- usr.sbin/smtpd/parse.y | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/smtpd/parse.y b/usr.sbin/smtpd/parse.y index 48961f88088..914bf2ce430 100644 --- a/usr.sbin/smtpd/parse.y +++ b/usr.sbin/smtpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.218 2018/08/25 19:05:23 gilles Exp $ */ +/* $OpenBSD: parse.y,v 1.219 2018/09/01 21:20:32 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade @@ -611,11 +611,11 @@ MBOX { } dispatcher_local_options | LMTP STRING { asprintf(&dispatcher->u.local.command, - "/usr/libexec/mail.lmtp -f \"%%{sender}\" -d %s %%{user.username}", $2); + "/usr/libexec/mail.lmtp -f %%{mbox.from} -d %s %%{user.username}", $2); } dispatcher_local_options | LMTP STRING RCPT_TO { asprintf(&dispatcher->u.local.command, - "/usr/libexec/mail.lmtp -f \"%%{sender}\" -d %s %%{dest}", $2); + "/usr/libexec/mail.lmtp -f %%{mbox.from} -d %s %%{dest}", $2); } dispatcher_local_options | MDA STRING { asprintf(&dispatcher->u.local.command, -- 2.20.1