git://git.exim.org
/
users
/
jgh
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a05d3e3
)
Debug: enhance output from smtp transport entry
author
Jeremy Harris
<jgh146exb@wizmail.org>
Wed, 27 Dec 2017 17:22:26 +0000
(17:22 +0000)
committer
Jeremy Harris
<jgh146exb@wizmail.org>
Thu, 28 Dec 2017 21:03:52 +0000
(21:03 +0000)
src/src/transports/smtp.c
patch
|
blob
|
history
test/stderr/0143
patch
|
blob
|
history
test/stderr/0476
patch
|
blob
|
history
test/stderr/2035
patch
|
blob
|
history
test/stderr/2135
patch
|
blob
|
history
diff --git
a/src/src/transports/smtp.c
b/src/src/transports/smtp.c
index a1b677e190b484781213bc8b5fada4c04b617b3c..01aa4190fe85e5fb5660768fd3f7eea92e8c720f 100644
(file)
--- 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;
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)
{
DEBUG(D_transport)
{
@@
-3744,7
+3744,7
@@
DEBUG(D_transport)
{
debug_printf("hostlist:\n");
for (host = hostlist; host; host = host->next)
{
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",
}
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 493e4e38bcf8d4d2c5fa662a8fc41159a986dfba..e9db55adc8c3022f43bdf97ade6d3c45781589f3 100644
(file)
--- a/
test/stderr/0143
+++ b/
test/stderr/0143
@@
-15,7
+15,7
@@
transport_name <my_smtp>
my_smtp transport entered
userx@domain.com
hostlist:
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)
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 5b2aff1c16c9bfe621166c4edd38cfad7a640e0e..49b49fc5a1c7405e68185f23bf38a3f20ed6a90f 100644
(file)
--- 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:
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)
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:
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)
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:
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
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 3b2031baea7171ef3c8ae361efbc6198f03c1acf..132da6bc24b231aeadc0ef3f24a9b4cad2bec19d 100644
(file)
--- a/
test/stderr/2035
+++ b/
test/stderr/2035
@@
-47,7
+47,7
@@
admin user
t1 transport entered
userb@test.ex
hostlist:
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
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 c99402f52f124568dcbbdf424cef1a2a6ff3a9e6..432f1cf6c8e0432b7f6b8ec80845e79368ae79cd 100644
(file)
--- a/
test/stderr/2135
+++ b/
test/stderr/2135
@@
-47,7
+47,7
@@
admin user
t1 transport entered
userb@test.ex
hostlist:
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
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