diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2019-05-21 21:32:34 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2019-05-26 00:05:27 +0100 |
| commit | 48519cef815997302bbb0f8c4499ecf4ae9ef446 (patch) | |
| tree | 65f89ab002213c8ab7bf9538a3d5c7b15272dd84 | |
| parent | b471ea6f02d5cf413b8bee686a668a07c9746620 (diff) | |
Logging: fix duplicated transport target info under TFO
| -rw-r--r-- | doc/doc-txt/ChangeLog | 2 | ||||
| -rw-r--r-- | src/src/transports/smtp.c | 4 |
2 files changed, 6 insertions, 0 deletions
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++; |