Fix build on older Linux

[users/jgh/exim.git] / test / stderr / 0362

diff --git a/test/stderr/0362 b/test/stderr/0362
index 11f4826cee3a342a5620694b1c9a8df03318b9aa..02da2906eb8f21d1b48e04de9e8a7273df306038 100644 (file)
--- a/test/stderr/0362
+++ b/test/stderr/0362
@@ -5,6 +5,8 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp

+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
 sender address = CALLER@test.ex
 sender_fullhost = [V4NET.0.0.0]
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@test.ex
 sender_fullhost = [V4NET.0.0.0]


@@ -20,25 +22,27 @@ host in recipient_unqualified_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)
 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)

-SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

 smtp_setup_msg entered
 SMTP<< mail from:<x@y>
 smtp_setup_msg entered
 SMTP<< mail from:<x@y>

-SMTP>> 250 OK\r
+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<< 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)
 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
-processing "accept"
+accept: condition test failed in ACL "check_rcpt"
+processing "accept" (TESTSUITE/test-config 23)

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

-address match: subject=x@a.b.c pattern=x@a.b.c
+address match test: subject=x@a.b.c pattern=x@a.b.c

 a.b.c in "a.b.c"? yes (matched "a.b.c")
 x@a.b.c in "x@a.b.c"? yes (matched "x@a.b.c")
 LOG: address_rewrite MAIN
 a.b.c in "a.b.c"? yes (matched "a.b.c")
 x@a.b.c in "x@a.b.c"? yes (matched "x@a.b.c")
 LOG: address_rewrite MAIN


@@ -70,11 +74,13 @@ routed by r2 router
   envelope to: x@x.test.ex
   transport: t2
 ----------- end verify ------------
   envelope to: x@x.test.ex
   transport: t2
 ----------- end verify ------------

-accept: condition test succeeded
-SMTP>> 250 Accepted\r
+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<< quit

-SMTP>> 221 the.local.host.name closing connection\r
+SMTP>> 221 the.local.host.name closing connection

 LOG: smtp_connection MAIN
   SMTP connection from [V4NET.0.0.0] closed by QUIT
 search_tidyup called
 LOG: smtp_connection MAIN
   SMTP connection from [V4NET.0.0.0] closed by QUIT
 search_tidyup called

->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>