From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Mon, 14 Nov 2022 21:27:33 +0000 (+0200)
Subject: lmtp: Fix restoring global log prefix after session is finished
X-Git-Tag: 2.4.0~3403
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22eb2ba41b50a95d9eb0bc9c194875ab3f07c03c;p=thirdparty%2Fdovecot%2Fcore.git

lmtp: Fix restoring global log prefix after session is finished

Broken by 069dfd657fd91a0e2a3a9307a0cf499d795f27f2

This change also slightly changes the lmtp log prefixes in some places.
It removes "conn $ip:$port [$idx]: rcpt $user:" from some of the log
messages (but that wasn't in all of the log messages anyway), but it now
always includes mail_log_prefix in these log messages, which previously
wasn't always set at that point yet.
---

diff --git a/src/lmtp/main.c b/src/lmtp/main.c
index ca3946ecfe..fb9ada8f06 100644
--- a/src/lmtp/main.c
+++ b/src/lmtp/main.c
@@ -126,7 +126,6 @@ int main(int argc, char *argv[])
 	enum mail_storage_service_flags storage_service_flags =
 		MAIL_STORAGE_SERVICE_FLAG_USERDB_LOOKUP |
 		MAIL_STORAGE_SERVICE_FLAG_TEMP_PRIV_DROP |
-		MAIL_STORAGE_SERVICE_FLAG_NO_LOG_INIT |
 		MAIL_STORAGE_SERVICE_FLAG_NO_IDLE_TIMEOUT;
 	const char *tmp_base_dir;
 	int c;