X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/6822b9097e418e9a0e6cb1a31430904a38a49986..66802652b8500bae10ac530b6fe4976669f5dcff:/test/stderr/0218?ds=sidebyside

diff --git a/test/stderr/0218 b/test/stderr/0218
index 67ae81ee6..4c74ff294 100644
--- a/test/stderr/0218
+++ b/test/stderr/0218
@@ -6,9 +6,15 @@ LOG: queue_run MAIN
   Start queue run: pid=pppp -qq
 queue running combined directories
 delivering 10HmaX-0005vi-00 (queue run pid ppppp)
+R: client  (ACL)
+T: send_to_server  (ACL)
 delivering 10HmaY-0005vi-00 (queue run pid ppppp)
+R: client  (ACL)
+T: send_to_server  (ACL)
 queue running combined directories
 delivering 10HmaX-0005vi-00 (queue run pid ppppp)
+R: client  (ACL)
+T: send_to_server  (ACL)
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
@@ -31,6 +37,8 @@ configuration file is TESTSUITE/test-config
 trusted user
 admin user
 delivering 10HmaY-0005vi-00 (queue run pid ppppp)
+R: client  (ACL)
+T: send_to_server  (ACL)
   SMTP>> MAIL FROM:<CALLER@test.ex>
   SMTP>> RCPT TO:<b@test.ex>
   SMTP>> DATA
@@ -56,9 +64,15 @@ LOG: queue_run MAIN
   Start queue run: pid=pppp -qq
 queue running combined directories
 delivering 10HmaZ-0005vi-00 (queue run pid ppppp)
+R: client  (ACL)
+T: send_to_server  (ACL)
 delivering 10HmbA-0005vi-00 (queue run pid ppppp)
+R: client  (ACL)
+T: send_to_server  (ACL)
 queue running combined directories
 delivering 10HmaZ-0005vi-00 (queue run pid ppppp)
+R: client  (ACL)
+T: send_to_server  (ACL)
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
@@ -72,7 +86,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 503 Unexpected DATA
   SMTP>> QUIT
 LOG: MAIN
-  ** a@test.ex F=<CALLER@test.ex> R=client T=send_to_server: SMTP error from remote mail server after MAIL FROM:<CALLER@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 NO
+  ** a@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@test.ex>: 550 NO
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -83,9 +97,11 @@ LOG: MAIN
 LOG: MAIN
   Completed
 delivering 10HmbA-0005vi-00 (queue run pid ppppp)
+R: client  (ACL)
+T: send_to_server  (ACL)
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused
 LOG: MAIN
-  127.0.0.1 [127.0.0.1] Connection refused
+  H=127.0.0.1 [127.0.0.1] Connection refused
 LOG: MAIN
   == b@test.ex R=client T=send_to_server defer (dd): Connection refused
 LOG: queue_run MAIN
@@ -97,7 +113,10 @@ admin user
 LOG: queue_run MAIN
   Start queue run: pid=pppp -qqf
 delivering 10HmbA-0005vi-00 (queue run pid ppppp)
+R: client  (ACL)
+T: send_to_server  (ACL)
 delivering 10HmbB-0005vi-00 (queue run pid ppppp)
+R: bounce  (ACL)
 LOG: MAIN
   ** CALLER@test.ex F=<> R=bounce: just discard
 LOG: MAIN
@@ -105,7 +124,11 @@ LOG: MAIN
 LOG: MAIN
   Completed
 delivering 10HmbC-0005vi-00 (queue run pid ppppp)
+R: client  (ACL)
+T: send_to_server  (ACL)
 delivering 10HmbA-0005vi-00 (queue run pid ppppp)
+R: client  (ACL)
+T: send_to_server  (ACL)
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
@@ -120,7 +143,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP>> RSET
   SMTP<< 250 OK
 LOG: MAIN
-  ** b@test.ex F=<CALLER@test.ex> R=client T=send_to_server: SMTP error from remote mail server after RCPT TO:<b@test.ex>: host 127.0.0.1 [127.0.0.1]: 550 Unknown
+  ** b@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<b@test.ex>: 550 Unknown
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -135,6 +158,8 @@ configuration file is TESTSUITE/test-config
 trusted user
 admin user
 delivering 10HmbC-0005vi-00 (queue run pid ppppp)
+R: client  (ACL)
+T: send_to_server  (ACL)
   SMTP>> MAIL FROM:<CALLER@test.ex>
   SMTP>> RCPT TO:<c@test.ex>
   SMTP>> DATA