tidying

[exim.git] / test / stderr / 0362

diff --git a/test/stderr/0362 b/test/stderr/0362
index 913901e15b8478b7920a6a6602b0b22e1be193cc..f380f9d9c64c8b8746f25d24a3dbfc927e2dd2ee 100644 (file)
--- a/test/stderr/0362
+++ b/test/stderr/0362
@@ -1,12 +1,10 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
 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
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed

-  uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
+  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
 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


@@ -26,20 +24,27 @@ host in helo_try_verify_hosts? no (option unset)
 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
 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 test
+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 the.local.host.name 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
 SMTP>> 250 OK
 SMTP<< rcpt to:<x@a.b.c>
 using ACL "check_rcpt"
 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
 SMTP>> 250 OK
 SMTP<< rcpt to:<x@a.b.c>
 using ACL "check_rcpt"

-processing "accept"
+processing "accept" (TESTSUITE/test-config 22)

 check domains = +local_domains
 a.b.c in "*.test.ex"? no (end of list)
 a.b.c in "+local_domains"? no (end of list)
 accept: condition test failed in ACL "check_rcpt"
 check domains = +local_domains
 a.b.c in "*.test.ex"? no (end of list)
 a.b.c in "+local_domains"? no (end of list)
 accept: condition test failed in ACL "check_rcpt"

-processing "accept"
+processing "accept" (TESTSUITE/test-config 23)

 check domains = +relay_domains
 a.b.c in "a.b.c"? yes (matched "a.b.c")
 check domains = +relay_domains
 a.b.c in "a.b.c"? yes (matched "a.b.c")

+data from lookup saved for cache for +relay_domains: key 'a.b.c' value 'a.b.c'

 a.b.c in "+relay_domains"? yes (matched "+relay_domains")
 check verify = recipient
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 a.b.c in "+relay_domains"? yes (matched "+relay_domains")
 check verify = recipient
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>


@@ -63,6 +68,7 @@ r1 router skipped: domains mismatch
 local_part=x domain=x.test.ex
 checking domains
 x.test.ex in "*.test.ex"? yes (matched "*.test.ex")
 local_part=x domain=x.test.ex
 checking domains
 x.test.ex in "*.test.ex"? yes (matched "*.test.ex")

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

 x.test.ex in "+local_domains"? yes (matched "+local_domains")
 calling r2 router
 r2 router called for x@x.test.ex
 x.test.ex in "+local_domains"? yes (matched "+local_domains")
 calling r2 router
 r2 router called for x@x.test.ex


@@ -71,7 +77,7 @@ set transport t2
 queued for t2 transport: local_part = x
 domain = x.test.ex
   errors_to=NULL
 queued for t2 transport: local_part = x
 domain = x.test.ex
   errors_to=NULL

-  domain_data=NULL localpart_data=NULL
+  domain_data=*.test.ex local_part_data=NULL

 routed by r2 router
   envelope to: x@x.test.ex
   transport: t2
 routed by r2 router
   envelope to: x@x.test.ex
   transport: t2


@@ -79,10 +85,9 @@ routed by r2 router
 accept: condition test succeeded in ACL "check_rcpt"
 end of ACL "check_rcpt": ACCEPT
 SMTP>> 250 Accepted
 accept: condition test succeeded in ACL "check_rcpt"
 end of ACL "check_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<< quit
 SMTP>> 221 the.local.host.name closing connection
 LOG: smtp_connection MAIN

-  SMTP connection from [V4NET.0.0.0] closed by QUIT
+  SMTP connection from (test) [V4NET.0.0.0] closed by QUIT

 search_tidyup called
 search_tidyup called

->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>