From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Wed, 27 Jun 2018 15:24:06 +0000 (+0300)
Subject: lda: Deinitialize cleanly if mail delivery fails
X-Git-Tag: 2.3.4~278
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=af55d18cf61d97ba661233fd89aeca579a187572;p=thirdparty%2Fdovecot%2Fcore.git

lda: Deinitialize cleanly if mail delivery fails
---

diff --git a/src/lda/main.c b/src/lda/main.c
index e8070a0627..f4a2ae4d3c 100644
--- a/src/lda/main.c
+++ b/src/lda/main.c
@@ -517,9 +517,6 @@ int main(int argc, char *argv[])
 
 	ret = lda_deliver(&ctx, service_user, user, path,
 			  rcpt_to, rcpt_to_source, stderr_rejection);
-	if (ret != EX_OK)
-		return ret;
-
 	{
 		struct mailbox_transaction_context *t =
 			ctx.src_mail->transaction;
@@ -536,5 +533,5 @@ int main(int argc, char *argv[])
 	mail_storage_service_user_unref(&service_user);
 	mail_storage_service_deinit(&storage_service);
 	master_service_deinit(&master_service);
-        return EX_OK;
+        return ret;
 }