From 1dd38f34b3f162d841cf47e1db397d09ace5cdfb Mon Sep 17 00:00:00 2001 From: Stephan Bosch Date: Fri, 28 Sep 2018 13:28:50 +0200 Subject: [PATCH] lib-smtp: client: transaction: Perform pipeline plug handling just once at top-level in smtp_client_transaction_submit_more(). --- src/lib-smtp/smtp-client-transaction.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/lib-smtp/smtp-client-transaction.c b/src/lib-smtp/smtp-client-transaction.c index 977bcf3685..637ade8d0e 100644 --- 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); -- 2.47.3