From 70b97d678e6658a217e619f82b0248f60235c7fc Mon Sep 17 00:00:00 2001 From: Stephan Bosch Date: Thu, 21 Dec 2017 23:09:13 +0100 Subject: [PATCH] lib-smtp: server: STARTTLS command: Call smtp_server_connection_set_ssl_streams() after calling the conn_start_tls() connection callback. This is called instead smtp_server_connection_set_streams(), so that the connection is now marked as SSL-secured. This fixes a submission-login bug that prevented client login when ssl=required. --- src/lib-smtp/smtp-server-cmd-starttls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib-smtp/smtp-server-cmd-starttls.c b/src/lib-smtp/smtp-server-cmd-starttls.c index fd5d983049..0aae8b8269 100644 --- a/src/lib-smtp/smtp-server-cmd-starttls.c +++ b/src/lib-smtp/smtp-server-cmd-starttls.c @@ -30,7 +30,7 @@ static int cmd_starttls_start(struct smtp_server_connection *conn) if (!smtp_server_connection_unref(&tmp_conn) || ret < 0) return -1; - smtp_server_connection_set_streams(conn, input, output); + smtp_server_connection_set_ssl_streams(conn, input, output); } else if (smtp_server_connection_ssl_init(conn) < 0) { smtp_server_connection_close(&conn, "SSL Initialization failed"); -- 2.47.3