to deal with this. However it did not apply to per-recipient defers
in remote deliveries, e.g. over LMTP to a separate IMAP message store.
- This commit adds a proper retry rule check during routing so that
- the final cutoff time is checked against the message's age. I also
- took the opportunity to unify three very similar blocks of code.
+ This change adds a proper retry rule check during routing so that the
+ final cutoff time is checked against the message's age. We only do
+ this check if there is an address retry record and there is not a
+ domain retry record; this implies that previous attempts to handle
+ the address had the retry_use_local_parts option turned on. We use
+ this as an approximation for the destination being like a local
+ delivery, as in LMTP.
I suspect this new check makes the old local delivery cutoff check
redundant, but I have not verified this so I left the code in place.
+TF/02 Correct gecos expansion when From: is a prefix of the username.
+
+ Test 0254 submits a message to Exim with the header
+
+ Resent-From: f
+
+ When I ran the test suite under the user fanf2, Exim expanded
+ the header to contain my full name, whereas it should have added
+ a Resent-Sender: header. It erroneously treats any prefix of the
+ username as equal to the username.
+
+ This change corrects that bug.
+
+GF/01 DCC debug and logging tidyup
+ Error conditions log to mainlog rather than paniclog.
+ Debug lines prefixed by "DCC: " to remove any ambiguity.
+
Exim version 4.80.1
-------------------
git://git.exim.org / users / jgh / exim.git / blobdiff