lib-smtp: client: transaction: Perform pipeline plug handling just once at top-level...

diff --git a/src/lib-smtp/smtp-client-transaction.c b/src/lib-smtp/smtp-client-transaction.c
index 977bcf36854e3b87b48be91496b2af5e4e992aa2..637ade8d0eaf84db4c897ae4b866bc7e7f26ff30 100644 (file)
--- a/src/lib-smtp/smtp-client-transaction.c
+++ b/src/lib-smtp/smtp-client-transaction.c
@@ -778,13 +778,11 @@ smtp_client_transaction_submit_more(struct smtp_client_transaction *trans)
                trans->rcpts_next_send_idx = i;
 
                smtp_client_command_lock(trans->cmd_last);
-
-               if (trans->cmd_plug != NULL) {
-                       i_assert(trans->cmd_last != trans->cmd_plug);
-                       smtp_client_command_abort(&trans->cmd_plug);
-               }
        }
 
+       if (trans->cmd_plug != NULL && trans->cmd_last != trans->cmd_plug)
+               smtp_client_command_abort(&trans->cmd_plug);
+
        /* DATA */
        if (trans->data_input != NULL)
                smtp_client_transaction_send_data(trans);