OpenSMTPD: status set incorrectly on envelope expiration + fix

[Erik Brens]

Our OpenSMTPD daemon sent us the following confusing message:


A message is delayed for more than 0 seconds for the following
list of recipients:

b...@gus.test: Envelope expired


The enclosed patch will fix the issue permanently.

Sincerely, Erik

Index: usr.sbin/smtpd/queue.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/queue.c,v
retrieving revision 1.193
diff -u -p -r1.193 queue.c
--- usr.sbin/smtpd/queue.c      14 Jun 2021 17:58:16 -0000      1.193
+++ usr.sbin/smtpd/queue.c      24 Jun 2021 20:34:29 -0000
@@ -199,7 +199,7 @@ queue_imsg(struct mproc *p, struct 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");