]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
lib-smtp: smtp-client-connection - Fix assert failure occurring when STARTTLS handsha...
authorStephan Bosch <stephan.bosch@open-xchange.com>
Sat, 20 Jul 2019 11:03:44 +0000 (13:03 +0200)
committeraki.tuomi <aki.tuomi@open-xchange.com>
Tue, 19 Nov 2019 12:46:24 +0000 (12:46 +0000)
Panic was:

Panic: file smtp-client-connection.c: line 1212 (smtp_client_connection_established): assertion failed: (!conn->connect_succeeded)

src/lib-smtp/smtp-client-connection.c

index 730fae504c1acab881ebe6a73a63ff4ae8b5af8a..985e04b64eca0911125cf4c7b46be28a270e2b9d 100644 (file)
@@ -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