Logging: fix duplicated transport target info under TFO

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 9159d30219dd5efe13f8faeb4fa152705ed4a376..9ee8c22df655117037a659e3b7ab890bd462ffd2 100644 (file)
--- 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 aed80cae9ca49de05d36dea7f19de8d9681b2eed..128ac9a35019f4fe4a41fb8e7a0208f515884d2b 100644 (file)
--- 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++;