Gitweb:
https://git.exim.org/exim.git/commitdiff/48519cef815997302bbb0f8c4499ecf4ae9ef446
Commit: 48519cef815997302bbb0f8c4499ecf4ae9ef446
Parent: b471ea6f02d5cf413b8bee686a668a07c9746620
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Tue May 21 21:32:34 2019 +0100
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Sun May 26 00:05:27 2019 +0100
Logging: fix duplicated transport target info under TFO
---
doc/doc-txt/ChangeLog | 2 ++
src/src/transports/smtp.c | 4 ++++
2 files changed, 6 insertions(+)
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 9159d30..9ee8c22 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 aed80ca..128ac9a 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++;
