Debug: clarify SMTP DATA ops in transport

[exim.git] / test / stderr / 0092

diff --git a/test/stderr/0092 b/test/stderr/0092
index e07e8494d00ff8b3ca198bde58a500e613bf155f..6fa174dc35eb28810e549e9cbc215735bc680644 100644 (file)
--- a/test/stderr/0092
+++ b/test/stderr/0092
@@ -15,6 +15,7 @@ LOG: SMTP command timeout on connection from [V4NET.0.0.1]
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 27)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 27)
 >>> check hosts = :


@@ -31,7 +32,7 @@ LOG: SMTP command timeout on connection from [V4NET.0.0.1]
 >>> test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT

-LOG: SMTP data timeout (message abandoned) on connection from [V4NET.0.0.1] F=<userx@test.ex>
+LOG: SMTP data timeout (message abandoned) on connection from (test) [V4NET.0.0.1] F=<userx@test.ex>

 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp


@@ -51,20 +52,30 @@ host in host_lookup? no (option unset)
 set_process_info: pppp handling incoming connection from [V4NET.0.0.1]
  ╭considering: ${if eq {V4NET.0.0.1} {$sender_host_address} {2} {30}}s
   ╭considering: V4NET.0.0.1} {$sender_host_address} {2} {30}}s
 set_process_info: pppp handling incoming connection from [V4NET.0.0.1]
  ╭considering: ${if eq {V4NET.0.0.1} {$sender_host_address} {2} {30}}s
   ╭considering: V4NET.0.0.1} {$sender_host_address} {2} {30}}s

+  ├───────text: V4NET.0.0.1
+  ├considering: } {$sender_host_address} {2} {30}}s

   ├──expanding: V4NET.0.0.1
   ╰─────result: V4NET.0.0.1
   ╭considering: $sender_host_address} {2} {30}}s
   ├──expanding: V4NET.0.0.1
   ╰─────result: V4NET.0.0.1
   ╭considering: $sender_host_address} {2} {30}}s

+  ├considering: } {2} {30}}s

   ├──expanding: $sender_host_address
   ╰─────result: V4NET.0.0.1
  ├──condition: eq {V4NET.0.0.1} {$sender_host_address}
  ├─────result: true
   ╭considering: 2} {30}}s
   ├──expanding: $sender_host_address
   ╰─────result: V4NET.0.0.1
  ├──condition: eq {V4NET.0.0.1} {$sender_host_address}
  ├─────result: true
   ╭considering: 2} {30}}s

+  ├───────text: 2
+  ├considering: } {30}}s

   ├──expanding: 2
   ╰─────result: 2
   ╭───scanning: 30}}s
   ├──expanding: 2
   ╰─────result: 2
   ╭───scanning: 30}}s

+  ├───────text: 30
+  ├───scanning: }}s

   ├──expanding: 30
   ├─────result: 30
   ╰───skipping: result is not used
   ├──expanding: 30
   ├─────result: 30
   ╰───skipping: result is not used

+ ├───item-res: 2
+ ├considering: s
+ ├───────text: s

  ├──expanding: ${if eq {V4NET.0.0.1} {$sender_host_address} {2} {30}}s
  ╰─────result: 2s
 host in host_reject_connection? no (option unset)
  ├──expanding: ${if eq {V4NET.0.0.1} {$sender_host_address} {2} {30}}s
  ╰─────result: 2s
 host in host_reject_connection? no (option unset)


@@ -74,10 +85,22 @@ host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
  ╭considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
  ╭considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full

+ ├considering:  ESMTP Exim $version_number $tod_full
+ ├───────text:  ESMTP Exim 
+ ├considering: $version_number $tod_full
+ ├considering:  $tod_full
+ ├───────text:  
+ ├considering: $tod_full

  ├──expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
  ╰─────result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
  ├──expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
  ╰─────result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered

+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [V4NET.0.0.1]
+sender_rcvhost = [V4NET.0.0.1] (helo=test)
+set_process_info: pppp handling incoming connection from (test) [V4NET.0.0.1]
+SMTP>> 250 myhost.test.ex Hello test [V4NET.0.0.1]

 SMTP<< mail from:userx@test.ex
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP<< mail from:userx@test.ex
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100


@@ -97,19 +120,19 @@ deny: condition test failed in ACL "check_recipient"
 processing "accept" (TESTSUITE/test-config 31)
 check domains = +local_domains
 test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
 processing "accept" (TESTSUITE/test-config 31)
 check domains = +local_domains
 test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")

+data from lookup saved for cache for +local_domains: key 'test.ex' value 'test.ex'

 test.ex in "+local_domains"? yes (matched "+local_domains")
 accept: condition test succeeded in ACL "check_recipient"
 end of ACL "check_recipient": ACCEPT
 SMTP>> 250 Accepted
 test.ex in "+local_domains"? yes (matched "+local_domains")
 accept: condition test succeeded in ACL "check_recipient"
 end of ACL "check_recipient": ACCEPT
 SMTP>> 250 Accepted

-DSN: orcpt: NULL  flags: 0

 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called
 LOG: lost_incoming_connection MAIN
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called
 LOG: lost_incoming_connection MAIN

-  SMTP data timeout (message abandoned) on connection from [V4NET.0.0.1] F=<userx@test.ex>
+  SMTP data timeout (message abandoned) on connection from (test) [V4NET.0.0.1] F=<userx@test.ex>

 SMTP>> 421 myhost.test.ex SMTP incoming data timeout - closing connection.
 search_tidyup called
 SMTP>> 421 myhost.test.ex SMTP incoming data timeout - closing connection.
 search_tidyup called

->>>>>>>>>>>>>>>> Exim pid=pppp NULLterminating with rc=1 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>>

 exim: timed out while reading - message abandoned
 exim: timed out while reading - message abandoned
 >>> host in hosts_connection_nolog? no (option unset)
 exim: timed out while reading - message abandoned
 exim: timed out while reading - message abandoned
 >>> host in hosts_connection_nolog? no (option unset)


@@ -120,6 +143,7 @@ exim: timed out while reading - message abandoned
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 27)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 27)
 >>> check hosts = :


@@ -141,8 +165,8 @@ exim: timed out while reading - message abandoned
 >>> ----------- end verify ------------
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> ----------- end verify ------------
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[V4NET.0.0.1] F=<userx@test.ex> rejected RCPT verify@test.ex: Unrouteable address
-LOG: SMTP command timeout on connection from [V4NET.0.0.1]
+LOG: H=(test) [V4NET.0.0.1] F=<userx@test.ex> rejected RCPT verify@test.ex: Unrouteable address
+LOG: SMTP command timeout on connection from (test) [V4NET.0.0.1]

 An error was detected while processing a file of BSMTP input.
 The error message was:
 
 An error was detected while processing a file of BSMTP input.
 The error message was: