X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/b8e976847808b6a4d1ba51ce70ee4f114d91e357..4fd2b1700eb79bbeeea4887b93f1235171976e24:/test/stderr/0479?ds=inline

diff --git a/test/stderr/0479 b/test/stderr/0479
index 4f73548c1..64ff0acc0 100644
--- a/test/stderr/0479
+++ b/test/stderr/0479
@@ -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
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@the.local.host.name
 sender_fullhost = [1.2.3.4]
@@ -23,14 +23,13 @@ host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< helo [1.2.3.4]
+[1.2.3.4] in helo_lookup_domains?
+ list element: @
+ list element: @[]
 [1.2.3.4] in helo_lookup_domains? no (end of list)
 sender_fullhost = ([1.2.3.4]) [1.2.3.4]
 sender_rcvhost = [1.2.3.4]
 set_process_info: pppp handling incoming connection from ([1.2.3.4]) [1.2.3.4]
-spf_init: [1.2.3.4] 1.2.3.4
-SPF_dns_exim_new
-spf_compile.c:523    Debug: Parsing macro starting at Please%_see%_http://www.openspf.org/Why?id=%{S}&ip=%{C}&receiver=%{R}
-spf_compile.c:1210   Debug: Compiling record v=spf1 
 SMTP>> 250 the.local.host.name Hello [1.2.3.4] [1.2.3.4]
 SMTP<< mail from:<a@b>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
@@ -46,9 +45,13 @@ LOG: MAIN
 check verify = sender
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying a@b
-address match test: subject=a@b pattern=a@b
-b in "b"? yes (matched "b")
-a@b in "a@b"? yes (matched "a@b")
+a@b in "a@b"?
+ list element: a@b
+ address match test: subject=a@b pattern=a@b
+ b in "b"?
+  list element: b
+  b in "b"? yes (matched "b")
+ a@b in "a@b"? yes (matched "a@b")
 LOG: address_rewrite MAIN
   "a@b" from env-from rewritten as "rewritten-a@rewritten-b" by rule 1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -64,7 +67,7 @@ set transport t1
 queued for t1 transport: local_part = rewritten-a
 domain = rewritten-b
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by r1 router
   envelope to: rewritten-a@rewritten-b
   transport: t1
@@ -75,7 +78,6 @@ processing "accept" (TESTSUITE/test-config 18)
 accept: condition test succeeded in ACL "rcpt"
 end of ACL "rcpt": ACCEPT
 SMTP>> 250 Accepted
-DSN: orcpt: NULL  flags: 0
 SMTP<< rcpt to:<e@f>
 using ACL "rcpt"
 processing "require" (TESTSUITE/test-config 16)
@@ -90,10 +92,9 @@ processing "accept" (TESTSUITE/test-config 18)
 accept: condition test succeeded in ACL "rcpt"
 end of ACL "rcpt": ACCEPT
 SMTP>> 250 Accepted
-DSN: orcpt: NULL  flags: 0
 SMTP<< quit
 SMTP>> 221 the.local.host.name closing connection
 LOG: smtp_connection MAIN
-  SMTP connection from ([1.2.3.4]) [1.2.3.4] closed by QUIT
+  SMTP connection from ([1.2.3.4]) [1.2.3.4] 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 >>>>>>>>>>>>>>>>