Debug: fix showing option name for list (vs. list content)

[exim.git] / test / stderr / 0462

diff --git a/test/stderr/0462 b/test/stderr/0462
index 072503e910a57c45bbc9162c10af0ec0cd04cc1d..d7423c737f55aaaab32fc5e858c22058ad9081fc 100644 (file)
--- a/test/stderr/0462
+++ b/test/stderr/0462
@@ -4,6 +4,7 @@ trusted user
 admin user
 LOG: smtp_connection MAIN
   SMTP connection from root
+test in helo_lookup_domains? no (end of list)
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying Ok@localhost
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -11,8 +12,9 @@ Considering Ok@localhost
 Attempting full verification using callout
 callout cache: no domain record found for localhost
 callout cache: no address record found for Ok@localhost
-interface=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+interface=NULL port=PORT_S
+Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
+ connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -30,14 +32,15 @@ Cutthrough cancelled by presence of postmaster verify
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:250:RSET:250:MAIL:250:RCPT:550:QUIT:250'
 wrote callout cache domain record for localhost:
   result=1 postmaster=2 random=0
 wrote positive callout cache address record for Ok@localhost
 LOG: MAIN REJECT
-  H=[V4NET.0.0.1] U=root sender verify fail for <Ok@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@localhost>: 550 NO
+  H=(test) [V4NET.0.0.1] U=root sender verify fail for <Ok@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@localhost>: 550 NO
 created log directory TESTSUITE/spool/log
 LOG: MAIN REJECT
-  H=[V4NET.0.0.1] U=root F=<Ok@localhost> rejected RCPT <checkpm@test.ex>: Sender verify failed
+  H=(test) [V4NET.0.0.1] U=root F=<Ok@localhost> rejected RCPT <checkpm@test.ex>: Sender verify failed
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying Ok@localhost
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -47,14 +50,15 @@ callout cache: found domain record for localhost
 callout cache: found address record for Ok@localhost
 callout cache: address record is positive
 LOG: smtp_connection MAIN
-  SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+  SMTP connection from root D=qqs closed by QUIT
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 LOG: smtp_connection MAIN
   SMTP connection from root
+test in helo_lookup_domains? no (end of list)
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying NOTok@elsewhere
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -62,8 +66,9 @@ Considering NOTok@elsewhere
 Attempting full verification using callout
 callout cache: no domain record found for elsewhere
 callout cache: no address record found for NOTok@elsewhere
-interface=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+interface=NULL port=PORT_S
+Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
+ connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -74,22 +79,24 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:550:QUIT:250'
 wrote callout cache domain record for elsewhere:
   result=1 postmaster=0 random=0
 wrote negative callout cache address record for NOTok@elsewhere
 LOG: MAIN REJECT
-  H=[V4NET.0.0.2] U=root sender verify fail for <NOTok@elsewhere>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<NOTok@elsewhere>: 550 NO
+  H=(test) [V4NET.0.0.2] U=root sender verify fail for <NOTok@elsewhere>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<NOTok@elsewhere>: 550 NO
 LOG: MAIN REJECT
-  H=[V4NET.0.0.2] U=root F=<NOTok@elsewhere> rejected RCPT <nocheckpm@test.ex>: Sender verify failed
+  H=(test) [V4NET.0.0.2] U=root F=<NOTok@elsewhere> rejected RCPT <nocheckpm@test.ex>: Sender verify failed
 LOG: smtp_connection MAIN
-  SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+  SMTP connection from root D=qqs closed by QUIT
+>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 LOG: smtp_connection MAIN
   SMTP connection from root
+test in helo_lookup_domains? no (end of list)
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying NOTok2@elsewhere
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -97,8 +104,9 @@ Considering NOTok2@elsewhere
 Attempting full verification using callout
 callout cache: found domain record for elsewhere
 callout cache: no address record found for NOTok2@elsewhere
-interface=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+interface=NULL port=PORT_S
+Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
+ connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -109,11 +117,12 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:550:QUIT:250'
 wrote callout cache domain record for elsewhere:
   result=1 postmaster=0 random=0
 wrote negative callout cache address record for NOTok2@elsewhere
 LOG: MAIN REJECT
-  H=[V4NET.0.0.2] U=root F=<NOTok2@elsewhere> rejected RCPT <nocheckpm@test.ex>: Sender verify failed
+  H=(test) [V4NET.0.0.2] U=root F=<NOTok2@elsewhere> rejected RCPT <nocheckpm@test.ex>: Sender verify failed
 LOG: smtp_connection MAIN
-  SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+  SMTP connection from root D=qqs closed by QUIT
+>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>