From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Mon, 2 Feb 2026 09:44:58 +0000 (+0200)
Subject: imap-login: Add comments to internal ID command parameter handling
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=277e5c880a7f6a7741e717036570812910fff7b7;p=thirdparty%2Fdovecot%2Fcore.git

imap-login: Add comments to internal ID command parameter handling
---

diff --git a/src/imap-login/imap-login-cmd-id.c b/src/imap-login/imap-login-cmd-id.c
index 1cd30bd1bc..e51e9c1e72 100644
--- a/src/imap-login/imap-login-cmd-id.c
+++ b/src/imap-login/imap-login-cmd-id.c
@@ -183,8 +183,13 @@ static bool cmd_id_handle_keyvalue(struct imap_client *client,
 		imap_id_param_handler_find(key);
 	bool is_login_id_param = handler != NULL;
 
-	if (is_login_id_param && client->common.connection_trusted &&
-	    !client->id_logged && value != NULL) {
+	if (!is_login_id_param) {
+		/* not an internal key */
+	} else if (client->id_logged) {
+		/* using ID multiple times - ignore */
+	} else if (value == NULL) {
+		/* there should have been a value - ignore */
+	} else if (client->common.connection_trusted) {
 		if (!handler->callback(client->cmd_id->params, key, value)) {
 			e_debug(client->common.event,
 				"Client sent invalid ID parameter '%s'", key);