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 390c5ed630a18284428d17287a3960550c36d6bd..0027dc5510a980eb78600d3cf1cab430caf01966 100644 (file)
--- 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);