changeset 21906:ce7c9d74e8a6

imap-login: Retain client ID only when enabled
author Aki Tuomi <aki.tuomi@dovecot.fi>
date Thu, 06 Apr 2017 19:49:07 +0300
parents 5a12e547e8da
children 5c65e7091077
files src/imap-login/imap-login-client.c
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/imap-login/imap-login-client.c	Wed Apr 05 14:23:47 2017 +0300
+++ b/src/imap-login/imap-login-client.c	Thu Apr 06 19:49:07 2017 +0300
@@ -217,7 +217,7 @@
 		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) {