Callouts: simplfy debug output

diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index 606c646fb85f06eb965ecb65c43de8e2f7d6a87a..aed80cae9ca49de05d36dea7f19de8d9681b2eed 100644 (file)
--- 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 5ffa0dbfbed4380b6989f960738ec1abb72c04c5..d08f4302e3bbd09f2aa7e9ef0a4a4e8ae79fe35f 100644 (file)
--- 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 3a205d4226a9f886cdac14095d1e11237361437c..54ccc563c4f87b174b2062c4b73825fcdc69ebb2 100644 (file)
--- 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