Merge branch '4.next'

[exim.git] / test / stderr / 0575

diff --git a/test/stderr/0575 b/test/stderr/0575
index 934e8aa46855b5e8f9a983e37d853bf04486100c..ad89f09be62667491d54e23752c01a75b089e967 100644 (file)
--- a/test/stderr/0575
+++ b/test/stderr/0575
@@ -1,10 +1,11 @@
 Exim version x.yz ....
+Hints DB:
 changed uid/gid: forcing real = effective
-  uid=uuuu gid=CALLER_GID pid=pppp
+  uid=uuuu gid=CALLER_GID pid=p1234
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
-  uid=EXIM_UID gid=EXIM_GID pid=pppp
+  uid=EXIM_UID gid=EXIM_GID pid=p1234
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@test.ex
 sender_fullhost = [V4NET.0.0.0]
@@ -22,6 +23,15 @@ host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 mail.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?
+ list element: @
+ list element: @[]
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [V4NET.0.0.0]
+sender_rcvhost = [V4NET.0.0.0] (helo=test)
+set_process_info: pppp handling incoming connection from (test) [V4NET.0.0.0]
+SMTP>> 250 mail.test.ex Hello test [V4NET.0.0.0]
 SMTP<< mail from:<x@y>
 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
@@ -31,30 +41,33 @@ processing "accept" (TESTSUITE/test-config 13)
 accept: condition test succeeded in inline ACL
 end of inline ACL: 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
 >>Headers received:
 
+qualify & rewrite recipients list
+rewrite rules on sender address
+qualify and rewrite headers
 search_tidyup called
 >>Headers after rewriting and local additions:
 
-Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D
-Data file written for message 10HmaX-0005vi-00
+Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D
+Data file written for message 10HmaX-000000005vi-0000
 >>Generated Received: header line
-P Received: from [V4NET.0.0.0]
+P Received: from [V4NET.0.0.0] (helo=test)
        by mail.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y>)
-       id 10HmaX-0005vi-00
-       for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmaX-000000005vi-0000
+       for x@y;
+       Tue, 2 Mar 1999 09:44:33 +0000
 LOG: MAIN
-  <= x@y H=[V4NET.0.0.0] P=smtp S=sss
-SMTP>> 250 OK id=10HmaX-0005vi-00
+  <= x@y H=(test) [V4NET.0.0.0] P=smtp S=sss
+SMTP>> 250 OK id=10HmaX-000000005vi-0000
 smtp_setup_msg entered
 SMTP<< quit
 SMTP>> 221 mail.test.ex closing connection
 LOG: smtp_connection MAIN
-  SMTP connection from [V4NET.0.0.0] closed by QUIT
+  SMTP connection from (test) [V4NET.0.0.0] D=qqs closed by QUIT
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>