From: Stephan Bosch Date: Sat, 20 Jul 2019 11:03:44 +0000 (+0200) Subject: lib-smtp: smtp-client-connection - Fix assert failure occurring when STARTTLS handsha... X-Git-Tag: 2.3.10~291 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bcc1e8d58fa70bad04240bfd74a6cef99f9a2de5;p=thirdparty%2Fdovecot%2Fcore.git lib-smtp: smtp-client-connection - Fix assert failure occurring when STARTTLS handshake succeeds quickly. Panic was: Panic: file smtp-client-connection.c: line 1212 (smtp_client_connection_established): assertion failed: (!conn->connect_succeeded) --- diff --git a/src/lib-smtp/smtp-client-connection.c b/src/lib-smtp/smtp-client-connection.c index 730fae504c..985e04b64e 100644 --- a/src/lib-smtp/smtp-client-connection.c +++ b/src/lib-smtp/smtp-client-connection.c @@ -1338,7 +1338,8 @@ smtp_client_connection_ssl_init(struct smtp_client_connection *conn, return -1; } - if (ssl_iostream_is_handshaked(conn->ssl_iostream)) { + if (ssl_iostream_is_handshaked(conn->ssl_iostream) && + !conn->connect_succeeded) { smtp_client_connection_established(conn); } else { /* wait for handshake to complete; connection input handler