From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Tue, 1 Feb 2022 13:35:05 +0000 (+0100)
Subject: lib-smtp: server-transaction - Simplify/clarify transaction ID
X-Git-Tag: 2.3.19~90
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=edf91ac779bd21ae4cbf64b44c3d5efa6fad761c;p=thirdparty%2Fdovecot%2Fcore.git

lib-smtp: server-transaction - Simplify/clarify transaction ID

The transaction ID is the session ID followed by an increasing transaction
count (number of MAIL commands) in the SMTP server connection. Clarify
this by adding 'T' letter before the counter. Also don't add the counter
suffix at all for the first session, since most sessions only have a
single transaction.
---

diff --git a/src/lib-smtp/smtp-server-transaction.c b/src/lib-smtp/smtp-server-transaction.c
index 29bac5375f..7d9b8394c8 100644
--- a/src/lib-smtp/smtp-server-transaction.c
+++ b/src/lib-smtp/smtp-server-transaction.c
@@ -40,9 +40,12 @@ smtp_server_transaction_create(struct smtp_server_connection *conn,
 	trans->conn = conn;
 
 	/* generate transaction ID */
-	conn->transaction_seq++;
-	trans->id = p_strdup_printf(pool, "%s:%u", conn->session_id,
-				    conn->transaction_seq);
+	if (conn->transaction_seq++ == 0)
+		trans->id = conn->session_id;
+	else {
+		trans->id = p_strdup_printf(pool, "%s:T%u", conn->session_id,
+					    conn->transaction_seq);
+	}
 
 	trans->flags = mail_data->flags;
 	trans->mail_from = smtp_address_clone(trans->pool, mail_data->path);