From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Tue, 21 May 2019 20:32:34 +0000 (+0100)
Subject: Logging: fix duplicated transport target info under TFO
X-Git-Url: https://git.exim.org/users/jgh/exim.git/commitdiff_plain/48519cef815997302bbb0f8c4499ecf4ae9ef446

Logging: fix duplicated transport target info under TFO
---

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 9159d3021..9ee8c22df 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -117,6 +117,8 @@ JH/23 The build default is now for TLS to be included; the SUPPORT_TLS define
       the the include-dir and library-file requirements that go with that
       choice.  Non-TLS builds are still supported.
 
+JH/24 Fix duplicated logging of peer name/address, on a transport connection-
+      reject under TFO.
 
 
 Exim version 4.92
diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index aed80cae9..128ac9a35 100644
--- a/src/src/transports/smtp.c
+++ b/src/src/transports/smtp.c
@@ -590,6 +590,10 @@ switch(*errno_value)
 	transport_count);
     return FALSE;
 
+  case ECONNREFUSED:		/* First-read error on a TFO conn */
+    if (verify_mode) *message = US strerror(*errno_value);
+    return FALSE;		/* nonverify, do not set message */
+
   case ERRNO_SMTPFORMAT:	/* Handle malformed SMTP response */
     s = string_printing(buffer);
     while (isspace(*s)) s++;