From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Thu, 6 Apr 2017 16:49:07 +0000 (+0300)
Subject: imap-login: Retain client ID only when enabled
X-Git-Tag: 2.2.29.rc1~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8fe07ec17301cadabd64cad79d1e9883956362a5;p=thirdparty%2Fdovecot%2Fcore.git

imap-login: Retain client ID only when enabled
---

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) {