Gitweb:
https://git.exim.org/exim.git/commitdiff/cfd47d9e77d3ec3cccbf9fb0ff6672c3b83b8fe3
Commit: cfd47d9e77d3ec3cccbf9fb0ff6672c3b83b8fe3
Parent: 3b6774c818ba09749c2168cd0705c18d01b572ec
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Fri Jun 2 00:17:00 2023 +0100
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Sun Jun 11 15:50:41 2023 +0100
Logging: for callout errors likely to be config problems, include the transport in the log line
---
src/src/smtp_out.c | 2 +-
src/src/verify.c | 24 ++++++++++++++++++++++++
test/confs/0227 | 11 ++++++-----
test/log/0098 | 12 ++++++------
test/log/0135 | 16 ++++++++--------
test/log/0197 | 20 ++++++++++----------
test/log/0198 | 4 ++--
test/log/0227 | 3 +++
test/log/0257 | 6 +++---
test/log/0365 | 12 ++++++++----
test/log/0366 | 32 ++++++++++++++++----------------
test/log/0388 | 4 ++--
test/log/0455 | 14 +++++++-------
test/log/0461 | 14 +++++++-------
test/log/0477 | 4 ++--
test/log/0478 | 8 ++++----
test/log/0613 | 12 ++++++------
test/log/3209 | 6 +++---
test/msglog/0197.10HmaX-0005vi-00 | 12 ++++++------
test/msglog/0197.10HmaY-0005vi-00 | 8 ++++----
test/msglog/0198.10HmaX-0005vi-00 | 4 ++--
test/paniclog/0227 | 1 +
test/paniclog/0365 | 4 ++++
test/rejectlog/0227 | 2 ++
test/rejectlog/0365 | 8 ++++----
test/runtest | 4 ++--
test/scripts/0000-Basic/0227 | 11 +++++++++++
test/stderr/0227 | 12 ++++++++++++
test/stderr/0365 | 4 ++++
test/stderr/0388 | 6 +++---
test/stderr/0613 | 2 +-
test/stdout/0227 | 5 +++++
test/stdout/0365 | 2 +-
33 files changed, 180 insertions(+), 109 deletions(-)
diff --git a/src/src/smtp_out.c b/src/src/smtp_out.c
index e705965ba..02f1fa438 100644
--- a/src/src/smtp_out.c
+++ b/src/src/smtp_out.c
@@ -305,7 +305,7 @@ if (sc->interface)
)
{
HDEBUG(D_transport|D_acl|D_v)
- debug_printf_indent("unable to bind outgoing SMTP call to %s: %s", sc->interface,
+ debug_printf_indent("unable to bind outgoing SMTP call to %s: %s\n", sc->interface,
strerror(errno));
close(sock);
return -1;
diff --git a/src/src/verify.c b/src/src/verify.c
index 228f63020..c420fcac1 100644
--- a/src/src/verify.c
+++ b/src/src/verify.c
@@ -709,6 +709,30 @@ tls_retry_connection:
if (yield != OK)
{
errno = addr->basic_errno;
+
+ /* For certain errors we want specifically to log the transport name,
+ for ease of fixing config errors. Slightly ugly doing it here, but we want
+ to not leak that also in the SMTP response. */
+ switch (errno)
+ {
+ case EPROTOTYPE:
+ case ENOPROTOOPT:
+ case EPROTONOSUPPORT:
+ case ESOCKTNOSUPPORT:
+ case EOPNOTSUPP:
+ case EPFNOSUPPORT:
+ case EAFNOSUPPORT:
+ case EADDRINUSE:
+ case EADDRNOTAVAIL:
+ case ENETDOWN:
+ case ENETUNREACH:
+ log_write(0, LOG_MAIN|LOG_PANIC,
+ "%s verify %s (making calloout connection): T=%s %s",
+ options & vopt_is_recipient ? "sender" : "recipient",
+ yield == FAIL ? "fail" : "defer",
+ transport_name, strerror(errno));
+ }
+
transport_name = NULL;
deliver_host = deliver_host_address = NULL;
deliver_domain = save_deliver_domain;
diff --git a/test/confs/0227 b/test/confs/0227
index 36050fa7d..a0b85c287 100644
--- a/test/confs/0227
+++ b/test/confs/0227
@@ -79,14 +79,15 @@ all:
begin transports
smtp:
- driver = smtp
- port = PORT_S
+ driver = smtp
+ port = PORT_S
+ interface = ${if eq {bindfail}{$local_part} {1.1.1.1}{}}
hosts_try_fastopen = :
lmtp:
- driver = smtp
- port = PORT_S
- protocol = lmtp
+ driver = smtp
+ port = PORT_S
+ protocol = lmtp
# ----- Retry -----
diff --git a/test/log/0098 b/test/log/0098
index 8f923e74e..757098496 100644
--- a/test/log/0098
+++ b/test/log/0098
@@ -21,8 +21,8 @@
1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
1999-03-02 09:44:33 End queue run: pid=p1235 -qf
1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbB-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
-1999-03-02 09:44:33 10HmbB-0005vi-00 == xxxx@??? R=all T=smtp defer (dd): Network Error
+1999-03-02 09:44:33 10HmbB-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network unreachable
+1999-03-02 09:44:33 10HmbB-0005vi-00 == xxxx@??? R=all T=smtp defer (dd): Network unreachable
1999-03-02 09:44:33 Start queue run: pid=p1236 -qf
1999-03-02 09:44:33 10HmaX-0005vi-00 == defer@??? R=alias defer (-1): This address has been forced to defer.
1999-03-02 09:44:33 10HmaX-0005vi-00 == |/non/existing/file <userx@???> R=userforward defer (-30): pipe_transport unset in userforward router
@@ -31,8 +31,8 @@
1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
1999-03-02 09:44:33 10HmaZ-0005vi-00 == defer@??? R=alias defer (-1): This address has been forced to defer.
1999-03-02 09:44:33 10HmaZ-0005vi-00 == defer@??? R=alias defer (-1): This address has been forced to defer.
-1999-03-02 09:44:33 10HmbB-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
-1999-03-02 09:44:33 10HmbB-0005vi-00 == xxxx@??? R=all T=smtp defer (dd): Network Error
+1999-03-02 09:44:33 10HmbB-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network unreachable
+1999-03-02 09:44:33 10HmbB-0005vi-00 == xxxx@??? R=all T=smtp defer (dd): Network unreachable
1999-03-02 09:44:33 End queue run: pid=p1236 -qf
1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 10HmbD-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused
@@ -65,8 +65,8 @@
1999-03-02 09:44:33 10HmbF-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss T="Warning: message 10HmaZ-0005vi-00 delayed by 0 minutes"
1999-03-02 09:44:33 10HmbF-0005vi-00 => CALLER <CALLER@???> R=localuser T=local_delivery
1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbB-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
-1999-03-02 09:44:33 10HmbB-0005vi-00 == xxxx@??? R=all T=smtp defer (dd): Network Error
+1999-03-02 09:44:33 10HmbB-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network unreachable
+1999-03-02 09:44:33 10HmbB-0005vi-00 == xxxx@??? R=all T=smtp defer (dd): Network unreachable
1999-03-02 09:44:33 10HmbG-0005vi-00 <= <> R=10HmbB-0005vi-00 U=EXIMUSER P=local S=sss T="Warning: message 10HmbB-0005vi-00 delayed by 0 minutes"
1999-03-02 09:44:33 10HmbG-0005vi-00 => CALLER <CALLER@???> R=localuser T=local_delivery
1999-03-02 09:44:33 10HmbG-0005vi-00 Completed
diff --git a/test/log/0135 b/test/log/0135
index 7bd0bc57f..7cf99544e 100644
--- a/test/log/0135
+++ b/test/log/0135
@@ -2,10 +2,10 @@
1999-03-02 09:44:33 Start queue run: pid=p1234
1999-03-02 09:44:33 10HmaX-0005vi-00 == c@??? R=smart T=local_delivery defer (-22): mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/c)
1999-03-02 09:44:33 10HmaX-0005vi-00 == d@??? R=smart T=local_delivery defer (-22): mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/d)
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 == a@??? R=default T=smtp defer (dd): Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=V4NET.0.0.0 [V4NET.0.0.0] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 == b@??? R=default T=smtp defer (dd): Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network unreachable
+1999-03-02 09:44:33 10HmaX-0005vi-00 == a@??? R=default T=smtp defer (dd): Network unreachable
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=V4NET.0.0.0 [V4NET.0.0.0] Network unreachable
+1999-03-02 09:44:33 10HmaX-0005vi-00 == b@??? R=default T=smtp defer (dd): Network unreachable
1999-03-02 09:44:33 10HmaX-0005vi-00 ** b@???: retry timeout exceeded
1999-03-02 09:44:33 10HmaX-0005vi-00 ** c@???: retry timeout exceeded
1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
@@ -18,8 +18,8 @@
1999-03-02 09:44:33 End queue run: pid=p1235
1999-03-02 09:44:33 Start queue run: pid=p1236
1999-03-02 09:44:33 10HmaX-0005vi-00 == d@??? R=smart T=local_delivery defer (-22): mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/d)
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 == a@??? R=default T=smtp defer (dd): Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network unreachable
+1999-03-02 09:44:33 10HmaX-0005vi-00 == a@??? R=default T=smtp defer (dd): Network unreachable
1999-03-02 09:44:33 10HmaX-0005vi-00 ** a@???: retry timeout exceeded
1999-03-02 09:44:33 10HmaX-0005vi-00 ** d@???: retry timeout exceeded
1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
@@ -29,8 +29,8 @@
1999-03-02 09:44:33 End queue run: pid=p1236
1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> U=CALLER P=local S=sss
1999-03-02 09:44:33 Start queue run: pid=p1237
-1999-03-02 09:44:33 10HmbA-0005vi-00 H=V4NET.0.0.0 [V4NET.0.0.0] Network Error
-1999-03-02 09:44:33 10HmbA-0005vi-00 == b@??? R=default T=smtp defer (dd): Network Error
+1999-03-02 09:44:33 10HmbA-0005vi-00 H=V4NET.0.0.0 [V4NET.0.0.0] Network unreachable
+1999-03-02 09:44:33 10HmbA-0005vi-00 == b@??? R=default T=smtp defer (dd): Network unreachable
1999-03-02 09:44:33 10HmbA-0005vi-00 ** b@???: retry timeout exceeded
1999-03-02 09:44:33 10HmbA-0005vi-00 b@???: error ignored
1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
diff --git a/test/log/0197 b/test/log/0197
index 9dc426a3c..b0c542b77 100644
--- a/test/log/0197
+++ b/test/log/0197
@@ -1,9 +1,9 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@??? R=checkcopy T=makecopy
1999-03-02 09:44:33 10HmaX-0005vi-00 -> usery@??? R=checkcopy T=makecopy
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=passall T=pass_on defer (dd): Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 == usery@??? R=passall T=pass_on defer (dd): Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network unreachable
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=passall T=pass_on defer (dd): Network unreachable
+1999-03-02 09:44:33 10HmaX-0005vi-00 == usery@??? R=passall T=pass_on defer (dd): Network unreachable
1999-03-02 09:44:33 10HmaY-0005vi-00 <= doesn't@matter U=CALLER P=local-smtp S=sss
1999-03-02 09:44:33 10HmaY-0005vi-00 => x@??? R=checkcopy T=makecopy
1999-03-02 09:44:33 10HmaY-0005vi-00 -> y@??? R=checkcopy T=makecopy
@@ -11,11 +11,11 @@
1999-03-02 09:44:33 10HmaY-0005vi-00 == y@??? R=passall T=pass_on defer (-54): retry time not reached for any host for 'copy.domain'
1999-03-02 09:44:33 10HmaY-0005vi-00 == z@elsewhere R=passall T=pass_on defer (-54): retry time not reached for any host for 'elsewhere'
1999-03-02 09:44:33 Start queue run: pid=p1234 -qf
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=passall T=pass_on defer (dd): Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 == usery@??? R=passall T=pass_on defer (dd): Network Error
-1999-03-02 09:44:33 10HmaY-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
-1999-03-02 09:44:33 10HmaY-0005vi-00 == x@??? R=passall T=pass_on defer (dd): Network Error
-1999-03-02 09:44:33 10HmaY-0005vi-00 == y@??? R=passall T=pass_on defer (dd): Network Error
-1999-03-02 09:44:33 10HmaY-0005vi-00 == z@elsewhere R=passall T=pass_on defer (dd): Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network unreachable
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=passall T=pass_on defer (dd): Network unreachable
+1999-03-02 09:44:33 10HmaX-0005vi-00 == usery@??? R=passall T=pass_on defer (dd): Network unreachable
+1999-03-02 09:44:33 10HmaY-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network unreachable
+1999-03-02 09:44:33 10HmaY-0005vi-00 == x@??? R=passall T=pass_on defer (dd): Network unreachable
+1999-03-02 09:44:33 10HmaY-0005vi-00 == y@??? R=passall T=pass_on defer (dd): Network unreachable
+1999-03-02 09:44:33 10HmaY-0005vi-00 == z@elsewhere R=passall T=pass_on defer (dd): Network unreachable
1999-03-02 09:44:33 End queue run: pid=p1234 -qf
diff --git a/test/log/0198 b/test/log/0198
index 75e1854d0..aae208d61 100644
--- a/test/log/0198
+++ b/test/log/0198
@@ -1,7 +1,7 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local-bsmtp S=sss id=E10HmaY-0005vi-00@???
1999-03-02 09:44:33 10HmaX-0005vi-00 ** usery@???: Unrouteable address
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=check_file T=pass_on defer (dd): Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network unreachable
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=check_file T=pass_on defer (dd): Network unreachable
1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
1999-03-02 09:44:33 10HmaZ-0005vi-00 == CALLER@??? R=passall T=pass_on defer (-54): retry time not reached for any host for 'the.local.host.name'
1999-03-02 09:44:33 10HmbA-0005vi-00 <= doesn't@matter U=CALLER P=local-bsmtp S=sss id=E10HmbB-0005vi-00@???
diff --git a/test/log/0227 b/test/log/0227
index 3cd4a1048..416b45af4 100644
--- a/test/log/0227
+++ b/test/log/0227
@@ -8,6 +8,9 @@
1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: Sender verify failed
1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <uncheckable2@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 Bad-char error for <> topbitchar:\200\377\377
1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<uncheckable2@localhost1> rejected RCPT <z@???>: Sender verify failed
+1999-03-02 09:44:33 recipient verify defer (making calloout connection): T=smtp Netwk addr not available
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify defer for <bindfail@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Netwk addr not available
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<bindfail@localhost1> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
1999-03-02 09:44:33 H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@???>: 550 Recipient not liked
1999-03-02 09:44:33 H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@???>: 550-Recipient not liked on two lines\n550 Here's the second
1999-03-02 09:44:33 H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@???>: 550 Recipient not liked, with bad char:\200\377\377
diff --git a/test/log/0257 b/test/log/0257
index 8822a6ef0..33e7a6557 100644
--- a/test/log/0257
+++ b/test/log/0257
@@ -1,4 +1,4 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-1.test.ex [V4NET.0.0.1] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-2.test.ex [V4NET.0.0.2] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 == abcd@??? R=all T=smtp defer (dd): Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-1.test.ex [V4NET.0.0.1] Network unreachable
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-2.test.ex [V4NET.0.0.2] Network unreachable
+1999-03-02 09:44:33 10HmaX-0005vi-00 == abcd@??? R=all T=smtp defer (dd): Network unreachable
diff --git a/test/log/0365 b/test/log/0365
index 2aec8a2c8..d8740e3c1 100644
--- a/test/log/0365
+++ b/test/log/0365
@@ -1,18 +1,22 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<> rejected after DATA: '>' missing at end of address: failing address in "From:" header is: <bad@syntax
1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
-1999-03-02 09:44:33 U=CALLER sender verify defer for <callout@x>: Could not complete sender verify callout: V4NET.0.0.0 [V4NET.0.0.0] : Network Error
+1999-03-02 09:44:33 recipient verify defer (making calloout connection): T=smtp Network unreachable
+1999-03-02 09:44:33 U=CALLER sender verify defer for <callout@x>: Could not complete sender verify callout: V4NET.0.0.0 [V4NET.0.0.0] : Network unreachable
1999-03-02 09:44:33 U=CALLER F=<callout@x> temporarily rejected RCPT <x@y>: Could not complete sender verify callout
1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<nosyntax@x> rejected after DATA
1999-03-02 09:44:33 10HmbA-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
-1999-03-02 09:44:33 U=CALLER F=<recipcallout@y> temporarily rejected RCPT <callout@y>: Could not complete recipient verify callout: V4NET.0.0.0 [V4NET.0.0.0] : Network Error
+1999-03-02 09:44:33 sender verify defer (making calloout connection): T=smtp Network unreachable
+1999-03-02 09:44:33 U=CALLER F=<recipcallout@y> temporarily rejected RCPT <callout@y>: Could not complete recipient verify callout: V4NET.0.0.0 [V4NET.0.0.0] : Network unreachable
1999-03-02 09:44:33 U=CALLER F=<> rejected RCPT <cantverify.fail@y>: failure message
1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <cantverify.defer@y>: defer message
1999-03-02 09:44:33 10HmbB-0005vi-00 U=CALLER F=<> rejected after DATA: '>' missing at end of address: failing address in "From:" header is: <bad@syntax
1999-03-02 09:44:33 10HmbC-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
-1999-03-02 09:44:33 U=CALLER sender verify defer for <callout@x>: Could not complete sender verify callout: V4NET.0.0.0 [V4NET.0.0.0] : Network Error
+1999-03-02 09:44:33 recipient verify defer (making calloout connection): T=smtp Network unreachable
+1999-03-02 09:44:33 U=CALLER sender verify defer for <callout@x>: Could not complete sender verify callout: V4NET.0.0.0 [V4NET.0.0.0] : Network unreachable
1999-03-02 09:44:33 U=CALLER F=<callout@x> temporarily rejected RCPT <x@y>: Could not complete sender verify callout
1999-03-02 09:44:33 10HmbD-0005vi-00 U=CALLER F=<nosyntax@x> rejected after DATA
1999-03-02 09:44:33 10HmbE-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
-1999-03-02 09:44:33 U=CALLER F=<recipcallout@y> temporarily rejected RCPT <callout@y>: Could not complete recipient verify callout: V4NET.0.0.0 [V4NET.0.0.0] : Network Error
+1999-03-02 09:44:33 sender verify defer (making calloout connection): T=smtp Network unreachable
+1999-03-02 09:44:33 U=CALLER F=<recipcallout@y> temporarily rejected RCPT <callout@y>: Could not complete recipient verify callout: V4NET.0.0.0 [V4NET.0.0.0] : Network unreachable
1999-03-02 09:44:33 U=CALLER F=<> rejected RCPT <cantverify.fail@y>: failure message
1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <cantverify.defer@y>: defer message
diff --git a/test/log/0366 b/test/log/0366
index 7a2d3487a..86489300b 100644
--- a/test/log/0366
+++ b/test/log/0366
@@ -1,21 +1,21 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-3.test.ex [V4NET.0.0.3] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-5.test.ex [V4NET.0.0.5] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-4.test.ex [V4NET.0.0.4] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-2.test.ex [V4NET.0.0.2] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-1.test.ex [V4NET.0.0.1] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=black-2.test.ex [V4NET.11.12.14] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=r1 T=smtp defer (dd): Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-3.test.ex [V4NET.0.0.3] Network unreachable
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-5.test.ex [V4NET.0.0.5] Network unreachable
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-4.test.ex [V4NET.0.0.4] Network unreachable
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-2.test.ex [V4NET.0.0.2] Network unreachable
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-1.test.ex [V4NET.0.0.1] Network unreachable
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=black-2.test.ex [V4NET.11.12.14] Network unreachable
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=r1 T=smtp defer (dd): Network unreachable
1999-03-02 09:44:33 Start queue run: pid=p1234
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-3.test.ex [V4NET.0.0.3] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-5.test.ex [V4NET.0.0.5] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-4.test.ex [V4NET.0.0.4] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-2.test.ex [V4NET.0.0.2] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-1.test.ex [V4NET.0.0.1] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-6.test.ex [V4NET.0.0.6] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=black-2.test.ex [V4NET.11.12.14] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=black-1.test.ex [V4NET.11.12.13] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=r1 T=smtp defer (dd): Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-3.test.ex [V4NET.0.0.3] Network unreachable
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-5.test.ex [V4NET.0.0.5] Network unreachable
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-4.test.ex [V4NET.0.0.4] Network unreachable
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-2.test.ex [V4NET.0.0.2] Network unreachable
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-1.test.ex [V4NET.0.0.1] Network unreachable
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-6.test.ex [V4NET.0.0.6] Network unreachable
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=black-2.test.ex [V4NET.11.12.14] Network unreachable
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=black-1.test.ex [V4NET.11.12.13] Network unreachable
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=r1 T=smtp defer (dd): Network unreachable
1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@???: retry timeout exceeded
1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
1999-03-02 09:44:33 10HmaY-0005vi-00 ** CALLER@???: Unrouteable address
diff --git a/test/log/0388 b/test/log/0388
index 5e454152c..0bffa05a9 100644
--- a/test/log/0388
+++ b/test/log/0388
@@ -1,7 +1,7 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@y>: 451 Temporary error
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=V4NET.0.0.0 [V4NET.0.0.0] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 == x@y R=r1 T=smtp defer (dd): Network Error H=127.0.0.1 [127.0.0.1]
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=V4NET.0.0.0 [V4NET.0.0.0] Network unreachable
+1999-03-02 09:44:33 10HmaX-0005vi-00 == x@y R=r1 T=smtp defer (dd): Network unreachable H=127.0.0.1 [127.0.0.1]
1999-03-02 09:44:33 10HmaX-0005vi-00 ** x@y: retry timeout exceeded
1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <CALLER@???> R=r0
diff --git a/test/log/0455 b/test/log/0455
index bedf22f65..6d9a3a26b 100644
--- a/test/log/0455
+++ b/test/log/0455
@@ -1,12 +1,12 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-3.test.ex [V4NET.0.0.3] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=r1 T=smtp defer (dd): Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-3.test.ex [V4NET.0.0.3] Network unreachable
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=r1 T=smtp defer (dd): Network unreachable
1999-03-02 09:44:33 Start queue run: pid=p1234
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-3.test.ex [V4NET.0.0.3] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-4.test.ex [V4NET.0.0.4] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-2.test.ex [V4NET.0.0.2] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-1.test.ex [V4NET.0.0.1] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=r1 T=smtp defer (dd): Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-3.test.ex [V4NET.0.0.3] Network unreachable
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-4.test.ex [V4NET.0.0.4] Network unreachable
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-2.test.ex [V4NET.0.0.2] Network unreachable
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-1.test.ex [V4NET.0.0.1] Network unreachable
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=r1 T=smtp defer (dd): Network unreachable
1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@???: retry timeout exceeded
1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
1999-03-02 09:44:33 10HmaY-0005vi-00 no immediate delivery: queued by ACL
diff --git a/test/log/0461 b/test/log/0461
index c2414ac88..34598e64b 100644
--- a/test/log/0461
+++ b/test/log/0461
@@ -1,13 +1,13 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network unreachable
1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK"
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaY-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
+1999-03-02 09:44:33 10HmaY-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network unreachable
1999-03-02 09:44:33 10HmaY-0005vi-00 => userx@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK"
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaZ-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
+1999-03-02 09:44:33 10HmaZ-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network unreachable
1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK"
1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
@@ -17,11 +17,11 @@
1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbC-0005vi-00 H=V4NET.0.0.2 [V4NET.0.0.2] Network Error
-1999-03-02 09:44:33 10HmbC-0005vi-00 == userx@??? R=r1 T=t1 defer (dd): Network Error
+1999-03-02 09:44:33 10HmbC-0005vi-00 H=V4NET.0.0.2 [V4NET.0.0.2] Network unreachable
+1999-03-02 09:44:33 10HmbC-0005vi-00 == userx@??? R=r1 T=t1 defer (dd): Network unreachable
1999-03-02 09:44:33 Start queue run: pid=p1234
-1999-03-02 09:44:33 10HmbC-0005vi-00 H=V4NET.0.0.2 [V4NET.0.0.2] Network Error
-1999-03-02 09:44:33 10HmbC-0005vi-00 == userx@??? R=r1 T=t1 defer (dd): Network Error
+1999-03-02 09:44:33 10HmbC-0005vi-00 H=V4NET.0.0.2 [V4NET.0.0.2] Network unreachable
+1999-03-02 09:44:33 10HmbC-0005vi-00 == userx@??? R=r1 T=t1 defer (dd): Network unreachable
1999-03-02 09:44:33 10HmbC-0005vi-00 ** userx@???: retry timeout exceeded
1999-03-02 09:44:33 10HmbD-0005vi-00 <= <> R=10HmbC-0005vi-00 U=EXIMUSER P=local S=sss
1999-03-02 09:44:33 10HmbD-0005vi-00 => CALLER <CALLER@???> R=r0 T=t2
diff --git a/test/log/0477 b/test/log/0477
index bd08227a6..1a6cf2336 100644
--- a/test/log/0477
+++ b/test/log/0477
@@ -1,3 +1,3 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=r1 T=t1 defer (dd): Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] Netwk addr not available
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@??? R=r1 T=t1 defer (EEE): Netwk addr not available
diff --git a/test/log/0478 b/test/log/0478
index ca3aafe5c..65fdd424a 100644
--- a/test/log/0478
+++ b/test/log/0478
@@ -6,9 +6,9 @@
******** SERVER ********
1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, -q1h, listening for SMTP on port PORT_D
1999-03-02 09:44:33 Start queue run: pid=p1235
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 == V4NET.0.0.1@??? R=r1 T=t1 defer (dd): Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network unreachable
+1999-03-02 09:44:33 10HmaX-0005vi-00 == V4NET.0.0.1@??? R=r1 T=t1 defer (dd): Network unreachable
1999-03-02 09:44:33 End queue run: pid=p1235
1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@??? H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaY-0005vi-00@???
-1999-03-02 09:44:33 10HmaZ-0005vi-00 H=V4NET.0.0.2 [V4NET.0.0.2] Network Error
-1999-03-02 09:44:33 10HmaZ-0005vi-00 == 127.0.0.1@??? R=r1 T=t1 defer (dd): Network Error
+1999-03-02 09:44:33 10HmaZ-0005vi-00 H=V4NET.0.0.2 [V4NET.0.0.2] Network unreachable
+1999-03-02 09:44:33 10HmaZ-0005vi-00 == 127.0.0.1@??? R=r1 T=t1 defer (dd): Network unreachable
diff --git a/test/log/0613 b/test/log/0613
index 6bbab6433..362241bab 100644
--- a/test/log/0613
+++ b/test/log/0613
@@ -1,9 +1,9 @@
1999-03-02 09:44:33 "Network error" here is expected. We must not get an mua_wrapper fault.
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss for a b c d
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-2.test.ex [V4NET.0.0.2] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-3.test.ex [V4NET.0.0.3] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** a@??? R=smarthost T=remote_smtp: Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** b@??? R=smarthost T=remote_smtp: Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** c@??? R=smarthost T=remote_smtp: Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** d@??? R=smarthost T=remote_smtp: Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-2.test.ex [V4NET.0.0.2] Network unreachable
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-3.test.ex [V4NET.0.0.3] Network unreachable
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** a@??? R=smarthost T=remote_smtp: Network unreachable
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** b@??? R=smarthost T=remote_smtp: Network unreachable
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** c@??? R=smarthost T=remote_smtp: Network unreachable
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** d@??? R=smarthost T=remote_smtp: Network unreachable
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
diff --git a/test/log/3209 b/test/log/3209
index 9fa703510..255f366f8 100644
--- a/test/log/3209
+++ b/test/log/3209
@@ -1,5 +1,5 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 10HmaX-0005vi-00 == x@??? R=lookuphost defer (-1): lookup defer for mx_domains
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-2.test.ex [V4NET.0.0.2] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-3.test.ex [V4NET.0.0.3] Network Error
-1999-03-02 09:44:33 10HmaX-0005vi-00 == x@??? R=lookuphost T=smtp defer (dd): Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-2.test.ex [V4NET.0.0.2] Network unreachable
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-3.test.ex [V4NET.0.0.3] Network unreachable
+1999-03-02 09:44:33 10HmaX-0005vi-00 == x@??? R=lookuphost T=smtp defer (dd): Network unreachable
diff --git a/test/msglog/0197.10HmaX-0005vi-00 b/test/msglog/0197.10HmaX-0005vi-00
index 51efc6228..52ed773b1 100644
--- a/test/msglog/0197.10HmaX-0005vi-00
+++ b/test/msglog/0197.10HmaX-0005vi-00
@@ -1,9 +1,9 @@
1999-03-02 09:44:33 Received from CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 userx@??? <userx@???>: makecopy transport succeeded
1999-03-02 09:44:33 usery@??? <usery@???>: makecopy transport succeeded
-1999-03-02 09:44:33 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
-1999-03-02 09:44:33 userx@??? R=passall T=pass_on defer (dd): Network Error
-1999-03-02 09:44:33 usery@??? R=passall T=pass_on defer (dd): Network Error
-1999-03-02 09:44:33 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
-1999-03-02 09:44:33 userx@??? R=passall T=pass_on defer (dd): Network Error
-1999-03-02 09:44:33 usery@??? R=passall T=pass_on defer (dd): Network Error
+1999-03-02 09:44:33 H=V4NET.0.0.1 [V4NET.0.0.1] Network unreachable
+1999-03-02 09:44:33 userx@??? R=passall T=pass_on defer (dd): Network unreachable
+1999-03-02 09:44:33 usery@??? R=passall T=pass_on defer (dd): Network unreachable
+1999-03-02 09:44:33 H=V4NET.0.0.1 [V4NET.0.0.1] Network unreachable
+1999-03-02 09:44:33 userx@??? R=passall T=pass_on defer (dd): Network unreachable
+1999-03-02 09:44:33 usery@??? R=passall T=pass_on defer (dd): Network unreachable
diff --git a/test/msglog/0197.10HmaY-0005vi-00 b/test/msglog/0197.10HmaY-0005vi-00
index ccb2e78a6..2cab0a8fa 100644
--- a/test/msglog/0197.10HmaY-0005vi-00
+++ b/test/msglog/0197.10HmaY-0005vi-00
@@ -4,7 +4,7 @@
1999-03-02 09:44:33 x@??? R=passall T=pass_on defer (-54): retry time not reached for any host for 'copy.domain'
1999-03-02 09:44:33 y@??? R=passall T=pass_on defer (-54): retry time not reached for any host for 'copy.domain'
1999-03-02 09:44:33 z@elsewhere R=passall T=pass_on defer (-54): retry time not reached for any host for 'elsewhere'
-1999-03-02 09:44:33 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
-1999-03-02 09:44:33 x@??? R=passall T=pass_on defer (dd): Network Error
-1999-03-02 09:44:33 y@??? R=passall T=pass_on defer (dd): Network Error
-1999-03-02 09:44:33 z@elsewhere R=passall T=pass_on defer (dd): Network Error
+1999-03-02 09:44:33 H=V4NET.0.0.1 [V4NET.0.0.1] Network unreachable
+1999-03-02 09:44:33 x@??? R=passall T=pass_on defer (dd): Network unreachable
+1999-03-02 09:44:33 y@??? R=passall T=pass_on defer (dd): Network unreachable
+1999-03-02 09:44:33 z@elsewhere R=passall T=pass_on defer (dd): Network unreachable
diff --git a/test/msglog/0198.10HmaX-0005vi-00 b/test/msglog/0198.10HmaX-0005vi-00
index 858bd1826..457703e4e 100644
--- a/test/msglog/0198.10HmaX-0005vi-00
+++ b/test/msglog/0198.10HmaX-0005vi-00
@@ -1,4 +1,4 @@
1999-03-02 09:44:33 Received from CALLER@??? U=CALLER P=local-bsmtp S=sss id=E10HmaY-0005vi-00@???
1999-03-02 09:44:33 routing failed for usery@???: Unrouteable address
-1999-03-02 09:44:33 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
-1999-03-02 09:44:33 userx@??? R=check_file T=pass_on defer (dd): Network Error
+1999-03-02 09:44:33 H=V4NET.0.0.1 [V4NET.0.0.1] Network unreachable
+1999-03-02 09:44:33 userx@??? R=check_file T=pass_on defer (dd): Network unreachable
diff --git a/test/paniclog/0227 b/test/paniclog/0227
new file mode 100644
index 000000000..ad6f18eac
--- /dev/null
+++ b/test/paniclog/0227
@@ -0,0 +1 @@
+1999-03-02 09:44:33 recipient verify defer (making calloout connection): T=smtp Netwk addr not available
diff --git a/test/paniclog/0365 b/test/paniclog/0365
new file mode 100644
index 000000000..8f1ef57ae
--- /dev/null
+++ b/test/paniclog/0365
@@ -0,0 +1,4 @@
+1999-03-02 09:44:33 recipient verify defer (making calloout connection): T=smtp Network unreachable
+1999-03-02 09:44:33 sender verify defer (making calloout connection): T=smtp Network unreachable
+1999-03-02 09:44:33 recipient verify defer (making calloout connection): T=smtp Network unreachable
+1999-03-02 09:44:33 sender verify defer (making calloout connection): T=smtp Network unreachable
diff --git a/test/rejectlog/0227 b/test/rejectlog/0227
index d0312f3aa..2a536242a 100644
--- a/test/rejectlog/0227
+++ b/test/rejectlog/0227
@@ -8,6 +8,8 @@
1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: Sender verify failed
1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <uncheckable2@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 Bad-char error for <> topbitchar:\200\377\377
1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<uncheckable2@localhost1> rejected RCPT <z@???>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify defer for <bindfail@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Netwk addr not available
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<bindfail@localhost1> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
1999-03-02 09:44:33 H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@???>: 550 Recipient not liked
1999-03-02 09:44:33 H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@???>: 550-Recipient not liked on two lines\n550 Here's the second
1999-03-02 09:44:33 H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@???>: 550 Recipient not liked, with bad char:\200\377\377
diff --git a/test/rejectlog/0365 b/test/rejectlog/0365
index 5335915e3..ac654f9e3 100644
--- a/test/rejectlog/0365
+++ b/test/rejectlog/0365
@@ -20,7 +20,7 @@ P Received: from CALLER (helo=test)
F From: bad@domain
I Message-Id: <E10HmaY-0005vi-00@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000
-1999-03-02 09:44:33 U=CALLER sender verify defer for <callout@x>: Could not complete sender verify callout: V4NET.0.0.0 [V4NET.0.0.0] : Network Error
+1999-03-02 09:44:33 U=CALLER sender verify defer for <callout@x>: Could not complete sender verify callout: V4NET.0.0.0 [V4NET.0.0.0] : Network unreachable
1999-03-02 09:44:33 U=CALLER F=<callout@x> temporarily rejected RCPT <x@y>: Could not complete sender verify callout
1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<nosyntax@x> rejected after DATA
Envelope-from: <nosyntax@x>
@@ -45,15 +45,15 @@ P Received: from CALLER (helo=test)
F From: <unverifiable@y>
I Message-Id: <E10HmbA-0005vi-00@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000
-1999-03-02 09:44:33 U=CALLER F=<recipcallout@y> temporarily rejected RCPT <callout@y>: Could not complete recipient verify callout: V4NET.0.0.0 [V4NET.0.0.0] : Network Error
+1999-03-02 09:44:33 U=CALLER F=<recipcallout@y> temporarily rejected RCPT <callout@y>: Could not complete recipient verify callout: V4NET.0.0.0 [V4NET.0.0.0] : Network unreachable
1999-03-02 09:44:33 U=CALLER F=<> rejected RCPT <cantverify.fail@y>: failure message
1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <cantverify.defer@y>: defer message
1999-03-02 09:44:33 10HmbB-0005vi-00 U=CALLER F=<> rejected after DATA: '>' missing at end of address: failing address in "From:" header is: <bad@syntax
1999-03-02 09:44:33 10HmbC-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
-1999-03-02 09:44:33 U=CALLER sender verify defer for <callout@x>: Could not complete sender verify callout: V4NET.0.0.0 [V4NET.0.0.0] : Network Error
+1999-03-02 09:44:33 U=CALLER sender verify defer for <callout@x>: Could not complete sender verify callout: V4NET.0.0.0 [V4NET.0.0.0] : Network unreachable
1999-03-02 09:44:33 U=CALLER F=<callout@x> temporarily rejected RCPT <x@y>: Could not complete sender verify callout
1999-03-02 09:44:33 10HmbD-0005vi-00 U=CALLER F=<nosyntax@x> rejected after DATA
1999-03-02 09:44:33 10HmbE-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
-1999-03-02 09:44:33 U=CALLER F=<recipcallout@y> temporarily rejected RCPT <callout@y>: Could not complete recipient verify callout: V4NET.0.0.0 [V4NET.0.0.0] : Network Error
+1999-03-02 09:44:33 U=CALLER F=<recipcallout@y> temporarily rejected RCPT <callout@y>: Could not complete recipient verify callout: V4NET.0.0.0 [V4NET.0.0.0] : Network unreachable
1999-03-02 09:44:33 U=CALLER F=<> rejected RCPT <cantverify.fail@y>: failure message
1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <cantverify.defer@y>: defer message
diff --git a/test/runtest b/test/runtest
index 53e12d412..e47a4d2a6 100755
--- a/test/runtest
+++ b/test/runtest
@@ -845,10 +845,10 @@ RESET_AFTER_EXTRA_LINE_READ:
# ======== IP error numbers and messages ========
# These vary between operating systems
- s/Can(no|')t assign requested address/Network Error/;
+ s/Can(no|')t assign requested address/Netwk addr not available/;
s/Operation timed out/Connection timed out/;
s/Address family not supported by protocol family/Network Error/;
- s/Network( is)? unreachable/Network Error/;
+ s/Network( is)? unreachable/Network unreachable/;
s/Invalid argument/Network Error/;
s/\(\d+\): Network/(dd): Network/;
diff --git a/test/scripts/0000-Basic/0227 b/test/scripts/0000-Basic/0227
index e7b6d1ee9..dcb2b97ce 100644
--- a/test/scripts/0000-Basic/0227
+++ b/test/scripts/0000-Basic/0227
@@ -111,6 +111,17 @@ MAIL FROM:<uncheckable2@localhost1>
RCPT TO:<z@???>
QUIT
****
+# sender, fail to bind local IP
+sudo exim -v -bs -oMa V4NET.0.0.1
+HELO test
+MAIL FROM:<bindfail@localhost1>
+RCPT TO:<z@???>
+QUIT
+****
+#
+#
+#
+#
server PORT_S
220 Server ready
EHLO
diff --git a/test/stderr/0227 b/test/stderr/0227
index e45edf686..7150fbd72 100644
--- a/test/stderr/0227
+++ b/test/stderr/0227
@@ -115,6 +115,18 @@ LOG: smtp_connection MAIN
SMTP connection from root D=qqs closed by QUIT
LOG: smtp_connection MAIN
SMTP connection from root
+Connecting to 127.0.0.1 [127.0.0.1]:PORT_S from 1.1.1.1 ... unable to bind outgoing SMTP call to 1.1.1.1: Netwk addr not available
+ failed: Netwk addr not available
+LOG: MAIN PANIC
+ recipient verify defer (making calloout connection): T=smtp Netwk addr not available
+LOG: MAIN REJECT
+ H=(test) [V4NET.0.0.1] U=root sender verify defer for <bindfail@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Netwk addr not available
+LOG: MAIN REJECT
+ H=(test) [V4NET.0.0.1] U=root F=<bindfail@localhost1> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
+LOG: smtp_connection MAIN
+ SMTP connection from root D=qqs closed by QUIT
+LOG: smtp_connection MAIN
+ SMTP connection from root
Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
diff --git a/test/stderr/0365 b/test/stderr/0365
new file mode 100644
index 000000000..8f1ef57ae
--- /dev/null
+++ b/test/stderr/0365
@@ -0,0 +1,4 @@
+1999-03-02 09:44:33 recipient verify defer (making calloout connection): T=smtp Network unreachable
+1999-03-02 09:44:33 sender verify defer (making calloout connection): T=smtp Network unreachable
+1999-03-02 09:44:33 recipient verify defer (making calloout connection): T=smtp Network unreachable
+1999-03-02 09:44:33 sender verify defer (making calloout connection): T=smtp Network unreachable
diff --git a/test/stderr/0388 b/test/stderr/0388
index 276962f6b..f30f90774 100644
--- a/test/stderr/0388
+++ b/test/stderr/0388
@@ -130,7 +130,7 @@ set_process_info: pppp delivering 10HmaX-0005vi-00 to V4NET.0.0.0 [V4NET.0.0.0]:
Connecting to V4NET.0.0.0 [V4NET.0.0.0]:PORT_S ... V4NET.0.0.0 in hosts_try_fastopen?
failed: Network Error
LOG: MAIN
- H=V4NET.0.0.0 [V4NET.0.0.0] Network Error
+ H=V4NET.0.0.0 [V4NET.0.0.0] Network unreachable
set_process_info: pppp delivering 10HmaX-0005vi-00: just tried V4NET.0.0.0 [V4NET.0.0.0]:PORT_S for x@y: result DEFER
added retry item for T:V4NET.0.0.0:V4NET.0.0.0:PORT_S: errno=dd more_errno=dd,A flags=2
set_process_info: pppp delivering 10HmaX-0005vi-00: waiting for a remote delivery subprocess to finish
@@ -142,7 +142,7 @@ reading retry information for R:x@y from subprocess
added retry item
set_process_info: pppp delivering 10HmaX-0005vi-00
LOG: MAIN
- == x@y R=r1 T=smtp defer (dd): Network Error H=127.0.0.1 [127.0.0.1]
+ == x@y R=r1 T=smtp defer (dd): Network unreachable H=127.0.0.1 [127.0.0.1]
changed uid/gid: post-delivery tidying
uid=EXIM_UID gid=EXIM_GID pid=p1234
set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00
@@ -183,7 +183,7 @@ failing_interval=ttt message_age=ttt
on queue longer than maximum retry
Writing retry data for T:V4NET.0.0.0:V4NET.0.0.0:PORT_S
first failed=dddd last try=dddd next try=+0 expired=0
- errno=dd more_errno=dd,A Network Error
+ errno=dd more_errno=dd,A Network unreachable
dbfn_write: key=T:V4NET.0.0.0:V4NET.0.0.0:PORT_S
timed out: all retries expired
LOG: MAIN
diff --git a/test/stderr/0613 b/test/stderr/0613
index f884103f3..9c520f300 100644
--- a/test/stderr/0613
+++ b/test/stderr/0613
@@ -1 +1 @@
-Delivery failed: Network Error
+Delivery failed: Network unreachable
diff --git a/test/stdout/0227 b/test/stdout/0227
index 5c9ed50e7..5eabc24ee 100644
--- a/test/stdout/0227
+++ b/test/stdout/0227
@@ -48,6 +48,11 @@
550 Sender verify failed
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello root at test [V4NET.0.0.1]
+250 OK
+451 Could not complete sender verify callout
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 myhost.test.ex Hello root at test [V4NET.0.0.3]
250 OK
550-Callout verification failed:
diff --git a/test/stdout/0365 b/test/stdout/0365
index fcd35a9b5..236ff9629 100644
--- a/test/stdout/0365
+++ b/test/stdout/0365
@@ -42,7 +42,7 @@
550-Rejected after DATA: could not verify "From:" header address
550 bad@domain: Unrouteable address
250 OK
-451-Could not complete sender verify callout: V4NET.0.0.0 [V4NET.0.0.0] : Network Error
+451-Could not complete sender verify callout: V4NET.0.0.0 [V4NET.0.0.0] : Network unreachable
451-Could not complete sender verify callout for <callout@x>.
451-The mail server(s) for the domain may be temporarily unreachable, or
451-they may be permanently unreachable from this server. In the latter case,
--
## subscription configuration (requires account):
##
https://lists.exim.org/mailman3/postorius/lists/exim-cvs.lists.exim.org/
## unsubscribe (doesn't require an account):
## exim-cvs-unsubscribe@???
## Exim details at
http://www.exim.org/
## Please use the Wiki with this list -
http://wiki.exim.org/
