lib-smtp: smtp-client-transaction - Fix immediate transaction to wait until the conne...

A transaction with the immediate mode enabled did not wait and started to submit
commands too early; i.e., before an EHLO reply is received. This means that
the first MAIL command is always sent bare without any extensions and the XCLIENT
command is not sent when it is deferred (e.g. for submission).

diff --git a/src/lib-smtp/smtp-client-transaction.c b/src/lib-smtp/smtp-client-transaction.c
index 9968030b8490ce8b48cf4fa08dab08d917c541d0..225d9f5ff06c7fef4947041cede0ef7a28de4487 100644 (file)
--- a/src/lib-smtp/smtp-client-transaction.c
+++ b/src/lib-smtp/smtp-client-transaction.c
@@ -962,7 +962,8 @@ void smtp_client_transaction_start(
 
        smtp_client_connection_add_transaction(conn, trans);
 
-       if (trans->immediate) {
+       if (trans->immediate &&
+           conn->state == SMTP_CLIENT_CONNECTION_STATE_READY) {
                trans->state = SMTP_CLIENT_TRANSACTION_STATE_MAIL_FROM;
 
                if (!trans->submitting)