X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/b574c5baeb94e3a176c63982f507a5b48bf3917b..340e5f5781abb5388c41fa326d6e1cabf7ba96ff:/test/stderr/0044

diff --git a/test/stderr/0044 b/test/stderr/0044
index 1dcde9f8e..7aa38d84b 100644
--- a/test/stderr/0044
+++ b/test/stderr/0044
@@ -1,10 +1,10 @@
 Exim version x.yz ....
 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
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -33,10 +33,10 @@ host in dsn_advertise_hosts? no (option unset)
 host in pipelining_advertise_hosts? yes (matched "*")
 host in chunking_advertise_hosts? no (end of list)
 SMTP>> 250-the.local.host.name Hello exim.test.ex [V4NET.11.12.13]
-250-SIZE 52428800
-250-8BITMIME
-250-PIPELINING
-250 HELP
+       250-SIZE 52428800
+       250-8BITMIME
+       250-PIPELINING
+       250 HELP
 SMTP<< mail from:postmaster@exim.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
@@ -55,7 +55,6 @@ postmaster@exim.test.ex in "postmaster@exim.test.ex"? yes (matched "postmaster@e
 accept: condition test succeeded in ACL "check_recipient"
 end of ACL "check_recipient": ACCEPT
 SMTP>> 250 Accepted
-DSN: orcpt: NULL  flags: 0
 SMTP<< rcpt to:list@exim.test.ex
 using ACL "check_recipient"
 processing "accept" (TESTSUITE/test-config 19)
@@ -123,6 +122,9 @@ search_tidyup called
 host in ignore_fromline_hosts? no (option unset)
 >>Headers received:
 
+qualify & rewrite recipients list
+global rewrite rules
+rewrite headers
 search_tidyup called
 >>Headers after rewriting and local additions:
 
@@ -133,7 +135,8 @@ P Received: from [V4NET.11.12.13] (helo=exim.test.ex)
 	by the.local.host.name with esmtp (Exim x.yz)
 	(envelope-from <postmaster@exim.test.ex>)
 	id 10HmaX-0005vi-00
-	for postmaster@exim.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for postmaster@exim.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 LOG: MAIN
   <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.13] P=esmtp S=sss
 SMTP>> 250 OK id=10HmaX-0005vi-00
@@ -143,7 +146,7 @@ SMTP>> 221 the.local.host.name closing connection
 LOG: smtp_connection MAIN
   SMTP connection from (exim.test.ex) [V4NET.11.12.13] closed by QUIT
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
@@ -175,11 +178,11 @@ search_tidyup called
 LOG: 10HmaY-0005vi-00 <= myfriend@there.test.ex H=(exim.test.ex) [V4NET.11.12.13] P=esmtp S=sss
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
-  uid=uuuu gid=CALLER_GID pid=pppp
+  uid=uuuu gid=CALLER_GID pid=p1235
 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=p1235
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@ -208,10 +211,10 @@ host in dsn_advertise_hosts? no (option unset)
 host in pipelining_advertise_hosts? yes (matched "*")
 host in chunking_advertise_hosts? no (end of list)
 SMTP>> 250-the.local.host.name Hello exim.test.ex [V4NET.99.99.99]
-250-SIZE 52428800
-250-8BITMIME
-250-PIPELINING
-250 HELP
+       250-SIZE 52428800
+       250-8BITMIME
+       250-PIPELINING
+       250 HELP
 SMTP<< mail from:postmaster@exim.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
@@ -240,9 +243,9 @@ new DNS lookup for 99.99.99.V4NET.rbl.test.ex
 DNS lookup of 99.99.99.V4NET.rbl.test.ex (A) using fakens
 DNS lookup of 99.99.99.V4NET.rbl.test.ex (A) gave HOST_NOT_FOUND
 returning DNS_NOMATCH
-faking res_search() response length as 65535
+faking res_search(A) response length as 65535
  writing neg-cache entry for 99.99.99.V4NET.rbl.test.ex-A-xxxx, ttl 3000
-faking res_search() response length as 65535
+faking res_search(A) response length as 65535
 dnslists: wrote cache entry, ttl=3000
 DNS lookup for 99.99.99.V4NET.rbl.test.ex failed
 => that means V4NET.99.99.99 is not listed at rbl.test.ex
@@ -275,4 +278,4 @@ SMTP>> 421 the.local.host.name lost input connection
 LOG: lost_incoming_connection MAIN
   unexpected disconnection while reading SMTP command from (exim.test.ex) [V4NET.99.99.99] D=qqs
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>