More test commits.

1 files changed, 173 insertions, 0 deletions

diff --git a/test/stderr/0487 b/test/stderr/0487
new file mode 100644
index 000000000..f380ec1d3
--- /dev/null
+++ b/test/stderr/0487
@@ -0,0 +1,173 @@
+Exim version x.yz ....
+changed uid/gid: forcing real = effective
+  uid=uuuu gid=CALLER_GID pid=pppp
+configuration file is TESTSUITE/test-config
+trusted user
+admin user
+changed uid/gid: privilege not needed
+  uid=EXIM_UID gid=EXIM_GID pid=pppp
+finduser used cached passwd data for CALLER
+originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
+sender address = NULL
+ in hosts_connection_nolog? no (option unset)
+LOG: smtp_connection MAIN
+  SMTP connection from CALLER
+SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+smtp_setup_msg entered
+SMTP<< ehlo x.y
+ in pipelining_advertise_hosts? yes (matched "*")
+SMTP>> 250-myhost.test.ex Hello CALLER at x.y

+250-SIZE 52428800

+250-PIPELINING

+250 HELP

+SMTP<< mail from:<x@y>
+SMTP>> 250 OK

+SMTP<< rcpt to:<userx@test.ex>
+processing "accept"
+accept: condition test succeeded
+SMTP>> 250 Accepted

+SMTP<< data
+SMTP>> 354 Enter message, ending with "." on a line by itself

+search_tidyup called
+>>Headers received:
+From: unqualified
+
+rewrite_one_header: type=F:
+  From: unqualified
+search_tidyup called
+>>Headers after rewriting and local additions:
+F From: unqualified
+I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+Data file written for message 10HmaX-0005vi-00
+>>Generated Received: header line
+P Received: from CALLER (helo=x.y)
+	by myhost.test.ex with local-esmtp (Exim x.yz)
+	(envelope-from <x@y>)
+	id 10HmaX-0005vi-00
+	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+calling local_scan(); timeout=300
+local_scan() returned 0 NULL
+Writing spool header file
+Size of headers = sss
+LOG: MAIN
+  <= x@y U=CALLER P=local-esmtp S=sss
+created log directory TESTSUITE/spool/log
+SMTP>> 250 OK id=10HmaX-0005vi-00

+search_tidyup called
+exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xfbb95cfd -odi -Mc 10HmaX-0005vi-00
+Exim version x.yz ....
+changed uid/gid: forcing real = effective
+  uid=uuuu gid=EXIM_GID pid=pppp
+configuration file is TESTSUITE/test-config
+trusted user
+admin user
+finduser used cached passwd data for CALLER
+set_process_info: pppp delivering specified messages
+set_process_info: pppp delivering 10HmaX-0005vi-00
+reading spool file 10HmaX-0005vi-00-H
+user=CALLER uid=CALLER_UID gid=CALLER_GID sender=x@y
+sender_local=0 ident=CALLER
+Non-recipients:
+Empty Tree
+---- End of tree ----
+recipients_count=1
+body_linecount=1 message_linecount=8
+Delivery address list:
+  userx@test.ex 
+locking TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
+EXIM_DBOPEN(TESTSUITE/spool/db/retry)
+returned from EXIM_DBOPEN
+ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim
+no retry data available
+>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+Considering: userx@test.ex
+unique = userx@test.ex
+no domain retry record
+no address retry record
+userx@test.ex: queued for routing
+>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+routing userx@test.ex
+--------> r1 router <--------
+local_part=userx domain=test.ex
+calling r1 router
+r1 router called for userx@test.ex
+  domain = test.ex
+set transport t1
+queued for t1 transport: local_part = userx
+domain = test.ex
+  errors_to=NULL
+  domain_data=NULL localpart_data=NULL
+routed by r1 router
+  envelope to: userx@test.ex
+  transport: t1
+>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+After routing:
+  Local deliveries:
+    userx@test.ex
+  Remote deliveries:
+  Failed addresses:
+  Deferred addresses:
+search_tidyup called
+>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
+--------> userx@test.ex <--------
+locking TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
+EXIM_DBOPEN(TESTSUITE/spool/db/retry)
+returned from EXIM_DBOPEN
+no retry data available
+search_tidyup called
+changed uid/gid: local delivery to userx <userx@test.ex> transport=t1
+  uid=CALLER_UID gid=CALLER_GID pid=pppp
+  home=NULL current=/
+set_process_info: pppp delivering 10HmaX-0005vi-00 to userx using t1
+appendfile transport entered
+appendfile: mode=600 notify_comsat=0 quota=0 warning=0
+  file=TESTSUITE/test-mail/userx format=unix
+  message_prefix=From ${if def:return_path{$return_path}{MAILER-DAEMON}} ${tod_bsdinbox}\n
+  message_suffix=\n
+  maildir_use_size_file=no
+  locking by lockfile fcntl 
+lock name: TESTSUITE/test-mail/userx.lock
+hitch name: TESTSUITE/test-mail/userx.lock.test.ex.dddddddd.pppppppp
+lock file created
+mailbox TESTSUITE/test-mail/userx is locked
+writing to file TESTSUITE/test-mail/userx
+writing data block fd=6 size=sss timeout=0
+rewrite_one_header: type=F:
+  From: unqualified
+writing data block fd=6 size=sss timeout=0
+writing data block fd=6 size=sss timeout=0
+appendfile yields 0 with errno=dd more_errno=dd
+search_tidyup called
+journalling userx@test.ex
+t1 transport returned OK for userx@test.ex
+post-process userx@test.ex (0)
+userx@test.ex delivered
+LOG: MAIN
+  => userx <userx@test.ex> R=r1 T=t1
+>>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>>
+changed uid/gid: post-delivery tidying
+  uid=EXIM_UID gid=EXIM_GID pid=pppp
+set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00
+Processing retry items
+Succeeded addresses:
+userx@test.ex: no retry items
+Failed addresses:
+Deferred addresses:
+end of retry processing
+LOG: MAIN
+  Completed
+end delivery of 10HmaX-0005vi-00
+search_tidyup called
+search_tidyup called
+>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+smtp_setup_msg entered
+SMTP<< quit
+SMTP>> 221 myhost.test.ex closing connection

+LOG: smtp_connection MAIN
+  SMTP connection from CALLER closed by QUIT
+search_tidyup called
+>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>