Delivery: same-host checking for transport runs should include port from address...

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index d2d2cffa7762e36fed884b6402f3b0cb20b599d8..a31a49ae65c308a680d3cc8e755501d00237a9f0 100644 (file)
--- 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 eae675753c5c7152b08a6cb1b1588b1729621b02..24e4d2b63684b5b388bf587e4d3c9b2d37aad322 100644 (file)
--- 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;