From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Wed, 13 Nov 2019 21:58:13 +0000 (+0100)
Subject: lmtp: lmtp-commands - Simplify lmtp_local_add_headers().
X-Git-Tag: 2.3.9~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fe64b2db991acad25e801e1c1e8b3451a22f89b6;p=thirdparty%2Fdovecot%2Fcore.git

lmtp: lmtp-commands - Simplify lmtp_local_add_headers().
---

diff --git a/src/lmtp/lmtp-local.c b/src/lmtp/lmtp-local.c
index 1bd161835a..e26a9f7810 100644
--- a/src/lmtp/lmtp-local.c
+++ b/src/lmtp/lmtp-local.c
@@ -383,11 +383,11 @@ void lmtp_local_add_headers(struct lmtp_local *local,
 			    struct smtp_server_transaction *trans,
 			    string_t *headers)
 {
+	struct client *client = local->client;
+	const struct lmtp_settings *lmtp_set = client->lmtp_set;
 	struct lmtp_local_recipient *const *llrcpts;
-	const struct lmtp_settings *lmtp_set;
 	const struct smtp_address *rcpt_to = NULL;
 	unsigned int count;
-	void **sets;
 
 	str_printfa(headers, "Return-Path: <%s>\r\n",
 		    smtp_address_encode(trans->mail_from));
@@ -396,9 +396,6 @@ void lmtp_local_add_headers(struct lmtp_local *local,
 	if (count == 1) {
 		struct smtp_server_recipient *rcpt = llrcpts[0]->rcpt->rcpt;
 
-		sets = mail_storage_service_user_get_set(llrcpts[0]->service_user);
-		lmtp_set = sets[3];
-
 		switch (lmtp_set->parsed_lmtp_hdr_delivery_address) {
 		case LMTP_HDR_DELIVERY_ADDRESS_NONE:
 			break;