From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Mon, 12 Mar 2018 02:12:44 +0000 (+0100)
Subject: lmtp: local: Do not use array_idx() to obtain transaction recipient from lib-smtp.
X-Git-Tag: 2.3.5~137
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a2abf87cd48ee7251bbdd5ba503ab5d0a0087985;p=thirdparty%2Fdovecot%2Fcore.git

lmtp: local: Do not use array_idx() to obtain transaction recipient from lib-smtp.

It is already available in struct lmtp_recipient. Also, this call was very ugly.
---

diff --git a/src/lmtp/lmtp-local.c b/src/lmtp/lmtp-local.c
index 37bf42e5ad..22dec11f63 100644
--- a/src/lmtp/lmtp-local.c
+++ b/src/lmtp/lmtp-local.c
@@ -468,10 +468,9 @@ lmtp_local_deliver(struct lmtp_local *local,
 		   struct mail_deliver_session *session)
 {
 	struct client *client = local->client;
-	struct smtp_address *rcpt_to = rcpt->rcpt.rcpt->path;
+	struct smtp_server_recipient *trcpt = rcpt->rcpt.rcpt;
+	struct smtp_address *rcpt_to = trcpt->path;
 	unsigned int rcpt_idx = rcpt->rcpt.index;
-	const struct smtp_server_recipient *trcpt =
-		*array_idx(&trans->rcpt_to, rcpt_idx);
 	struct mail_storage_service_user *service_user = rcpt->service_user;
 	struct mail_deliver_context dctx;
 	struct mail_user *rcpt_user;