git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Generalise "send failed" message in smtp transport
[exim.git]
/
src
/
src
/
transports
/
smtp.c
diff --git
a/src/src/transports/smtp.c
b/src/src/transports/smtp.c
index c62de724d8efa0a1bd7f759578468ea881a5002e..7bb1249cc1059c1ef8d5e82efc9b7214f0ed592e 100644
(file)
--- a/
src/src/transports/smtp.c
+++ b/
src/src/transports/smtp.c
@@
-194,9
+194,7
@@
smtp_transport_options_block smtp_transport_option_defaults = {
.keepalive = TRUE,
.retry_include_ip_address = TRUE,
#ifndef DISABLE_TLS
.keepalive = TRUE,
.retry_include_ip_address = TRUE,
#ifndef DISABLE_TLS
-# if defined(SUPPORT_SYSDEFAULT_CABUNDLE) || !defined(USE_GNUTLS)
.tls_verify_certificates = US"system",
.tls_verify_certificates = US"system",
-# endif
.tls_dh_min_bits = EXIM_CLIENT_DH_DEFAULT_MIN_BITS,
.tls_tempfail_tryclear = TRUE,
.tls_try_verify_hosts = US"*",
.tls_dh_min_bits = EXIM_CLIENT_DH_DEFAULT_MIN_BITS,
.tls_tempfail_tryclear = TRUE,
.tls_try_verify_hosts = US"*",
@@
-3081,7
+3079,7
@@
return OK;
SEND_FAILED:
code = '4';
SEND_FAILED:
code = '4';
- message = US string_sprintf("s
end()
to %s [%s] failed: %s",
+ message = US string_sprintf("s
mtp send
to %s [%s] failed: %s",
sx->conn_args.host->name, sx->conn_args.host->address, strerror(errno));
sx->send_quit = FALSE;
yield = DEFER;
sx->conn_args.host->name, sx->conn_args.host->address, strerror(errno));
sx->send_quit = FALSE;
yield = DEFER;
@@
-4402,7
+4400,7
@@
if (!sx->ok)
{
save_errno = errno;
code = '4';
{
save_errno = errno;
code = '4';
- message = string_sprintf("s
end()
to %s [%s] failed: %s",
+ message = string_sprintf("s
mtp send
to %s [%s] failed: %s",
host->name, host->address, message ? message : US strerror(save_errno));
sx->send_quit = FALSE;
goto FAILED;
host->name, host->address, message ? message : US strerror(save_errno));
sx->send_quit = FALSE;
goto FAILED;
@@
-4586,7
+4584,7
@@
if (sx->completed_addr && sx->ok && sx->send_quit)
if (sx->send_rset)
if (! (sx->ok = smtp_write_command(sx, SCMD_FLUSH, "RSET\r\n") >= 0))
{
if (sx->send_rset)
if (! (sx->ok = smtp_write_command(sx, SCMD_FLUSH, "RSET\r\n") >= 0))
{
- msg = US string_sprintf("s
end()
to %s [%s] failed: %s", host->name,
+ msg = US string_sprintf("s
mtp send
to %s [%s] failed: %s", host->name,
host->address, strerror(errno));
sx->send_quit = FALSE;
}
host->address, strerror(errno));
sx->send_quit = FALSE;
}