Mercurial > dovecot > original-hg > dovecot-1.2

changeset 1575:37c4985b7dc9 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't advertise STARTTLS/STLS capability when TLS/SSL connection is already established.
author Timo Sirainen <tss@iki.fi>
date Wed, 25 Jun 2003 02:35:13 +0300
parents 9b5bcd7b1b5a
children f1711e0f7035
files src/imap-login/client.c src/pop3-login/client-authenticate.c
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/imap-login/client.c	Wed Jun 25 02:26:36 2003 +0300
+++ b/src/imap-login/client.c	Wed Jun 25 02:35:13 2003 +0300
@@ -93,7 +93,8 @@
 
 	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);
--- a/src/pop3-login/client-authenticate.c	Wed Jun 25 02:26:36 2003 +0300
+++ b/src/pop3-login/client-authenticate.c	Wed Jun 25 02:35:13 2003 +0300
@@ -46,7 +46,8 @@
 	}
 
 	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;