From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Fri, 28 Sep 2018 11:28:50 +0000 (+0200)
Subject: lib-smtp: client: transaction: Perform pipeline plug handling just once at top-level... 
X-Git-Tag: 2.3.9~1254
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1dd38f34b3f162d841cf47e1db397d09ace5cdfb;p=thirdparty%2Fdovecot%2Fcore.git

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

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);