diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2016-08-16 16:26:31 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2016-08-17 20:24:17 +0100 |
| commit | 1c788856934033611fc68e374d2859f7afd1b9fc (patch) | |
| tree | 7f03476b5961ed1711fed3c31ef325262969dac8 | |
| parent | 7b4c8c1fb37f58921e29b6c0753e621c5c854626 (diff) | |
Delivery: same-host checking for transport runs should include port from address give by routing
| -rw-r--r-- | doc/doc-txt/ChangeLog | 4 | ||||
| -rw-r--r-- | src/src/deliver.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index d2d2cffa7..a31a49ae6 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -79,6 +79,10 @@ JH/20 Bug 1872: Ensure that acl_smtp_notquit is run when the connection drops JH/21 Bug 1846: Send DMARC forensic reports for reject and quaratine results, even for a "none" policy. Patch from Tony Meyer. +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. + Exim version 4.87 ----------------- diff --git a/src/src/deliver.c b/src/src/deliver.c index eae675753..24e4d2b63 100644 --- a/src/src/deliver.c +++ b/src/src/deliver.c @@ -446,6 +446,10 @@ while (one && two) two = end_two; } + /* if the names matched but ports do not, mismatch */ + else if (one->port != two->port) + return FALSE; + /* Hosts matched */ one = one->next; |