From: Timo Sirainen <tss@iki.fi>
Date: Tue, 14 Oct 2014 23:57:13 +0000 (-0700)
Subject: imap-zlib: Removed check for disallowing COMPRESS to be used with TLS compression.
X-Git-Tag: 2.2.15~58
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=910a5167201f3f51a2875a8c905a9ad58db9ff51;p=thirdparty%2Fdovecot%2Fcore.git

imap-zlib: Removed check for disallowing COMPRESS to be used with TLS compression.
Clients shouldn't be doing this in any case, and this check doesn't work
properly with proxies.

We could solve the check properly for Dovecot proxies by having them send
the TLS compression state to backends, but it would still leave non-Dovecot
proxies broken. Although we could just not advertise COMPRESS=DEFLATE
extension if TLS compression is enabled and non-Dovecot proxies at least
wouldn't cause failures. Still, overall seems like a lot of work for such a
small and probably unnecessary extra check.
---

diff --git a/src/plugins/imap-zlib/imap-zlib-plugin.c b/src/plugins/imap-zlib/imap-zlib-plugin.c
index 48852ab9cb..631842b73d 100644
--- a/src/plugins/imap-zlib/imap-zlib-plugin.c
+++ b/src/plugins/imap-zlib/imap-zlib-plugin.c
@@ -87,11 +87,6 @@ static bool cmd_compress(struct client_command_context *cmd)
 			t_str_ucase(zclient->handler->name)));
 		return TRUE;
 	}
-	if (client->tls_compression) {
-		client_send_tagline(cmd,
-			"NO [COMPRESSIONACTIVE] TLS compression already enabled.");
-		return TRUE;
-	}
 
 	handler = compression_lookup_handler(t_str_lcase(mechanism));
 	if (handler == NULL || handler->create_istream == NULL) {