Gitweb:
https://git.exim.org/exim.git/commitdiff/b471ea6f02d5cf413b8bee686a668a07c9746620
Commit: b471ea6f02d5cf413b8bee686a668a07c9746620
Parent: 3f63e46192d8d9ad72e9b25602615042bcc404f6
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Sat May 25 22:43:23 2019 +0100
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Sat May 25 23:39:41 2019 +0100
Callouts: simplfy debug output
---
src/src/transports/smtp.c | 8 +-------
test/stderr/0376 | 1 -
test/stderr/0578 | 1 -
3 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index 606c646..aed80ca 100644
--- a/src/src/transports/smtp.c
+++ b/src/src/transports/smtp.c
@@ -2125,15 +2125,9 @@ if (!continue_hostname)
{
if ((sx->cctx.sock = smtp_connect(&sx->conn_args, NULL)) < 0)
{
- uschar * msg = NULL;
- if (sx->verify)
- {
- msg = US strerror(errno);
- HDEBUG(D_verify) debug_printf("connect: %s\n", msg);
- }
set_errno_nohost(sx->addrlist,
errno == ETIMEDOUT ? ERRNO_CONNECTTIMEOUT : errno,
- sx->verify ? msg : NULL,
+ sx->verify ? US strerror(errno) : NULL,
DEFER, FALSE);
sx->send_quit = FALSE;
return DEFER;
diff --git a/test/stderr/0376 b/test/stderr/0376
index 5ffa0db..d08f430 100644
--- a/test/stderr/0376
+++ b/test/stderr/0376
@@ -61,7 +61,6 @@ callout cache: found domain record for localhost
callout cache: address record expired for ok@localhost
interface=NULL port=1224
Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused
-connect: Connection refused
LOG: MAIN REJECT
H=[V4NET.0.0.1] U=root sender verify defer for <ok@localhost>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused
created log directory TESTSUITE/spool/log
diff --git a/test/stderr/0578 b/test/stderr/0578
index 3a205d4..54ccc56 100644
--- a/test/stderr/0578
+++ b/test/stderr/0578
@@ -63,7 +63,6 @@ callout cache: found domain record for localhost
callout cache: address record expired for ok@localhost
interface=NULL port=1224
Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused
-connect: Connection refused
LOG: MAIN REJECT
H=[V4NET.0.0.1] U=root sender verify defer for <ok@localhost>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused
created log directory TESTSUITE/spool/log