From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Wed, 15 Apr 2020 22:04:02 +0000 (+0200)
Subject: lib-lda: mail-deliver - Add MAIL_DELIVER_ERROR_REJECTED.
X-Git-Tag: 2.3.11.2~130
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b15f64f1c2d099cf21de382b753a75d0fc91df24;p=thirdparty%2Fdovecot%2Fcore.git

lib-lda: mail-deliver - Add MAIL_DELIVER_ERROR_REJECTED.

This is not used yet, but useful for future expansion.
---

diff --git a/src/lda/main.c b/src/lda/main.c
index 1fa2152c68..b684ee89e5 100644
--- a/src/lda/main.c
+++ b/src/lda/main.c
@@ -249,6 +249,8 @@ lda_do_deliver(struct mail_deliver_context *ctx, bool stderr_rejection)
 		i_unreached();
 	case MAIL_DELIVER_ERROR_TEMPORARY:
 		return EX_TEMPFAIL;
+	case MAIL_DELIVER_ERROR_REJECTED:
+		break;
 	case MAIL_DELIVER_ERROR_NOQUOTA:
 		if (ctx->set->quota_full_tempfail)
 			return EX_TEMPFAIL;
diff --git a/src/lib-lda/mail-deliver.h b/src/lib-lda/mail-deliver.h
index 066287f13d..5396a82777 100644
--- a/src/lib-lda/mail-deliver.h
+++ b/src/lib-lda/mail-deliver.h
@@ -18,6 +18,8 @@ enum mail_deliver_error {
 
 	/* Temporary error */
 	MAIL_DELIVER_ERROR_TEMPORARY,
+	/* Delivery rejected */
+	MAIL_DELIVER_ERROR_REJECTED,
 	/* Out of storage quota for mailbox or user */
 	MAIL_DELIVER_ERROR_NOQUOTA,
 	/* Internal error (BUG) */
diff --git a/src/lmtp/lmtp-local.c b/src/lmtp/lmtp-local.c
index bebb60469b..9d6072d249 100644
--- a/src/lmtp/lmtp-local.c
+++ b/src/lmtp/lmtp-local.c
@@ -559,6 +559,9 @@ lmtp_local_default_do_deliver(struct lmtp_local *local,
 	case MAIL_DELIVER_ERROR_TEMPORARY:
 		smtp_server_recipient_reply(rcpt, 451, "4.2.0", "%s", error);
 		break;
+	case MAIL_DELIVER_ERROR_REJECTED:
+		smtp_server_recipient_reply(rcpt, 552, "5.2.0", "%s", error);
+		break;
 	case MAIL_DELIVER_ERROR_NOQUOTA:
 		lmtp_local_rcpt_reply_overquota(llrcpt, error);
 		break;