From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Tue, 16 Aug 2016 15:26:31 +0000 (+0100)
Subject: Delivery: same-host checking for transport runs should include port from address... 
X-Git-Tag: exim-4_88_RC1~30
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/1c788856934033611fc68e374d2859f7afd1b9fc

Delivery: same-host checking for transport runs should include port from address give by routing
---

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;