From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Mon, 4 Oct 2021 00:58:15 +0000 (+0200)
Subject: lmtp: lmtp-proxy - Use the per-recipient session ID for the "Saved" message.
X-Git-Tag: 2.3.18~237
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=53b018722bf8e8a8ceb782e97071e9ff62a3b423;p=thirdparty%2Fdovecot%2Fcore.git

lmtp: lmtp-proxy - Use the per-recipient session ID for the "Saved" message.
---

diff --git a/src/lmtp/lmtp-proxy.c b/src/lmtp/lmtp-proxy.c
index 48e399f4d4..4a384dd92a 100644
--- a/src/lmtp/lmtp-proxy.c
+++ b/src/lmtp/lmtp-proxy.c
@@ -718,7 +718,8 @@ lmtp_proxy_data_cb(const struct smtp_reply *proxy_reply,
 		   struct lmtp_proxy_recipient *lprcpt)
 {
 	struct lmtp_proxy_connection *conn = lprcpt->conn;
-	struct smtp_server_recipient *rcpt = lprcpt->rcpt->rcpt;
+	struct lmtp_recipient *lrcpt = lprcpt->rcpt;
+	struct smtp_server_recipient *rcpt = lrcpt->rcpt;
 	struct lmtp_proxy *proxy = conn->proxy;
 	struct smtp_server_transaction *trans = proxy->trans;
 	struct smtp_address *address = lprcpt->address;
@@ -748,7 +749,7 @@ lmtp_proxy_data_cb(const struct smtp_reply *proxy_reply,
 		e_info(rcpt->event, "%s", str_c(msg));
 
 		/* Substitute our own success message */
-		smtp_reply_printf(&reply, 250, "%s Saved", trans->id);
+		smtp_reply_printf(&reply, 250, "%s Saved", lrcpt->session_id);
 		/* Do let the enhanced code through */
 		if (!smtp_reply_has_enhanced_code(proxy_reply))
 			reply.enhanced_code = SMTP_REPLY_ENH_CODE(2, 0, 0);