lib-smtp: client: Don't put connection in TRANSACTION state unless there's a transaction.

Fixes hang occurring when connection is ready before transaction is started.

diff --git a/src/lib-smtp/smtp-client-connection.c b/src/lib-smtp/smtp-client-connection.c
index 1ad65f6d3351f07f69f5926845e80817427f9722..6b6396f657056e7f92c751a588ae45715a7442af 100644 (file)
--- a/src/lib-smtp/smtp-client-connection.c
+++ b/src/lib-smtp/smtp-client-connection.c
@@ -2095,10 +2095,13 @@ smtp_client_connection_do_start_transaction(struct smtp_client_connection *conn)
 
        timeout_remove(&conn->to_trans);
 
-       if (conn->transactions_head == NULL)
-               return;
        if (conn->state != SMTP_CLIENT_CONNECTION_STATE_TRANSACTION)
                return;
+       if (conn->transactions_head == NULL) {
+               smtp_client_connection_set_state(conn,
+                       SMTP_CLIENT_CONNECTION_STATE_READY);
+               return;
+       }
 
        if (conn->reset_needed)
                smtp_client_connection_reset(conn);
@@ -2115,6 +2118,8 @@ smtp_client_connection_start_transaction(struct smtp_client_connection *conn)
 {
        if (conn->state != SMTP_CLIENT_CONNECTION_STATE_READY)
                return;
+       if (conn->transactions_head == NULL)
+               return;
        if (conn->to_trans != NULL)
                return;