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

Gbp-Pq: Name 0001-imap-login-Add-comments-to-internal-ID-command-param.patch

diff --git a/src/imap-login/imap-login-cmd-id.c b/src/imap-login/imap-login-cmd-id.c
index 2f0328240274e079d0ac8c4f4057f8cdc0447f79..be12744e0834d251a815de12b4c1102ec94f61ee 100644 (file)
--- 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);