https://bugs.exim.org/show_bug.cgi?id=1874
Git Commit <git@???> changed:
What |Removed |Added
----------------------------------------------------------------------------
CC| |git@???
--- Comment #8 from Git Commit <git@???> ---
Git commit:
http://git.exim.org/exim.git/commitdiff/e3b1f624c34b1345747184f4aa7bb9aca375600b
commit e3b1f624c34b1345747184f4aa7bb9aca375600b
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Thu Aug 18 21:27:55 2016 +0100
Commit: Jeremy Harris <jgh146exb@???>
CommitDate: Thu Aug 18 21:37:53 2016 +0100
Delivery: fix transmission down an already-open connection, when
one of the group of addresses is unsuitable for it. Bug 1874
Broken-by: 3070ceeeed05, fa41615da702.
---
doc/doc-txt/ChangeLog | 5 +++++
src/src/deliver.c | 9 +++++++--
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index a31a49a..aeb67ec 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -83,6 +83,11 @@ JH/22 Fix continued use of a connection for further
deliveries. If a port was
specified by a router, it must also match for the delivery to be
compatible.
+JH/23 Bug 1874: fix continued use of a connection for further deliveries.
+ When one of the recipients of a message was unsuitable for the
connection
+ (has no matching addresses), we lost track of needing to mark it
+ deferred. As a result mail would be lost.
+
Exim version 4.87
-----------------
diff --git a/src/src/deliver.c b/src/src/deliver.c
index 24e4d2b..6fee7be 100644
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -4425,6 +4425,7 @@ for (delivery_count = 0; addr_remote; delivery_count++)
ok = FALSE;
for (h = addr->host_list; h; h = h->next)
if (Ustrcmp(h->name, continue_hostname) == 0)
+/*XXX should also check port here */
{ ok = TRUE; break; }
}
@@ -4448,9 +4449,13 @@ for (delivery_count = 0; addr_remote; delivery_count++)
addr_fallback = addr;
}
- else if (next)
+ else
{
- while (next->next) next = next->next;
+ for (next = addr; ; next = next->next)
+ {
+ DEBUG(D_deliver) debug_printf(" %s to def list\n", next->address);
+ if (!next->next) break;
+ }
next->next = addr_defer;
addr_defer = addr;
}
--
You are receiving this mail because:
You are on the CC list for the bug.
