On Wed, 04 Apr 2007 22:38:03 +0200, Renaud Allard <renaud@???>
wrote:
>You should probably follow the solution mentioned here:
>http://www.exim.org/mail-archives/exim-users/Week-of-Mon-20070212/msg00100.html
I am not an expert in reading context diffs, and the patch does not
seem to apply cleanly when pasted from the web archive, but do I see
correctly that the patch is the following unified diff?
|diff -urNad experimental~/build-tree/src/deliver.c experimental/build-tree/src/deliver.c
|--- experimental~/build-tree/src/deliver.c 2007-01-08 15:25:36.000000000 +0100
|+++ experimental/build-tree/src/deliver.c 2007-04-05 10:52:21.000000000 +0200
|@@ -5639,12 +5639,16 @@
| string_sprintf("R:%s", addr->domain), 0);
|
| /* Otherwise, if there is an existing retry record in the database, add
|- retry items to delete both forms. Since the domain might have been
|- rewritten (expanded to fully qualified) as a result of routing, ensure
|- that the rewritten form is also deleted. */
|-
|+ retry items to delete both forms. We must also allow for the possibility
|+ of a routing retry that includes the sender address. Since the domain might
|+ have been rewritten (expanded to fully qualified) as a result of routing,
|+ ensure that the rewritten form is also deleted. */
|+
| else if (testflag(addr, af_dr_retry_exists))
| {
|+ uschar *altkey = string_sprintf("%s:<%s>", addr->address_retry_key,
|+ sender_address);
|+ retry_add_item(addr, altkey, rf_delete);
| retry_add_item(addr, addr->address_retry_key, rf_delete);
| retry_add_item(addr, addr->domain_retry_key, rf_delete);
| if (Ustrcmp(addr->domain, old_domain) != 0)
|diff -urNad experimental~/build-tree/src/transports/smtp.c experimental/build-tree/src/transports/smtp.c
|--- experimental~/build-tree/src/transports/smtp.c 2007-01-08 15:25:37.000000000 +0100
|+++ experimental/build-tree/src/transports/smtp.c 2007-04-05 10:53:46.000000000 +0200
|@@ -643,10 +643,15 @@
| addr->transport_return = PENDING_OK;
|
| /* If af_dr_retry_exists is set, there was a routing delay on this address;
|- ensure that any address-specific retry record is expunged. */
|-
|+ ensure that any address-specific retry record is expunged. We do this both
|+ for the basic key and for the version that also includes the sender. */
| if (testflag(addr, af_dr_retry_exists))
|+ {
|+ uschar *altkey = string_sprintf("%s:<%s>", addr->address_retry_key,
|+ sender_address);
|+ retry_add_item(addr, altkey, rf_delete);
| retry_add_item(addr, addr->address_retry_key, rf_delete);
|+ }
| }
|
| /* Timeout while reading the response */
Greetings
Marc
--
-------------------------------------- !! No courtesy copies, please !! -----
Marc Haber | " Questions are the | Mailadresse im Header
Mannheim, Germany | Beginning of Wisdom " | http://www.zugschlus.de/
Nordisch by Nature | Lt. Worf, TNG "Rightful Heir" | Fon: *49 621 72739834
