[dovecot-cvs] dovecot/src/imap-login client.c,1.14,1.15

cras at procontrol.fi cras at procontrol.fi
Wed Jun 25 03:35:15 EEST 2003


Update of /home/cvs/dovecot/src/imap-login
In directory danu:/tmp/cvs-serv24541/imap-login

Modified Files:
	client.c 
Log Message:
Don't advertise STARTTLS/STLS capability when TLS/SSL connection is already
established.



Index: client.c
===================================================================
RCS file: /home/cvs/dovecot/src/imap-login/client.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- client.c	24 Jun 2003 23:10:44 -0000	1.14
+++ client.c	24 Jun 2003 23:35:13 -0000	1.15
@@ -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);



More information about the dovecot-cvs mailing list