From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Thu, 12 Jan 2023 22:13:29 +0000 (+0200)
Subject: lib-lda: Get hostname via mail_user_settings
X-Git-Tag: 2.4.0~2293
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9510011ea49e8a7831cedcd9ef9b9074bcc6e254;p=thirdparty%2Fdovecot%2Fcore.git

lib-lda: Get hostname via mail_user_settings

It's the same value as via mail_storage_settings, but easier to get.
---

diff --git a/src/lib-lda/mail-deliver.c b/src/lib-lda/mail-deliver.c
index e0f69da216..346c770029 100644
--- a/src/lib-lda/mail-deliver.c
+++ b/src/lib-lda/mail-deliver.c
@@ -506,13 +506,11 @@ const char *mail_deliver_get_new_message_id(struct mail_deliver_context *ctx)
 {
 	static int count = 0;
 	struct mail_user *user = ctx->rcpt_user;
-	const struct mail_storage_settings *mail_set =
-		mail_user_set_get_storage_set(user);
 
 	return t_strdup_printf("<dovecot-%s-%s-%d@%s>",
 			       dec2str(ioloop_timeval.tv_sec),
 			       dec2str(ioloop_timeval.tv_usec),
-			       count++, mail_set->hostname);
+			       count++, user->set->hostname);
 }
 
 static bool mail_deliver_is_tempfailed(struct mail_deliver_context *ctx,