[dovecot-cvs] dovecot/src/pop3-login client-authenticate.c,1.7,1.8

[cras at procontrol.fi]

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

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



Index: client-authenticate.c
===================================================================
RCS file: /home/cvs/dovecot/src/pop3-login/client-authenticate.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- client-authenticate.c	27 May 2003 21:46:44 -0000	1.7
+++ client-authenticate.c	24 Jun 2003 23:35:13 -0000	1.8
@@ -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;