Gitweb:
https://git.exim.org/exim.git/commitdiff/ce15be78166725f6f802231dc8e0c0e4ec615009
Commit: ce15be78166725f6f802231dc8e0c0e4ec615009
Parent: 44226149c4c467c9d109ead4b3c7bbe15b634997
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Wed Sep 1 15:25:18 2021 +0100
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Wed Sep 1 15:25:18 2021 +0100
Generalise "send failed" message in smtp transport
---
src/src/transports/smtp.c | 6 +++---
test/log/4520 | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index a121e34..7bb1249 100644
--- a/src/src/transports/smtp.c
+++ b/src/src/transports/smtp.c
@@ -3079,7 +3079,7 @@ return OK;
SEND_FAILED:
code = '4';
- message = US string_sprintf("send() to %s [%s] failed: %s",
+ message = US string_sprintf("smtp send to %s [%s] failed: %s",
sx->conn_args.host->name, sx->conn_args.host->address, strerror(errno));
sx->send_quit = FALSE;
yield = DEFER;
@@ -4400,7 +4400,7 @@ if (!sx->ok)
{
save_errno = errno;
code = '4';
- message = string_sprintf("send() to %s [%s] failed: %s",
+ message = string_sprintf("smtp send to %s [%s] failed: %s",
host->name, host->address, message ? message : US strerror(save_errno));
sx->send_quit = FALSE;
goto FAILED;
@@ -4584,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))
{
- msg = US string_sprintf("send() to %s [%s] failed: %s", host->name,
+ msg = US string_sprintf("smtp send to %s [%s] failed: %s", host->name,
host->address, strerror(errno));
sx->send_quit = FALSE;
}
diff --git a/test/log/4520 b/test/log/4520
index 234624c..9d5e645 100644
--- a/test/log/4520
+++ b/test/log/4520
@@ -22,8 +22,8 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= <> U=CALLER P=local S=sss for e0@???
1999-03-02 09:44:33 10HmaX-0005vi-00 failed to expand dkim_timestamps: unknown variable in "${bogus}"
1999-03-02 09:44:33 10HmaX-0005vi-00 DKIM: message could not be signed, and dkim_strict is set. Deferring message delivery.
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: send() to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] failed: failed to expand dkim_timestamps: unknown variable in "${bogus}": Permission denied
-1999-03-02 09:44:33 10HmaX-0005vi-00 == e0@??? R=client T=send_to_server defer (EEE): Permission denied H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: send() to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] failed: failed to expand dkim_timestamps: unknown variable in "${bogus}"
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: smtp send to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] failed: failed to expand dkim_timestamps: unknown variable in "${bogus}": Permission denied
+1999-03-02 09:44:33 10HmaX-0005vi-00 == e0@??? R=client T=send_to_server defer (EEE): Permission denied H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: smtp send to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] failed: failed to expand dkim_timestamps: unknown variable in "${bogus}"
1999-03-02 09:44:33 10HmaX-0005vi-00 ** e0@???: retry timeout exceeded
1999-03-02 09:44:33 10HmaX-0005vi-00 e0@???: error ignored
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
