From cfd47d9e77d3ec3cccbf9fb0ff6672c3b83b8fe3 Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Fri, 2 Jun 2023 00:17:00 +0100
Subject: Logging: for callout errors likely to be config problems, include the
 transport in the log line

---
 test/msglog/0197.10HmaX-0005vi-00 | 12 ++++++------
 test/msglog/0197.10HmaY-0005vi-00 |  8 ++++----
 test/msglog/0198.10HmaX-0005vi-00 |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'test/msglog')

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@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 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
+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
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@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 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
+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
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@the.local.host.name U=CALLER P=local-bsmtp S=sss id=E10HmaY-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 Error
-1999-03-02 09:44:33 userx@copy.domain 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@copy.domain R=check_file T=pass_on defer (dd): Network unreachable
-- 
cgit v1.2.3