lib-smtp: smtp-client-connection - Always abort all commands upon smtp_client_connect...

Before, these would get a disconnect failure, which makes no sense when the
client is causing the disconnect.

diff --git a/src/lib-smtp/smtp-client-connection.c b/src/lib-smtp/smtp-client-connection.c
index ffa0f90e0da9980b6cad500159dc439f97f7c2d1..3dbbb94bd7887ff8632a2f547dabd9a0271ebbca 100644 (file)
--- a/src/lib-smtp/smtp-client-connection.c
+++ b/src/lib-smtp/smtp-client-connection.c
@@ -1334,7 +1334,6 @@ static void smtp_client_connection_destroy(struct connection *_conn)
                break;
        case CONNECTION_DISCONNECT_DEINIT:
                e_debug(conn->event, "Connection deinit");
-               smtp_client_connection_commands_abort(conn);
                smtp_client_connection_close(&conn);
                break;
        case CONNECTION_DISCONNECT_CONNECT_TIMEOUT:
@@ -2206,6 +2205,7 @@ void smtp_client_connection_close(struct smtp_client_connection **_conn)
        conn->closed = TRUE;
 
        smtp_client_connection_transactions_abort(conn);
+       smtp_client_connection_commands_abort(conn);
        smtp_client_connection_disconnect(conn);
 
        /* could have been created while already disconnected */