Testsuite: munge for FreeBSD

diff --git a/test/log/0098 b/test/log/0098
index a42e7ac196c14bf1498d644214c2e59dc194636d..0175d0db0e9c0e408cac377de4171d319edf686d 100644 (file)
--- a/test/log/0098
+++ b/test/log/0098
@@ -21,8 +21,8 @@
 1999-03-02 09:44:33 10HmbA-000000005vi-0000 Completed
 1999-03-02 09:44:33 End queue run: pid=p1235 -qf
 1999-03-02 09:44:33 10HmbB-000000005vi-0000 <= CALLER@test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbB-000000005vi-0000 H=V4NET.0.0.1 [V4NET.0.0.1] Network unreachable
-1999-03-02 09:44:33 10HmbB-000000005vi-0000 == xxxx@some.domain R=all T=smtp defer (dd): Network unreachable
+1999-03-02 09:44:33 10HmbB-000000005vi-0000 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
+1999-03-02 09:44:33 10HmbB-000000005vi-0000 == xxxx@some.domain R=all T=smtp defer (dd): Network Error
 1999-03-02 09:44:33 Start queue run: pid=p1236 -qf
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 == defer@test.ex R=alias defer (-1): This address has been forced to defer.
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 == |/non/existing/file <userx@test.ex> R=userforward defer (-30): pipe_transport unset in userforward router
@@ -31,8 +31,8 @@
 1999-03-02 09:44:33 10HmbC-000000005vi-0000 Completed
 1999-03-02 09:44:33 10HmaZ-000000005vi-0000 == defer@another.test.ex R=alias defer (-1): This address has been forced to defer.
 1999-03-02 09:44:33 10HmaZ-000000005vi-0000 == defer@test.ex R=alias defer (-1): This address has been forced to defer.
-1999-03-02 09:44:33 10HmbB-000000005vi-0000 H=V4NET.0.0.1 [V4NET.0.0.1] Network unreachable
-1999-03-02 09:44:33 10HmbB-000000005vi-0000 == xxxx@some.domain R=all T=smtp defer (dd): Network unreachable
+1999-03-02 09:44:33 10HmbB-000000005vi-0000 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
+1999-03-02 09:44:33 10HmbB-000000005vi-0000 == xxxx@some.domain R=all T=smtp defer (dd): Network Error
 1999-03-02 09:44:33 End queue run: pid=p1236 -qf
 1999-03-02 09:44:33 10HmbD-000000005vi-0000 <= CALLER@test.ex U=CALLER P=local S=sss
 1999-03-02 09:44:33 10HmbD-000000005vi-0000 H=127.0.0.1 [127.0.0.1] Connection refused
@@ -65,8 +65,8 @@
 1999-03-02 09:44:33 10HmbF-000000005vi-0000 <= <> R=10HmaZ-000000005vi-0000 U=EXIMUSER P=local S=sss T="Warning: message 10HmaZ-000000005vi-0000 delayed by 0 minutes"
 1999-03-02 09:44:33 10HmbF-000000005vi-0000 => CALLER <CALLER@test.ex> R=localuser T=local_delivery
 1999-03-02 09:44:33 10HmbF-000000005vi-0000 Completed
-1999-03-02 09:44:33 10HmbB-000000005vi-0000 H=V4NET.0.0.1 [V4NET.0.0.1] Network unreachable
-1999-03-02 09:44:33 10HmbB-000000005vi-0000 == xxxx@some.domain R=all T=smtp defer (dd): Network unreachable
+1999-03-02 09:44:33 10HmbB-000000005vi-0000 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
+1999-03-02 09:44:33 10HmbB-000000005vi-0000 == xxxx@some.domain R=all T=smtp defer (dd): Network Error
 1999-03-02 09:44:33 10HmbG-000000005vi-0000 <= <> R=10HmbB-000000005vi-0000 U=EXIMUSER P=local S=sss T="Warning: message 10HmbB-000000005vi-0000 delayed by 0 minutes"
 1999-03-02 09:44:33 10HmbG-000000005vi-0000 => CALLER <CALLER@test.ex> R=localuser T=local_delivery
 1999-03-02 09:44:33 10HmbG-000000005vi-0000 Completed

diff --git a/test/log/0135 b/test/log/0135
index 0ef442e7ed3129554f5ceaf79fc0dd363dee8930..64dc4a2310b3bc454962b13c791732ede634b8d6 100644 (file)
--- 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-000000005vi-0000 == c@test.ex 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-000000005vi-0000 == d@test.ex 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-000000005vi-0000 H=V4NET.0.0.1 [V4NET.0.0.1] Network unreachable
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 == a@unknown.ex R=default T=smtp defer (dd): Network unreachable
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=V4NET.0.0.0 [V4NET.0.0.0] Network unreachable
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 == b@known.ex R=default T=smtp defer (dd): Network unreachable
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 == a@unknown.ex R=default T=smtp defer (dd): Network Error
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=V4NET.0.0.0 [V4NET.0.0.0] Network Error
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 == b@known.ex R=default T=smtp defer (dd): Network Error
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 ** b@known.ex: retry timeout exceeded
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 ** c@test.ex: retry timeout exceeded
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 <= <> R=10HmaX-000000005vi-0000 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-000000005vi-0000 == d@test.ex 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-000000005vi-0000 H=V4NET.0.0.1 [V4NET.0.0.1] Network unreachable
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 == a@unknown.ex R=default T=smtp defer (dd): Network unreachable
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 == a@unknown.ex R=default T=smtp defer (dd): Network Error
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 ** a@unknown.ex: retry timeout exceeded
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 ** d@test.ex: retry timeout exceeded
 1999-03-02 09:44:33 10HmaZ-000000005vi-0000 <= <> R=10HmaX-000000005vi-0000 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-000000005vi-0000 <= <> U=CALLER P=local S=sss
 1999-03-02 09:44:33 Start queue run: pid=p1237
-1999-03-02 09:44:33 10HmbA-000000005vi-0000 H=V4NET.0.0.0 [V4NET.0.0.0] Network unreachable
-1999-03-02 09:44:33 10HmbA-000000005vi-0000 == b@known.ex R=default T=smtp defer (dd): Network unreachable
+1999-03-02 09:44:33 10HmbA-000000005vi-0000 H=V4NET.0.0.0 [V4NET.0.0.0] Network Error
+1999-03-02 09:44:33 10HmbA-000000005vi-0000 == b@known.ex R=default T=smtp defer (dd): Network Error
 1999-03-02 09:44:33 10HmbA-000000005vi-0000 ** b@known.ex: retry timeout exceeded
 1999-03-02 09:44:33 10HmbA-000000005vi-0000 b@known.ex: error ignored
 1999-03-02 09:44:33 10HmbA-000000005vi-0000 Completed

diff --git a/test/log/0197 b/test/log/0197
index 0d66da932fc8ba8ef238bbf12c612c85c7dee331..31bde4a4966cec9bd4ad32e2a5d064f3f803c6cf 100644 (file)
--- a/test/log/0197
+++ b/test/log/0197
@@ -1,9 +1,9 @@
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 <= CALLER@the.local.host.name U=CALLER P=local S=sss
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 => userx@copy.domain R=checkcopy T=makecopy
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 -> usery@copy.domain R=checkcopy T=makecopy
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=V4NET.0.0.1 [V4NET.0.0.1] Network unreachable
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 == userx@copy.domain R=passall T=pass_on defer (dd): Network unreachable
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 == usery@copy.domain R=passall T=pass_on defer (dd): Network unreachable
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 == userx@copy.domain R=passall T=pass_on defer (dd): Network Error
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 == usery@copy.domain R=passall T=pass_on defer (dd): Network Error
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 <= doesn't@matter U=CALLER P=local-smtp S=sss
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 => x@copy.domain R=checkcopy T=makecopy
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 -> y@copy.domain R=checkcopy T=makecopy
@@ -11,11 +11,11 @@
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 == y@copy.domain R=passall T=pass_on defer (-54): retry time not reached for any host for 'copy.domain'
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 == 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-000000005vi-0000 H=V4NET.0.0.1 [V4NET.0.0.1] Network unreachable
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 == userx@copy.domain R=passall T=pass_on defer (dd): Network unreachable
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 == usery@copy.domain R=passall T=pass_on defer (dd): Network unreachable
-1999-03-02 09:44:33 10HmaY-000000005vi-0000 H=V4NET.0.0.1 [V4NET.0.0.1] Network unreachable
-1999-03-02 09:44:33 10HmaY-000000005vi-0000 == x@copy.domain R=passall T=pass_on defer (dd): Network unreachable
-1999-03-02 09:44:33 10HmaY-000000005vi-0000 == y@copy.domain R=passall T=pass_on defer (dd): Network unreachable
-1999-03-02 09:44:33 10HmaY-000000005vi-0000 == z@elsewhere R=passall T=pass_on defer (dd): Network unreachable
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 == userx@copy.domain R=passall T=pass_on defer (dd): Network Error
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 == usery@copy.domain R=passall T=pass_on defer (dd): Network Error
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 == x@copy.domain R=passall T=pass_on defer (dd): Network Error
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 == y@copy.domain R=passall T=pass_on defer (dd): Network Error
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 == z@elsewhere R=passall T=pass_on defer (dd): Network Error
 1999-03-02 09:44:33 End queue run: pid=p1234 -qf

diff --git a/test/log/0198 b/test/log/0198
index c7ebc6af9620521c7363f5c0bb4a93643f7010b0..af7e2a594a7cf7f0cac07ec91ac3128164c106d6 100644 (file)
--- a/test/log/0198
+++ b/test/log/0198
@@ -1,7 +1,7 @@
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 <= CALLER@the.local.host.name U=CALLER P=local-bsmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 ** usery@copy.domain: Unrouteable address
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=V4NET.0.0.1 [V4NET.0.0.1] Network unreachable
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 == userx@copy.domain R=check_file T=pass_on defer (dd): Network unreachable
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 == userx@copy.domain R=check_file T=pass_on defer (dd): Network Error
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 <= <> R=10HmaX-000000005vi-0000 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 == CALLER@the.local.host.name 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 10HmaZ-000000005vi-0000 <= doesn't@matter U=CALLER P=local-bsmtp S=sss id=E10HmaY-0005vi-00@the.local.host.name

diff --git a/test/log/0257 b/test/log/0257
index ccd0684c9df8b51b988d5c6200758378112518af..e1c62af22b128f0d8240a46d096f89715275d3f8 100644 (file)
--- a/test/log/0257
+++ b/test/log/0257
@@ -1,4 +1,4 @@
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 <= CALLER@test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-1.test.ex [V4NET.0.0.1] Network unreachable
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-2.test.ex [V4NET.0.0.2] Network unreachable
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 == abcd@ten-1.test.ex R=all T=smtp defer (dd): Network unreachable
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-1.test.ex [V4NET.0.0.1] Network Error
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-2.test.ex [V4NET.0.0.2] Network Error
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 == abcd@ten-1.test.ex R=all T=smtp defer (dd): Network Error

diff --git a/test/log/0365 b/test/log/0365
index 3d9097992b865d12d3b72d5b679e276df41c43f9..a484a8b17b00456e5fa7f140b84f69d52aa3fedc 100644 (file)
--- a/test/log/0365
+++ b/test/log/0365
@@ -1,22 +1,22 @@
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 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-000000005vi-0000 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
-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 recipient verify defer (making calloout connection): T=smtp 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 Error
 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-000000005vi-0000 U=CALLER F=<nosyntax@x> rejected after DATA
 1999-03-02 09:44:33 10HmbA-000000005vi-0000 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
-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 sender verify defer (making calloout connection): T=smtp 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 Error
 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-000000005vi-0000 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-000000005vi-0000 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
-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 recipient verify defer (making calloout connection): T=smtp 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 Error
 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-000000005vi-0000 U=CALLER F=<nosyntax@x> rejected after DATA
 1999-03-02 09:44:33 10HmbE-000000005vi-0000 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
-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 sender verify defer (making calloout connection): T=smtp 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 Error
 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 94209408731c3959b7efbdbb7c2f9ab0db5e4a11..a7843400f82329cbfcb2f30393a0e1e4b912f96c 100644 (file)
--- a/test/log/0366
+++ b/test/log/0366
@@ -1,21 +1,21 @@
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 <= CALLER@test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-3.test.ex [V4NET.0.0.3] Network unreachable
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-5.test.ex [V4NET.0.0.5] Network unreachable
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-4.test.ex [V4NET.0.0.4] Network unreachable
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-2.test.ex [V4NET.0.0.2] Network unreachable
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-1.test.ex [V4NET.0.0.1] Network unreachable
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=black-2.test.ex [V4NET.11.12.14] Network unreachable
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 == userx@mxt99.test.ex R=r1 T=smtp defer (dd): Network unreachable
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-3.test.ex [V4NET.0.0.3] Network Error
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-5.test.ex [V4NET.0.0.5] Network Error
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-4.test.ex [V4NET.0.0.4] Network Error
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-2.test.ex [V4NET.0.0.2] Network Error
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-1.test.ex [V4NET.0.0.1] Network Error
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=black-2.test.ex [V4NET.11.12.14] Network Error
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 == userx@mxt99.test.ex R=r1 T=smtp defer (dd): Network Error
 1999-03-02 09:44:33 Start queue run: pid=p1234
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-3.test.ex [V4NET.0.0.3] Network unreachable
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-5.test.ex [V4NET.0.0.5] Network unreachable
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-4.test.ex [V4NET.0.0.4] Network unreachable
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-2.test.ex [V4NET.0.0.2] Network unreachable
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-1.test.ex [V4NET.0.0.1] Network unreachable
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-6.test.ex [V4NET.0.0.6] Network unreachable
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=black-2.test.ex [V4NET.11.12.14] Network unreachable
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=black-1.test.ex [V4NET.11.12.13] Network unreachable
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 == userx@mxt99.test.ex R=r1 T=smtp defer (dd): Network unreachable
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-3.test.ex [V4NET.0.0.3] Network Error
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-5.test.ex [V4NET.0.0.5] Network Error
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-4.test.ex [V4NET.0.0.4] Network Error
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-2.test.ex [V4NET.0.0.2] Network Error
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-1.test.ex [V4NET.0.0.1] Network Error
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-6.test.ex [V4NET.0.0.6] Network Error
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=black-2.test.ex [V4NET.11.12.14] Network Error
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=black-1.test.ex [V4NET.11.12.13] Network Error
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 == userx@mxt99.test.ex R=r1 T=smtp defer (dd): Network Error
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 ** userx@mxt99.test.ex: retry timeout exceeded
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 <= <> R=10HmaX-000000005vi-0000 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 ** CALLER@test.ex: Unrouteable address

diff --git a/test/log/0388 b/test/log/0388
index 1cd8eeee1b91a6d5dac7889e8026f652917fbf8a..5a6a3864a2b12ed8b55b3c5c6e0642b79fba5aa0 100644 (file)
--- a/test/log/0388
+++ b/test/log/0388
@@ -1,7 +1,7 @@
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 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-000000005vi-0000 H=V4NET.0.0.0 [V4NET.0.0.0] Network unreachable
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 == 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-000000005vi-0000 H=V4NET.0.0.0 [V4NET.0.0.0] Network Error
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 == 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-000000005vi-0000 ** x@y: retry timeout exceeded
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 <= <> R=10HmaX-000000005vi-0000 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 => :blackhole: <CALLER@myhost.test.ex> R=r0

diff --git a/test/log/0455 b/test/log/0455
index 318ba369fc0a72e3994f94bb08234cc626700c5a..8070904608129078fbb3cdb2c2eeafbc97ca0ad9 100644 (file)
--- a/test/log/0455
+++ b/test/log/0455
@@ -1,12 +1,12 @@
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 <= CALLER@test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-3.test.ex [V4NET.0.0.3] Network unreachable
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 == userx@mxt97.test.ex R=r1 T=smtp defer (dd): Network unreachable
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-3.test.ex [V4NET.0.0.3] Network Error
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 == userx@mxt97.test.ex R=r1 T=smtp defer (dd): Network Error
 1999-03-02 09:44:33 Start queue run: pid=p1234
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-3.test.ex [V4NET.0.0.3] Network unreachable
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-4.test.ex [V4NET.0.0.4] Network unreachable
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-2.test.ex [V4NET.0.0.2] Network unreachable
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-1.test.ex [V4NET.0.0.1] Network unreachable
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 == userx@mxt97.test.ex R=r1 T=smtp defer (dd): Network unreachable
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-3.test.ex [V4NET.0.0.3] Network Error
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-4.test.ex [V4NET.0.0.4] Network Error
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-2.test.ex [V4NET.0.0.2] Network Error
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-1.test.ex [V4NET.0.0.1] Network Error
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 == userx@mxt97.test.ex R=r1 T=smtp defer (dd): Network Error
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 ** userx@mxt97.test.ex: retry timeout exceeded
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 <= <> R=10HmaX-000000005vi-0000 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 no immediate delivery: queued by ACL

diff --git a/test/log/0461 b/test/log/0461
index b4cd81b073145f48a3668955fdde5c2c794b80e4..d8a68f549efec9d9df07a17fb3c63f2f6456560c 100644 (file)
--- a/test/log/0461
+++ b/test/log/0461
@@ -1,13 +1,13 @@
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 <= CALLER@test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=V4NET.0.0.1 [V4NET.0.0.1] Network unreachable
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 => userx@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 Completed
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 <= CALLER@test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaY-000000005vi-0000 H=V4NET.0.0.1 [V4NET.0.0.1] Network unreachable
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 => userx@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 Completed
 1999-03-02 09:44:33 10HmaZ-000000005vi-0000 <= CALLER@test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaZ-000000005vi-0000 H=V4NET.0.0.1 [V4NET.0.0.1] Network unreachable
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
 1999-03-02 09:44:33 10HmaZ-000000005vi-0000 => userx@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmaZ-000000005vi-0000 Completed
 1999-03-02 09:44:33 10HmbA-000000005vi-0000 <= CALLER@test.ex U=CALLER P=local S=sss
@@ -17,11 +17,11 @@
 1999-03-02 09:44:33 10HmbB-000000005vi-0000 Completed
 1999-03-02 09:44:33 10HmbA-000000005vi-0000 Completed
 1999-03-02 09:44:33 10HmbC-000000005vi-0000 <= CALLER@test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbC-000000005vi-0000 H=V4NET.0.0.2 [V4NET.0.0.2] Network unreachable
-1999-03-02 09:44:33 10HmbC-000000005vi-0000 == userx@test.ex R=r1 T=t1 defer (dd): Network unreachable
+1999-03-02 09:44:33 10HmbC-000000005vi-0000 H=V4NET.0.0.2 [V4NET.0.0.2] Network Error
+1999-03-02 09:44:33 10HmbC-000000005vi-0000 == userx@test.ex R=r1 T=t1 defer (dd): Network Error
 1999-03-02 09:44:33 Start queue run: pid=p1234
-1999-03-02 09:44:33 10HmbC-000000005vi-0000 H=V4NET.0.0.2 [V4NET.0.0.2] Network unreachable
-1999-03-02 09:44:33 10HmbC-000000005vi-0000 == userx@test.ex R=r1 T=t1 defer (dd): Network unreachable
+1999-03-02 09:44:33 10HmbC-000000005vi-0000 H=V4NET.0.0.2 [V4NET.0.0.2] Network Error
+1999-03-02 09:44:33 10HmbC-000000005vi-0000 == userx@test.ex R=r1 T=t1 defer (dd): Network Error
 1999-03-02 09:44:33 10HmbC-000000005vi-0000 ** userx@test.ex: retry timeout exceeded
 1999-03-02 09:44:33 10HmbD-000000005vi-0000 <= <> R=10HmbC-000000005vi-0000 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmbD-000000005vi-0000 => CALLER <CALLER@test.ex> R=r0 T=t2

diff --git a/test/log/0478 b/test/log/0478
index 85b10930da908036401119922d90c28b1a990f43..95a3c4311d25adc621ec655202f8f49fe8669a73 100644 (file)
--- 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-000000005vi-0000 H=V4NET.0.0.1 [V4NET.0.0.1] Network unreachable
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 == V4NET.0.0.1@test.ex R=r1 T=t1 defer (dd): Network unreachable
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 == V4NET.0.0.1@test.ex R=r1 T=t1 defer (dd): Network Error
 1999-03-02 09:44:33 End queue run: pid=p1235
 1999-03-02 09:44:33 10HmaZ-000000005vi-0000 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaY-000000005vi-0000@the.local.host.name
-1999-03-02 09:44:33 10HmaZ-000000005vi-0000 H=V4NET.0.0.2 [V4NET.0.0.2] Network unreachable
-1999-03-02 09:44:33 10HmaZ-000000005vi-0000 == 127.0.0.1@test.ex R=r1 T=t1 defer (dd): Network unreachable
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 H=V4NET.0.0.2 [V4NET.0.0.2] Network Error
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 == 127.0.0.1@test.ex R=r1 T=t1 defer (dd): Network Error

diff --git a/test/log/0613 b/test/log/0613
index 7637fde4683fe8365fff968813235e60d984f937..e9969c893b550793cbe1330d9594e650e5d2e165 100644 (file)
--- 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-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for a b c d
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-2.test.ex [V4NET.0.0.2] Network unreachable
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-3.test.ex [V4NET.0.0.3] Network unreachable
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 ** a@myhost.test.ex R=smarthost T=remote_smtp: Network unreachable
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 ** b@myhost.test.ex R=smarthost T=remote_smtp: Network unreachable
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 ** c@myhost.test.ex R=smarthost T=remote_smtp: Network unreachable
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 ** d@myhost.test.ex R=smarthost T=remote_smtp: Network unreachable
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-2.test.ex [V4NET.0.0.2] Network Error
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-3.test.ex [V4NET.0.0.3] Network Error
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 ** a@myhost.test.ex R=smarthost T=remote_smtp: Network Error
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 ** b@myhost.test.ex R=smarthost T=remote_smtp: Network Error
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 ** c@myhost.test.ex R=smarthost T=remote_smtp: Network Error
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 ** d@myhost.test.ex R=smarthost T=remote_smtp: Network Error
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 Completed

diff --git a/test/log/3209 b/test/log/3209
index 80c2e076614f2170c9ebb0f1da960aa18374bfff..8f61ba3e44e4ead1b4db4ae3f08ee7e8fdcbae74 100644 (file)
--- a/test/log/3209
+++ b/test/log/3209
@@ -1,5 +1,5 @@
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 <= CALLER@test.ex U=CALLER P=local S=sss
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 == x@ten-1.test.ex R=lookuphost defer (-1): lookup defer for mx_domains
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-2.test.ex [V4NET.0.0.2] Network unreachable
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-3.test.ex [V4NET.0.0.3] Network unreachable
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 == x@mxt7.test.ex R=lookuphost T=smtp defer (dd): Network unreachable
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-2.test.ex [V4NET.0.0.2] Network Error
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=ten-3.test.ex [V4NET.0.0.3] Network Error
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 == x@mxt7.test.ex R=lookuphost T=smtp defer (dd): Network Error

diff --git a/test/msglog/0197.10HmaX-000000005vi-0000 b/test/msglog/0197.10HmaX-000000005vi-0000
index 52ed773b1235cda9271b924f83bf68fd399e5d77..51efc622893e1b88925ae73dad4991886b32604c 100644 (file)
--- a/test/msglog/0197.10HmaX-000000005vi-0000
+++ b/test/msglog/0197.10HmaX-000000005vi-0000
@@ -1,9 +1,9 @@
 1999-03-02 09:44:33 Received from CALLER@the.local.host.name U=CALLER P=local S=sss
 1999-03-02 09:44:33 userx@copy.domain <userx@copy.domain>: makecopy transport succeeded
 1999-03-02 09:44:33 usery@copy.domain <usery@copy.domain>: makecopy transport succeeded
-1999-03-02 09:44:33 H=V4NET.0.0.1 [V4NET.0.0.1] Network unreachable
-1999-03-02 09:44:33 userx@copy.domain R=passall T=pass_on defer (dd): Network unreachable
-1999-03-02 09:44:33 usery@copy.domain 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@copy.domain R=passall T=pass_on defer (dd): Network unreachable
-1999-03-02 09:44:33 usery@copy.domain 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 Error
+1999-03-02 09:44:33 userx@copy.domain R=passall T=pass_on defer (dd): Network Error
+1999-03-02 09:44:33 usery@copy.domain 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@copy.domain R=passall T=pass_on defer (dd): Network Error
+1999-03-02 09:44:33 usery@copy.domain R=passall T=pass_on defer (dd): Network Error

diff --git a/test/msglog/0197.10HmaY-000000005vi-0000 b/test/msglog/0197.10HmaY-000000005vi-0000
index 2cab0a8fad52519dc48439674558c0d760e27388..ccb2e78a68f7cf96967328a9f018f42e771b2f5e 100644 (file)
--- a/test/msglog/0197.10HmaY-000000005vi-0000
+++ b/test/msglog/0197.10HmaY-000000005vi-0000
@@ -4,7 +4,7 @@
 1999-03-02 09:44:33 x@copy.domain R=passall T=pass_on defer (-54): retry time not reached for any host for 'copy.domain'
 1999-03-02 09:44:33 y@copy.domain 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 unreachable
-1999-03-02 09:44:33 x@copy.domain R=passall T=pass_on defer (dd): Network unreachable
-1999-03-02 09:44:33 y@copy.domain 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
+1999-03-02 09:44:33 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
+1999-03-02 09:44:33 x@copy.domain R=passall T=pass_on defer (dd): Network Error
+1999-03-02 09:44:33 y@copy.domain 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

diff --git a/test/msglog/0198.10HmaX-000000005vi-0000 b/test/msglog/0198.10HmaX-000000005vi-0000
index 54a0dd91763b371f7fcfb9cff8e3787972e1446c..c632f918765491a6f2b33143c40204d52484cb88 100644 (file)
--- a/test/msglog/0198.10HmaX-000000005vi-0000
+++ b/test/msglog/0198.10HmaX-000000005vi-0000
@@ -1,4 +1,4 @@
 1999-03-02 09:44:33 Received from CALLER@the.local.host.name U=CALLER P=local-bsmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name
 1999-03-02 09:44:33 routing failed for usery@copy.domain: Unrouteable address
-1999-03-02 09:44:33 H=V4NET.0.0.1 [V4NET.0.0.1] Network unreachable
-1999-03-02 09:44:33 userx@copy.domain R=check_file T=pass_on defer (dd): Network unreachable
+1999-03-02 09:44:33 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error
+1999-03-02 09:44:33 userx@copy.domain R=check_file T=pass_on defer (dd): Network Error

diff --git a/test/paniclog/0365 b/test/paniclog/0365
index 8f1ef57ae9892f04a5958acb0350154cdba5efe2..6d8f24bceef78cfac7ffd319ce33e0be191889e5 100644 (file)
--- a/test/paniclog/0365
+++ b/test/paniclog/0365
@@ -1,4 +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
+1999-03-02 09:44:33 recipient verify defer (making calloout connection): T=smtp Network Error
+1999-03-02 09:44:33 sender verify defer (making calloout connection): T=smtp Network Error
+1999-03-02 09:44:33 recipient verify defer (making calloout connection): T=smtp Network Error
+1999-03-02 09:44:33 sender verify defer (making calloout connection): T=smtp Network Error

diff --git a/test/rejectlog/0365 b/test/rejectlog/0365
index 3488604f1f82037c2e777830b30674b4db61ec6c..0686ea3b92f8917cb167e9a3ab4b9feb1f9e2044 100644 (file)
--- 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-000000005vi-0000@the.local.host.name>
   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 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 Error
 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-000000005vi-0000 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-000000005vi-0000@the.local.host.name>
   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 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 Error
 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-000000005vi-0000 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-000000005vi-0000 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 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 Error
 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-000000005vi-0000 U=CALLER F=<nosyntax@x> rejected after DATA
 1999-03-02 09:44:33 10HmbE-000000005vi-0000 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 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 Error
 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 629b45dbf55d7d4ba7e24e4de19eb7dc22a49da5..1730a9889328c25acbebb4921b61a289b2bee1d0 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -856,7 +856,7 @@ RESET_AFTER_EXTRA_LINE_READ:
   s/(?:Can(?:no|')t assign requested address|Address not available)/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 unreachable/;
+  s/Network(?: is)? unreachable/Network Error/;
   s/Invalid argument/Network Error/;
 
   s/\(\d+\): Network/(dd): Network/;

diff --git a/test/stderr/0365 b/test/stderr/0365
index 8f1ef57ae9892f04a5958acb0350154cdba5efe2..6d8f24bceef78cfac7ffd319ce33e0be191889e5 100644 (file)
--- a/test/stderr/0365
+++ b/test/stderr/0365
@@ -1,4 +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
+1999-03-02 09:44:33 recipient verify defer (making calloout connection): T=smtp Network Error
+1999-03-02 09:44:33 sender verify defer (making calloout connection): T=smtp Network Error
+1999-03-02 09:44:33 recipient verify defer (making calloout connection): T=smtp Network Error
+1999-03-02 09:44:33 sender verify defer (making calloout connection): T=smtp Network Error

diff --git a/test/stderr/0388 b/test/stderr/0388
index 30baccef2df1e8d0e5670ce6af48b250df33749b..dd3dc3eec8e77d2275bf48d876328c37b0af9b67 100644 (file)
--- a/test/stderr/0388
+++ b/test/stderr/0388
@@ -130,7 +130,7 @@ set_process_info: pppp delivering 10HmaX-000000005vi-0000 to V4NET.0.0.0 [V4NET.
 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 unreachable
+  H=V4NET.0.0.0 [V4NET.0.0.0] Network Error
 set_process_info: pppp delivering 10HmaX-000000005vi-0000: 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-000000005vi-0000: 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-000000005vi-0000
 LOG: MAIN
-  == x@y R=r1 T=smtp defer (dd): Network unreachable H=127.0.0.1 [127.0.0.1]
+  == x@y R=r1 T=smtp defer (dd): Network Error 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-000000005vi-0000
@@ -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 unreachable
+  errno=dd more_errno=dd,A Network Error
  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 9c520f300d13f5ccd2c42d5cc306f981e57b41f6..f884103f33975bc7166cdef0b14186e251c10a31 100644 (file)
--- a/test/stderr/0613
+++ b/test/stderr/0613
@@ -1 +1 @@
-Delivery failed: Network unreachable
+Delivery failed: Network Error

diff --git a/test/stdout/0365 b/test/stdout/0365
index 236ff962980fa455a4ef04f335d4caf56bd00449..fcd35a9b56157e9c74412173eefdce9b7c6d3cfd 100644 (file)
--- a/test/stdout/0365
+++ b/test/stdout/0365
@@ -42,7 +42,7 @@
 550-Rejected after DATA: could not verify "From:" header address\r
 550 bad@domain: Unrouteable address\r
 250 OK\r
-451-Could not complete sender verify callout: V4NET.0.0.0 [V4NET.0.0.0] : Network unreachable\r
+451-Could not complete sender verify callout: V4NET.0.0.0 [V4NET.0.0.0] : Network Error\r
 451-Could not complete sender verify callout for <callout@x>.\r
 451-The mail server(s) for the domain may be temporarily unreachable, or\r
 451-they may be permanently unreachable from this server. In the latter case,\r