diff options
author | Jeremy Harris <jgh146exb@wizmail.org> | 2016-08-18 21:27:55 +0100 |
---|---|---|
committer | Jeremy Harris <jgh146exb@wizmail.org> | 2016-08-18 21:37:53 +0100 |
commit | e3b1f624c34b1345747184f4aa7bb9aca375600b (patch) | |
tree | bf983cfd1c0abff197c4ec72d9ebcd51ab9e7f3e /src | |
parent | 1c788856934033611fc68e374d2859f7afd1b9fc (diff) |
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.
Diffstat (limited to 'src')
-rw-r--r-- | src/src/deliver.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/src/deliver.c b/src/src/deliver.c index 24e4d2b63..6fee7be79 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; } |