lib-smtp: smtp-client-transaction - Drop the rcpt->failed flag.

It is no longer needed.
dovecot · Feb 19, 2019 · 297af1b · 297af1b
1 parent 011efc3
commit 297af1b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/src/lib-smtp/smtp-client-private.h b/src/lib-smtp/smtp-client-private.h
@@ -91,7 +91,6 @@ struct smtp_client_transaction_rcpt {
 
 	bool external_pool:1;
 	bool queued:1;
-	bool failed:1;
 	bool finished:1;
 };
 

diff --git a/src/lib-smtp/smtp-client-transaction.c b/src/lib-smtp/smtp-client-transaction.c
@@ -266,11 +266,10 @@ smtp_client_transaction_rcpt_replied(
 	void *context = rcpt->context;
 
 	rcpt->rcpt_callback = NULL;
-	rcpt->failed = !success;
 
 	if (rcpt->finished)
 		return;
-	rcpt->finished = rcpt->failed;
+	rcpt->finished = !success;
 
 	if (success)
 		smtp_client_transaction_rcpt_approved(_rcpt);
@@ -319,8 +318,6 @@ smtp_client_transaction_rcpt_fail_reply(
 	rcpt->rcpt_callback = NULL;
 	rcpt->data_callback = NULL;
 
-	rcpt->failed = TRUE;
-
 	if (callback != NULL)
 		callback(reply, context);
 
@@ -613,10 +610,6 @@ void smtp_client_transaction_fail_reply(struct smtp_client_transaction *trans,
 	while (rcpt != NULL) {
 		struct smtp_client_command *cmd = rcpt->cmd_rcpt_to;
 
-		if (rcpt->failed) {
-			rcpt = rcpt->next;
-			continue;
-		}
 		rcpt_next = rcpt->next;
 
 		rcpt->cmd_rcpt_to = NULL;