From 139244a2a2dd35876efa8da6871d75b8f9b84602 Mon Sep 17 00:00:00 2001 From: eric Date: Mon, 2 Aug 2021 12:33:34 +0000 Subject: [PATCH] Fix incorrect status code for expired mails resulting in a misleading bounce report. From Erik Brens --- usr.sbin/smtpd/queue.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/smtpd/queue.c b/usr.sbin/smtpd/queue.c index 32c2212cdd8..e79e3f06be4 100644 --- a/usr.sbin/smtpd/queue.c +++ b/usr.sbin/smtpd/queue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: queue.c,v 1.193 2021/06/14 17:58:16 eric Exp $ */ +/* $OpenBSD: queue.c,v 1.194 2021/08/02 12:33:34 eric Exp $ */ /* * Copyright (c) 2008 Gilles Chehade @@ -199,7 +199,7 @@ queue_imsg(struct mproc *p, struct imsg *imsg) bounce.type = B_FAILED; envelope_set_errormsg(&evp, "Envelope expired"); - envelope_set_esc_class(&evp, ESC_STATUS_TEMPFAIL); + envelope_set_esc_class(&evp, ESC_STATUS_PERMFAIL); envelope_set_esc_code(&evp, ESC_DELIVERY_TIME_EXPIRED); queue_bounce(&evp, &bounce); queue_log(&evp, "Expire", "Envelope expired"); -- 2.20.1