From 8fe07ec17301cadabd64cad79d1e9883956362a5 Mon Sep 17 00:00:00 2001 From: Aki Tuomi Date: Thu, 6 Apr 2017 19:49:07 +0300 Subject: [PATCH] imap-login: Retain client ID only when enabled --- src/imap-login/imap-login-client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/imap-login/imap-login-client.c b/src/imap-login/imap-login-client.c index ab76459494..fd0a4eb2a8 100644 --- a/src/imap-login/imap-login-client.c +++ b/src/imap-login/imap-login-client.c @@ -217,7 +217,7 @@ static void cmd_id_handle_keyvalue(struct imap_client *client, client_id_str = !client_id_reserved_word(key); } - if (client_id_str && + if (client->set->imap_id_retain && client_id_str && (client->common.client_id == NULL || str_len(client->common.client_id) + kvlen < LOGIN_MAX_CLIENT_ID_LEN)) { if (client->common.client_id == NULL) { -- 2.47.3