TLS: rework error logging to pass more string back to caller for logging

[exim.git] / test / stderr / 0398

diff --git a/test/stderr/0398 b/test/stderr/0398
index 3e3994b99aec07a13936a9a73a1b71a3c53a58b1..b975ad05af623f4527d1bde94ef3b1163d0002cc 100644 (file)
--- a/test/stderr/0398
+++ b/test/stderr/0398
@@ -135,6 +135,8 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP>> EHLO mail.test.ex
 cmd buf flush ddd bytes
   SMTP<< 250 OK
   SMTP>> EHLO mail.test.ex
 cmd buf flush ddd bytes
   SMTP<< 250 OK

+not using PIPELINING
+not using DSN

 127.0.0.1 in hosts_require_auth? no (option unset)
   SMTP>> MAIL FROM:<>
 cmd buf flush ddd bytes
 127.0.0.1 in hosts_require_auth? no (option unset)
   SMTP>> MAIL FROM:<>
 cmd buf flush ddd bytes


@@ -144,6 +146,7 @@ cmd buf flush ddd bytes
   SMTP<< 550 Unknown
   SMTP>> QUIT
 cmd buf flush ddd bytes
   SMTP<< 550 Unknown
   SMTP>> QUIT
 cmd buf flush ddd bytes

+  SMTP<< 250 OK

   SMTP(close)>>
 locking TESTSUITE/spool/db/callout.lockfile
 locked  TESTSUITE/spool/db/callout.lockfile
   SMTP(close)>>
 locking TESTSUITE/spool/db/callout.lockfile
 locked  TESTSUITE/spool/db/callout.lockfile


@@ -160,7 +163,7 @@ closed hints database and lockfile
 l_message: $acl_verify_message
 warn: condition test succeeded in ACL "rcpt"
 LOG: MAIN
 l_message: $acl_verify_message
 warn: condition test succeeded in ACL "rcpt"
 LOG: MAIN

-  U=CALLER Warning: Sender verify failed: response to "RCPT TO:<qq@remote>" from 127.0.0.1 [127.0.0.1] was: 550 Unknown
+  U=CALLER Warning: Sender verify failed: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<qq@remote>: 550 Unknown

 processing "accept"
 check senders = qq@remote
 address match test: subject=qq@remote pattern=qq@remote
 processing "accept"
 check senders = qq@remote
 address match test: subject=qq@remote pattern=qq@remote