Don't advertise STARTTLS/STLS capability when TLS/SSL connection is already

established.

--HG--
branch : HEAD

diff --git a/src/imap-login/client.c b/src/imap-login/client.c
index 2e7440a289e01fd2fd2fb7dcf8b8f2a7d1938558..241fb5f4616e2117b8337dcbe55b1ea3d629018b 100644 (file)
--- a/src/imap-login/client.c
+++ b/src/imap-login/client.c
@@ -93,7 +93,8 @@ static int cmd_capability(struct imap_client *client)
 
        auths = client_authenticate_get_capabilities(client->tls);
        capability = t_strconcat("* CAPABILITY " CAPABILITY_STRING,
-                                ssl_initialized ? " STARTTLS" : "",
+                                (ssl_initialized && !client->tls) ?
+                                " STARTTLS" : "",
                                 disable_plaintext_auth && !client->tls ?
                                 " LOGINDISABLED" : "", auths, NULL);
        client_send_line(client, capability);

diff --git a/src/pop3-login/client-authenticate.c b/src/pop3-login/client-authenticate.c
index 445134a37d6aacbda3683cc56f2b33d8385231a5..1e0882cfdeadd0cbf8c5960022c865546f7853ff 100644 (file)
--- a/src/pop3-login/client-authenticate.c
+++ b/src/pop3-login/client-authenticate.c
@@ -46,7 +46,8 @@ int cmd_capa(struct pop3_client *client, const char *args __attr_unused__)
        }
 
        client_send_line(client, t_strconcat("+OK\r\n" POP3_CAPABILITY_REPLY,
-                                            ssl_initialized ? "STLS\r\n" : "",
+                                            (ssl_initialized && !client->tls) ?
+                                            "STLS\r\n" : "",
                                             auth_mechs_capability,
                                             "\r\n.", NULL));
        return TRUE;