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 1fa2152c68b42a4035c4f7b1476f853d834ea53f..b684ee89e52589a0d50f5f4bbfeead4efcc8e528 100644 (file)
--- 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 066287f13d68c8e13d528d3a55a622d50250afd7..5396a827774c8def33c19785c22fb31456443ac2 100644 (file)
--- 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 bebb60469b4dbd8f59102f626ec8952a8edf137a..9d6072d24965c8764fd027ad757a773b91630690 100644 (file)
--- 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;