From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Wed, 27 Dec 2017 17:22:26 +0000 (+0000)
Subject: Debug: enhance output from smtp transport entry
X-Git-Tag: exim-4_91_RC1~130
X-Git-Url: https://git.exim.org/users/heiko/exim.git/commitdiff_plain/f8ea188614d9adca1edb7070643d94b4a6fec228

Debug: enhance output from smtp transport entry
---

diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index a1b677e19..01aa4190f 100644
--- a/src/src/transports/smtp.c
+++ b/src/src/transports/smtp.c
@@ -3733,7 +3733,7 @@ uschar *tid = string_sprintf("%s transport", tblock->name);
 smtp_transport_options_block *ob =
   (smtp_transport_options_block *)(tblock->options_block);
 host_item *hostlist = addrlist->host_list;
-host_item *host = NULL;
+host_item *host;
 
 DEBUG(D_transport)
   {
@@ -3744,7 +3744,7 @@ DEBUG(D_transport)
     {
     debug_printf("hostlist:\n");
     for (host = hostlist; host; host = host->next)
-      debug_printf("  %s:%d\n", host->name, host->port);
+      debug_printf("  '%s' IP %s port %d\n", host->name, host->address, host->port);
     }
   if (continue_hostname)
     debug_printf("already connected to %s [%s] (on fd %d)\n",
diff --git a/test/stderr/0143 b/test/stderr/0143
index 493e4e38b..e9db55adc 100644
--- a/test/stderr/0143
+++ b/test/stderr/0143
@@ -15,7 +15,7 @@ transport_name <my_smtp>
 my_smtp transport entered
   userx@domain.com
 hostlist:
-  127.0.0.1:-1
+  '127.0.0.1' IP 127.0.0.1 port -1
 checking status of 127.0.0.1
 127.0.0.1 [127.0.0.1]:1111/ip4.ip4.ip4.ip4 retry-status = usable
 delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@domain.com)
diff --git a/test/stderr/0476 b/test/stderr/0476
index 5b2aff1c1..49b49fc5a 100644
--- a/test/stderr/0476
+++ b/test/stderr/0476
@@ -13,7 +13,7 @@ set_process_info: pppp delivering 10HmaX-0005vi-00 using t1
 t1 transport entered
   userx@test.ex
 hostlist:
-  127.0.0.1:-1
+  '127.0.0.1' IP 127.0.0.1 port -1
 checking status of 127.0.0.1
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable
 delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@test.ex)
@@ -73,7 +73,7 @@ set_process_info: pppp delivering 10HmaZ-0005vi-00 using t1
 t1 transport entered
   CALLER@the.local.host.name
 hostlist:
-  127.0.0.1:-1
+  '127.0.0.1' IP 127.0.0.1 port -1
 checking status of 127.0.0.1
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable
 delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1] (CALLER@the.local.host.name)
@@ -108,7 +108,7 @@ set_process_info: pppp delivering 10HmaY-0005vi-00 using t1
 t1 transport entered
   usery@test.ex
 hostlist:
-  127.0.0.1:-1
+  '127.0.0.1' IP 127.0.0.1 port -1
 checking status of 127.0.0.1
 no message retry record
 127.0.0.1 [127.0.0.1]:1111 retry-status = unusable
diff --git a/test/stderr/2035 b/test/stderr/2035
index 3b2031bae..132da6bc2 100644
--- a/test/stderr/2035
+++ b/test/stderr/2035
@@ -47,7 +47,7 @@ admin user
 t1 transport entered
   userb@test.ex
 hostlist:
-  127.0.0.1:1225
+  '127.0.0.1' IP 127.0.0.1 port 1225
 already connected to 127.0.0.1 [127.0.0.1] (on fd 0)
 checking status of 127.0.0.1
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable
diff --git a/test/stderr/2135 b/test/stderr/2135
index c99402f52..432f1cf6c 100644
--- a/test/stderr/2135
+++ b/test/stderr/2135
@@ -47,7 +47,7 @@ admin user
 t1 transport entered
   userb@test.ex
 hostlist:
-  127.0.0.1:1225
+  '127.0.0.1' IP 127.0.0.1 port 1225
 already connected to 127.0.0.1 [127.0.0.1] (on fd 0)
 checking status of 127.0.0.1
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable