From: Timo Sirainen <tss@iki.fi>
Date: Sat, 21 Jun 2008 14:45:08 +0000 (+0300)
Subject: Don't drop automatic post-login CAPABILITY reply if client sent CAPABILITY
X-Git-Tag: 1.2.alpha1~219
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=df8e72695103078a8acdad117198fd27be00508a;p=thirdparty%2Fdovecot%2Fcore.git

Don't drop automatic post-login CAPABILITY reply if client sent CAPABILITY
command _before_ STARTTLS.

--HG--
branch : HEAD
---

diff --git a/src/imap-login/client.c b/src/imap-login/client.c
index 390c5ed630..0027dc5510 100644
--- a/src/imap-login/client.c
+++ b/src/imap-login/client.c
@@ -138,6 +138,10 @@ static void client_start_tls(struct imap_client *client)
 	client->common.secured = TRUE;
 	client_set_title(client);
 
+	/* CAPABILITY sent before STARTTLS can't be trusted */
+	client->common.master_login_flags &=
+		~LOGIN_IMAP_FLAG_FULL_CAPABILITY_SENT;
+
 	client->common.fd = fd_ssl;
 	i_stream_unref(&client->common.input);
 	o_stream_unref(&client->output);