From a2da3176aa39ec9aa5ae495e5a6d533477f871aa Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sat, 7 May 2016 21:27:52 +0100 Subject: global queue_name --- test/stderr/0022 | 3 +++ test/stderr/0275 | 5 ++++- test/stderr/0278 | 5 ++++- test/stderr/0294 | 8 ++++++-- test/stderr/0303 | 2 ++ test/stderr/0317 | 8 ++++++-- test/stderr/0361 | 5 ++++- test/stderr/0371 | 1 + test/stderr/0386 | 10 ++++++++-- test/stderr/0388 | 7 +++++-- test/stderr/0402 | 5 ++++- test/stderr/0403 | 5 ++++- test/stderr/0404 | 10 ++++++++-- test/stderr/0408 | 5 ++++- test/stderr/0420 | 2 ++ test/stderr/0465 | 5 ++++- test/stderr/0471 | 4 +++- test/stderr/0487 | 5 ++++- test/stderr/0489 | 32 ++++++++++++++++++++++++-------- test/stderr/2600 | 5 ++++- test/stderr/5004 | 5 ++++- test/stderr/5005 | 26 ++++++++++++++++++++------ test/stderr/5006 | 5 ++++- 23 files changed, 132 insertions(+), 36 deletions(-) (limited to 'test/stderr') diff --git a/test/stderr/0022 b/test/stderr/0022 index 6451e758d..ad072543c 100644 --- a/test/stderr/0022 +++ b/test/stderr/0022 @@ -45,6 +45,7 @@ host in ignore_fromline_hosts? no (option unset) search_tidyup called >>Headers after rewriting and local additions: +Data file name: TESTSUITE/spool/input///10HmbF-0005vi-00-D Data file written for message 10HmbF-0005vi-00 >>Generated Received: header line P Received: from [V4NET.9.8.7] @@ -114,6 +115,7 @@ host in ignore_fromline_hosts? no (option unset) search_tidyup called >>Headers after rewriting and local additions: +Data file name: TESTSUITE/spool/input///10HmbG-0005vi-00-D Data file written for message 10HmbG-0005vi-00 >>Generated Received: header line P Received: from [V4NET.9.8.7] @@ -181,6 +183,7 @@ host in ignore_fromline_hosts? no (option unset) search_tidyup called >>Headers after rewriting and local additions: +Data file name: TESTSUITE/spool/input///10HmbH-0005vi-00-D Data file written for message 10HmbH-0005vi-00 >>Generated Received: header line P Received: from [V4NET.9.8.7] diff --git a/test/stderr/0275 b/test/stderr/0275 index bb642b01b..53d60770b 100644 --- a/test/stderr/0275 +++ b/test/stderr/0275 @@ -141,6 +141,7 @@ I Message-Id: F From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 +Data file name: TESTSUITE/spool/input///10HmaX-0005vi-00-D Data file written for message 10HmaX-0005vi-00 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) @@ -149,11 +150,12 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) 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 +Writing spool header file: TESTSUITE/spool/input///hdr.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |userx@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool/input///10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss @@ -179,6 +181,7 @@ DSN: r2 propagating DSN DSN: r3 propagating DSN set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmaX-0005vi-00 +Trying spool file TESTSUITE/spool/input///10HmaX-0005vi-00-D reading spool file 10HmaX-0005vi-00-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER diff --git a/test/stderr/0278 b/test/stderr/0278 index fd5795b04..5ef41ea6d 100644 --- a/test/stderr/0278 +++ b/test/stderr/0278 @@ -92,6 +92,7 @@ I Message-Id: F From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 +Data file name: TESTSUITE/spool/input///10HmaX-0005vi-00-D Data file written for message 10HmaX-0005vi-00 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) @@ -100,11 +101,12 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 calling local_scan(); timeout=300 local_scan() returned 0 NULL -Writing spool header file +Writing spool header file: TESTSUITE/spool/input///hdr.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |CALLER@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool/input///10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss @@ -126,6 +128,7 @@ DSN: r4 propagating DSN DSN: r5 propagating DSN set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmaX-0005vi-00 +Trying spool file TESTSUITE/spool/input///10HmaX-0005vi-00-D reading spool file 10HmaX-0005vi-00-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER diff --git a/test/stderr/0294 b/test/stderr/0294 index 24da1eb2d..d950630dd 100644 --- a/test/stderr/0294 +++ b/test/stderr/0294 @@ -38,6 +38,7 @@ I Message-Id: F From: x@y Date: Tue, 2 Mar 1999 09:44:33 +0000 +Data file name: TESTSUITE/spool/input///10HmaX-0005vi-00-D Data file written for message 10HmaX-0005vi-00 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) @@ -45,7 +46,8 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 calling local_scan(); timeout=300 local_scan() returned 0 NULL -Writing spool header file +Writing spool header file: TESTSUITE/spool/input///hdr.pppp +Renaming spool header file: TESTSUITE/spool/input///10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN <= x@y U=CALLER P=local-smtp S=sss @@ -67,6 +69,7 @@ I Message-Id: F From: x@y Date: Tue, 2 Mar 1999 09:44:33 +0000 +Data file name: TESTSUITE/spool/input///10HmaY-0005vi-00-D Data file written for message 10HmaY-0005vi-00 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) @@ -75,7 +78,8 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) for two@z; Tue, 2 Mar 1999 09:44:33 +0000 calling local_scan(); timeout=300 local_scan() returned 0 NULL -Writing spool header file +Writing spool header file: TESTSUITE/spool/input///hdr.pppp +Renaming spool header file: TESTSUITE/spool/input///10HmaY-0005vi-00-H Size of headers = sss LOG: MAIN <= x@y U=CALLER P=local-smtp S=sss diff --git a/test/stderr/0303 b/test/stderr/0303 index 02f42e0a0..dc27c67cc 100644 --- a/test/stderr/0303 +++ b/test/stderr/0303 @@ -90,6 +90,7 @@ search_tidyup called search_tidyup called >>Headers after rewriting and local additions: +Data file name: TESTSUITE/spool/input///10HmaX-0005vi-00-D Data file written for message 10HmaX-0005vi-00 >>Generated Received: header line P Received: from [V4NET.2.3.4] @@ -162,6 +163,7 @@ search_tidyup called search_tidyup called >>Headers after rewriting and local additions: +Data file name: TESTSUITE/spool/input///10HmaY-0005vi-00-D Data file written for message 10HmaY-0005vi-00 >>Generated Received: header line P Received: from host.name.tld ([V4NET.2.3.4]) diff --git a/test/stderr/0317 b/test/stderr/0317 index 8cd90b29b..c9b4bb89f 100644 --- a/test/stderr/0317 +++ b/test/stderr/0317 @@ -17,6 +17,7 @@ I Message-Id: F From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 +Data file name: TESTSUITE/spool/input///10HmaX-0005vi-00-D Data file written for message 10HmaX-0005vi-00 >>Generated Received: header line P Received: from CALLER by mail.test.ex with local (Exim x.yz) @@ -24,7 +25,8 @@ P Received: from CALLER by mail.test.ex with local (Exim x.yz) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 calling local_scan(); timeout=300 local_scan() returned 0 NULL -Writing spool header file +Writing spool header file: TESTSUITE/spool/input///hdr.pppp +Renaming spool header file: TESTSUITE/spool/input///10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss @@ -55,6 +57,7 @@ C Resent-cc: pp@qq.rr * Resent-bcc: xx@yy.zz F Resent-From: CALLER_NAME +Data file name: TESTSUITE/spool/input///10HmaY-0005vi-00-D Data file written for message 10HmaY-0005vi-00 >>Generated Received: header line P Received: from CALLER by mail.test.ex with local (Exim x.yz) @@ -62,7 +65,8 @@ P Received: from CALLER by mail.test.ex with local (Exim x.yz) id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 calling local_scan(); timeout=300 local_scan() returned 0 NULL -Writing spool header file +Writing spool header file: TESTSUITE/spool/input///hdr.pppp +Renaming spool header file: TESTSUITE/spool/input///10HmaY-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss diff --git a/test/stderr/0361 b/test/stderr/0361 index 43bcdbf84..78ca892c0 100644 --- a/test/stderr/0361 +++ b/test/stderr/0361 @@ -35,6 +35,7 @@ I Message-Id: F From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 +Data file name: TESTSUITE/spool/input///10HmaY-0005vi-00-D Data file written for message 10HmaY-0005vi-00 >>Generated Received: header line P Received: from CALLER by the.local.host.name with local (Exim x.yz) @@ -43,11 +44,12 @@ P Received: from CALLER by the.local.host.name with local (Exim x.yz) for kilos@recurse.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 calling local_scan(); timeout=300 local_scan() returned 0 NULL -Writing spool header file +Writing spool header file: TESTSUITE/spool/input///hdr.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |kilos@recurse.test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool/input///10HmaY-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss @@ -67,6 +69,7 @@ seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmaY-0005vi-00 +Trying spool file TESTSUITE/spool/input///10HmaY-0005vi-00-D reading spool file 10HmaY-0005vi-00-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER diff --git a/test/stderr/0371 b/test/stderr/0371 index 534a643f3..2ce08ca37 100644 --- a/test/stderr/0371 +++ b/test/stderr/0371 @@ -75,6 +75,7 @@ search_tidyup called search_tidyup called >>Headers after rewriting and local additions: +Data file name: TESTSUITE/spool/input///10HmaX-0005vi-00-D Data file written for message 10HmaX-0005vi-00 >>Generated Received: header line P Received: from [V4NET.0.0.0] (helo=something) diff --git a/test/stderr/0386 b/test/stderr/0386 index 3232ada03..c58af3219 100644 --- a/test/stderr/0386 +++ b/test/stderr/0386 @@ -191,6 +191,7 @@ host in ignore_fromline_hosts? no (option unset) search_tidyup called >>Headers after rewriting and local additions: +Data file name: TESTSUITE/spool/input///10HmaX-0005vi-00-D Data file written for message 10HmaX-0005vi-00 >>Generated Received: header line P Received: from [V4NET.11.12.13] (ident=CALLER) @@ -204,11 +205,12 @@ P Received: from [V4NET.11.12.13] (ident=CALLER) >> calling local_scan(); timeout=300 local_scan() returned 0 NULL -Writing spool header file +Writing spool header file: TESTSUITE/spool/input///hdr.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |2@b| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool/input///10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN <= x@y H=[V4NET.11.12.13] U=CALLER P=smtp S=sss @@ -228,6 +230,7 @@ seeking password data for user "CALLER": using cached result getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmaX-0005vi-00 +Trying spool file TESTSUITE/spool/input///10HmaX-0005vi-00-D reading spool file 10HmaX-0005vi-00-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=x@y sender_fullhost = [V4NET.11.12.13] @@ -368,6 +371,7 @@ host in ignore_fromline_hosts? no (option unset) search_tidyup called >>Headers after rewriting and local additions: +Data file name: TESTSUITE/spool/input///10HmaY-0005vi-00-D Data file written for message 10HmaY-0005vi-00 >>Generated Received: header line P Received: from [V4NET.11.12.13] (ident=CALLER) @@ -381,11 +385,12 @@ P Received: from [V4NET.11.12.13] (ident=CALLER) >> calling local_scan(); timeout=300 local_scan() returned 0 NULL -Writing spool header file +Writing spool header file: TESTSUITE/spool/input///hdr.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |2@b| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool/input///10HmaY-0005vi-00-H Size of headers = sss LOG: MAIN <= x@y H=[V4NET.11.12.13] U=CALLER P=smtp S=sss @@ -405,6 +410,7 @@ seeking password data for user "CALLER": using cached result getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmaY-0005vi-00 +Trying spool file TESTSUITE/spool/input///10HmaY-0005vi-00-D reading spool file 10HmaY-0005vi-00-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=x@y sender_fullhost = [V4NET.11.12.13] diff --git a/test/stderr/0388 b/test/stderr/0388 index 67b47ab06..02bbe1b2a 100644 --- a/test/stderr/0388 +++ b/test/stderr/0388 @@ -202,6 +202,7 @@ T To: CALLER@myhost.test.ex I Message-Id: Date: Tue, 2 Mar 1999 09:44:33 +0000 +Data file name: TESTSUITE/spool/input///10HmaY-0005vi-00-D Data file written for message 10HmaY-0005vi-00 >>Generated Received: header line P Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) @@ -209,7 +210,8 @@ P Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 calling local_scan(); timeout=300 local_scan() returned 0 NULL -Writing spool header file +Writing spool header file: TESTSUITE/spool/input///hdr.pppp +Renaming spool header file: TESTSUITE/spool/input///10HmaY-0005vi-00-H Size of headers = sss LOG: MAIN <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss @@ -280,7 +282,8 @@ search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> -Writing spool header file +Writing spool header file: TESTSUITE/spool/input///hdr.pppp +Renaming spool header file: TESTSUITE/spool/input///10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN Completed diff --git a/test/stderr/0402 b/test/stderr/0402 index bf70c587f..7dbf3a12a 100644 --- a/test/stderr/0402 +++ b/test/stderr/0402 @@ -37,6 +37,7 @@ I Message-Id: F From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 +Data file name: TESTSUITE/spool/input///10HmaX-0005vi-00-D Data file written for message 10HmaX-0005vi-00 considering: ${tod_full} expanding: ${tod_full} @@ -148,7 +149,7 @@ local_scan() returned 0 NULL considering: ${tod_full} expanding: ${tod_full} result: Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file +Writing spool header file: TESTSUITE/spool/input///hdr.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 @@ -161,6 +162,7 @@ DSN: Flags :0 DSN: **** SPOOL_OUT - address: |rd+CALLER@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |rd+usery@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool/input///10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss @@ -186,6 +188,7 @@ seeking password data for user "CALLER": using cached result getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmaX-0005vi-00 +Trying spool file TESTSUITE/spool/input///10HmaX-0005vi-00-D reading spool file 10HmaX-0005vi-00-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER diff --git a/test/stderr/0403 b/test/stderr/0403 index 96e990bfd..382ce1137 100644 --- a/test/stderr/0403 +++ b/test/stderr/0403 @@ -25,6 +25,7 @@ I Message-Id: F From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 +Data file name: TESTSUITE/spool/input///10HmaX-0005vi-00-D Data file written for message 10HmaX-0005vi-00 >>Generated Received: header line P Received: from CALLER by mail.test.ex with local (Exim x.yz) @@ -33,11 +34,12 @@ P Received: from CALLER by mail.test.ex with local (Exim x.yz) 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 +Writing spool header file: TESTSUITE/spool/input///hdr.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |userx@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool/input///10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss @@ -55,6 +57,7 @@ seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmaX-0005vi-00 +Trying spool file TESTSUITE/spool/input///10HmaX-0005vi-00-D reading spool file 10HmaX-0005vi-00-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER diff --git a/test/stderr/0404 b/test/stderr/0404 index 1f791c416..54d077603 100644 --- a/test/stderr/0404 +++ b/test/stderr/0404 @@ -125,6 +125,7 @@ I Message-Id: F From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 +Data file name: TESTSUITE/spool/input///10HmaX-0005vi-00-D Data file written for message 10HmaX-0005vi-00 >>Generated Received: header line P Received: from CALLER by mail.test.ex with local (Exim x.yz) @@ -133,11 +134,12 @@ P Received: from CALLER by mail.test.ex with local (Exim x.yz) 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 +Writing spool header file: TESTSUITE/spool/input///hdr.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |userx@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool/input///10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss @@ -158,6 +160,7 @@ seeking password data for user "CALLER": using cached result getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmaX-0005vi-00 +Trying spool file TESTSUITE/spool/input///10HmaX-0005vi-00-D reading spool file 10HmaX-0005vi-00-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER @@ -286,13 +289,14 @@ I Message-Id: F From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 +Data file name: TESTSUITE/spool/input///10HmaY-0005vi-00-D Data file written for message 10HmaY-0005vi-00 >>Generated Received: header line P Received: from CALLER by mail.test.ex with local (Exim x.yz) id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 calling local_scan(); timeout=300 local_scan() returned 0 NULL -Writing spool header file +Writing spool header file: TESTSUITE/spool/input///hdr.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 @@ -1511,6 +1515,7 @@ DSN: Flags :0 DSN: **** SPOOL_OUT - address: |sender@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |sender@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool/input///10HmaY-0005vi-00-H Size of headers = sss LOG: MAIN <= <> R=10HmaX-0005vi-00 U=CALLER P=local S=sss @@ -1530,6 +1535,7 @@ seeking password data for user "CALLER": using cached result getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmaY-0005vi-00 +Trying spool file TESTSUITE/spool/input///10HmaY-0005vi-00-D reading spool file 10HmaY-0005vi-00-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender= sender_local=1 ident=CALLER diff --git a/test/stderr/0408 b/test/stderr/0408 index 67fe44cb5..8a57ad9b7 100644 --- a/test/stderr/0408 +++ b/test/stderr/0408 @@ -25,6 +25,7 @@ I Message-Id: F From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 +Data file name: TESTSUITE/spool/input///10HmaX-0005vi-00-D Data file written for message 10HmaX-0005vi-00 >>Generated Received: header line P Received: from CALLER by mail.test.ex with local (Exim x.yz) @@ -33,11 +34,12 @@ P Received: from CALLER by mail.test.ex with local (Exim x.yz) 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 +Writing spool header file: TESTSUITE/spool/input///hdr.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |userx@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool/input///10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss @@ -55,6 +57,7 @@ seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmaX-0005vi-00 +Trying spool file TESTSUITE/spool/input///10HmaX-0005vi-00-D reading spool file 10HmaX-0005vi-00-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER diff --git a/test/stderr/0420 b/test/stderr/0420 index 1bf978723..886eb12eb 100644 --- a/test/stderr/0420 +++ b/test/stderr/0420 @@ -39,6 +39,7 @@ host in ignore_fromline_hosts? no (option unset) search_tidyup called >>Headers after rewriting and local additions: +Data file name: TESTSUITE/spool/input///10HmaX-0005vi-00-D Data file written for message 10HmaX-0005vi-00 >>Generated Received: header line * Received: ; Tue, 2 Mar 1999 09:44:33 +0000 @@ -65,6 +66,7 @@ host in ignore_fromline_hosts? no (option unset) search_tidyup called >>Headers after rewriting and local additions: +Data file name: TESTSUITE/spool/input///10HmaY-0005vi-00-D Data file written for message 10HmaY-0005vi-00 >>Generated Received: header line P Received: some text; Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stderr/0465 b/test/stderr/0465 index f86dc46e8..1dc75f2cf 100644 --- a/test/stderr/0465 +++ b/test/stderr/0465 @@ -69,6 +69,7 @@ T To: abc@domain. I Message-Id: Date: Tue, 2 Mar 1999 09:44:33 +0000 +Data file name: TESTSUITE/spool/input///10HmaY-0005vi-00-D Data file written for message 10HmaY-0005vi-00 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) @@ -81,11 +82,12 @@ accept: condition test succeeded in ACL "check_data" end of ACL "check_data": ACCEPT calling local_scan(); timeout=300 local_scan() returned 0 NULL -Writing spool header file +Writing spool header file: TESTSUITE/spool/input///hdr.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |abc@domain| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool/input///10HmaY-0005vi-00-H Size of headers = sss LOG: MAIN <= <> U=CALLER P=local-smtp S=sss @@ -138,6 +140,7 @@ T To: abc@xyz. I Message-Id: Date: Tue, 2 Mar 1999 09:44:33 +0000 +Data file name: TESTSUITE/spool/input///10HmaX-0005vi-00-D Data file written for message 10HmaX-0005vi-00 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) diff --git a/test/stderr/0471 b/test/stderr/0471 index 1c860c21f..02d1b4bb1 100644 --- a/test/stderr/0471 +++ b/test/stderr/0471 @@ -25366,6 +25366,7 @@ I Message-Id: F From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 +Data file name: TESTSUITE/spool/input///10HmaX-0005vi-00-D Data file written for message 10HmaX-0005vi-00 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) @@ -25374,11 +25375,12 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) for r1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 calling local_scan(); timeout=300 local_scan() returned 0 NULL -Writing spool header file +Writing spool header file: TESTSUITE/spool/input///hdr.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |r1@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool/input///10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss diff --git a/test/stderr/0487 b/test/stderr/0487 index c8d720beb..5728165da 100644 --- a/test/stderr/0487 +++ b/test/stderr/0487 @@ -49,6 +49,7 @@ F From: unqualified I Message-Id: Date: Tue, 2 Mar 1999 09:44:33 +0000 +Data file name: TESTSUITE/spool/input///10HmaX-0005vi-00-D Data file written for message 10HmaX-0005vi-00 >>Generated Received: header line P Received: from CALLER (helo=x.y) @@ -58,11 +59,12 @@ P Received: from CALLER (helo=x.y) 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 +Writing spool header file: TESTSUITE/spool/input///hdr.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |userx@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool/input///10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN <= x@y U=CALLER P=local-esmtp S=sss @@ -83,6 +85,7 @@ seeking password data for user "CALLER": using cached result getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmaX-0005vi-00 +Trying spool file TESTSUITE/spool/input///10HmaX-0005vi-00-D reading spool file 10HmaX-0005vi-00-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=x@y sender_local=0 ident=CALLER diff --git a/test/stderr/0489 b/test/stderr/0489 index 291dda645..df98dd23c 100644 --- a/test/stderr/0489 +++ b/test/stderr/0489 @@ -14,6 +14,7 @@ I Message-Id: F From: "Phil Q. Hazel" Date: Tue, 2 Mar 1999 09:44:33 +0000 +Data file name: TESTSUITE/spool/input///10HmaX-0005vi-00-D Data file written for message 10HmaX-0005vi-00 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) @@ -22,7 +23,8 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 calling local_scan(); timeout=300 local_scan() returned 0 NULL -Writing spool header file +Writing spool header file: TESTSUITE/spool/input///hdr.pppp +Renaming spool header file: TESTSUITE/spool/input///10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss @@ -44,6 +46,7 @@ I Message-Id: F From: John "Jack" Smith Date: Tue, 2 Mar 1999 09:44:33 +0000 +Data file name: TESTSUITE/spool/input///10HmaY-0005vi-00-D Data file written for message 10HmaY-0005vi-00 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) @@ -52,7 +55,8 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 calling local_scan(); timeout=300 local_scan() returned 0 NULL -Writing spool header file +Writing spool header file: TESTSUITE/spool/input///hdr.pppp +Renaming spool header file: TESTSUITE/spool/input///10HmaY-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss @@ -73,6 +77,7 @@ I Message-Id: F From: John "Jack" "Q." Smith Date: Tue, 2 Mar 1999 09:44:33 +0000 +Data file name: TESTSUITE/spool/input///10HmaZ-0005vi-00-D Data file written for message 10HmaZ-0005vi-00 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) @@ -81,7 +86,8 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 calling local_scan(); timeout=300 local_scan() returned 0 NULL -Writing spool header file +Writing spool header file: TESTSUITE/spool/input///hdr.pppp +Renaming spool header file: TESTSUITE/spool/input///10HmaZ-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss @@ -102,6 +108,7 @@ I Message-Id: F From: "John (Jack) Q. Smith" Date: Tue, 2 Mar 1999 09:44:33 +0000 +Data file name: TESTSUITE/spool/input///10HmbA-0005vi-00-D Data file written for message 10HmbA-0005vi-00 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) @@ -110,7 +117,8 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 calling local_scan(); timeout=300 local_scan() returned 0 NULL -Writing spool header file +Writing spool header file: TESTSUITE/spool/input///hdr.pppp +Renaming spool header file: TESTSUITE/spool/input///10HmbA-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss @@ -131,6 +139,7 @@ I Message-Id: F From: John ("Jack") "Q." Smith Date: Tue, 2 Mar 1999 09:44:33 +0000 +Data file name: TESTSUITE/spool/input///10HmbB-0005vi-00-D Data file written for message 10HmbB-0005vi-00 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) @@ -139,7 +148,8 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 calling local_scan(); timeout=300 local_scan() returned 0 NULL -Writing spool header file +Writing spool header file: TESTSUITE/spool/input///hdr.pppp +Renaming spool header file: TESTSUITE/spool/input///10HmbB-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss @@ -160,6 +170,7 @@ I Message-Id: F From: "John (\"Jack\") Q. Smith" Date: Tue, 2 Mar 1999 09:44:33 +0000 +Data file name: TESTSUITE/spool/input///10HmbC-0005vi-00-D Data file written for message 10HmbC-0005vi-00 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) @@ -168,7 +179,8 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 calling local_scan(); timeout=300 local_scan() returned 0 NULL -Writing spool header file +Writing spool header file: TESTSUITE/spool/input///hdr.pppp +Renaming spool header file: TESTSUITE/spool/input///10HmbC-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss @@ -189,6 +201,7 @@ I Message-Id: F From: "Phil \"Q Hazel" Date: Tue, 2 Mar 1999 09:44:33 +0000 +Data file name: TESTSUITE/spool/input///10HmbD-0005vi-00-D Data file written for message 10HmbD-0005vi-00 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) @@ -197,7 +210,8 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 calling local_scan(); timeout=300 local_scan() returned 0 NULL -Writing spool header file +Writing spool header file: TESTSUITE/spool/input///hdr.pppp +Renaming spool header file: TESTSUITE/spool/input///10HmbD-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss @@ -218,6 +232,7 @@ I Message-Id: F From: "Phil \"Q" "X." Hazel Date: Tue, 2 Mar 1999 09:44:33 +0000 +Data file name: TESTSUITE/spool/input///10HmbE-0005vi-00-D Data file written for message 10HmbE-0005vi-00 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) @@ -226,7 +241,8 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 calling local_scan(); timeout=300 local_scan() returned 0 NULL -Writing spool header file +Writing spool header file: TESTSUITE/spool/input///hdr.pppp +Renaming spool header file: TESTSUITE/spool/input///10HmbE-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss diff --git a/test/stderr/2600 b/test/stderr/2600 index cc1864aa2..c74693c66 100644 --- a/test/stderr/2600 +++ b/test/stderr/2600 @@ -309,6 +309,7 @@ I Message-Id: F From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 +Data file name: TESTSUITE/spool/input///10HmaX-0005vi-00-D Data file written for message 10HmaX-0005vi-00 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) @@ -317,11 +318,12 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 calling local_scan(); timeout=300 local_scan() returned 0 NULL -Writing spool header file +Writing spool header file: TESTSUITE/spool/input///hdr.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |userx@myhost.test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool/input///10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss @@ -339,6 +341,7 @@ seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmaX-0005vi-00 +Trying spool file TESTSUITE/spool/input///10HmaX-0005vi-00-D reading spool file 10HmaX-0005vi-00-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@myhost.test.ex sender_local=1 ident=CALLER diff --git a/test/stderr/5004 b/test/stderr/5004 index 501488711..bf8809495 100644 --- a/test/stderr/5004 +++ b/test/stderr/5004 @@ -27,6 +27,7 @@ I Message-Id: F From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 +Data file name: TESTSUITE/spool/input///10HmaX-0005vi-00-D Data file written for message 10HmaX-0005vi-00 >>Generated Received: header line P Received: from CALLER by mail.test.ex with local (Exim x.yz) @@ -35,11 +36,12 @@ P Received: from CALLER by mail.test.ex with local (Exim x.yz) 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 +Writing spool header file: TESTSUITE/spool/input///hdr.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |userx@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool/input///10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss @@ -59,6 +61,7 @@ seeking password data for user "CALLER": using cached result getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmaX-0005vi-00 +Trying spool file TESTSUITE/spool/input///10HmaX-0005vi-00-D reading spool file 10HmaX-0005vi-00-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER diff --git a/test/stderr/5005 b/test/stderr/5005 index f55aa9b1f..a9f06f4f6 100644 --- a/test/stderr/5005 +++ b/test/stderr/5005 @@ -25,6 +25,7 @@ I Message-Id: F From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 +Data file name: TESTSUITE/spool/input///10HmaX-0005vi-00-D Data file written for message 10HmaX-0005vi-00 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) @@ -33,11 +34,12 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) for nofile@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 calling local_scan(); timeout=300 local_scan() returned 0 NULL -Writing spool header file +Writing spool header file: TESTSUITE/spool/input///hdr.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |nofile@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool/input///10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss @@ -55,6 +57,7 @@ seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmaX-0005vi-00 +Trying spool file TESTSUITE/spool/input///10HmaX-0005vi-00-D reading spool file 10HmaX-0005vi-00-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER @@ -209,6 +212,7 @@ I Message-Id: F From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 +Data file name: TESTSUITE/spool/input///10HmaY-0005vi-00-D Data file written for message 10HmaY-0005vi-00 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) @@ -217,11 +221,12 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) 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 +Writing spool header file: TESTSUITE/spool/input///hdr.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |userx@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool/input///10HmaY-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss @@ -238,6 +243,7 @@ seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmaY-0005vi-00 +Trying spool file TESTSUITE/spool/input///10HmaY-0005vi-00-D reading spool file 10HmaY-0005vi-00-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER @@ -393,6 +399,7 @@ I Message-Id: F From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 +Data file name: TESTSUITE/spool/input///10HmaZ-0005vi-00-D Data file written for message 10HmaZ-0005vi-00 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) @@ -401,11 +408,12 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) 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 +Writing spool header file: TESTSUITE/spool/input///hdr.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |userx@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool/input///10HmaZ-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss @@ -422,6 +430,7 @@ seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmaZ-0005vi-00 +Trying spool file TESTSUITE/spool/input///10HmaZ-0005vi-00-D reading spool file 10HmaZ-0005vi-00-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER @@ -545,11 +554,12 @@ Writing retry data for T:userx@test.ex dbfn_write: key=T:userx@test.ex end of retry processing delivery deferred: update_spool=1 header_rewritten=0 -Writing spool header file +Writing spool header file: TESTSUITE/spool/input///hdr.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |userx@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool/input///10HmaZ-0005vi-00-H Size of headers = sss end delivery of 10HmaZ-0005vi-00 search_tidyup called @@ -584,6 +594,7 @@ I Message-Id: F From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 +Data file name: TESTSUITE/spool/input///10HmbA-0005vi-00-D Data file written for message 10HmbA-0005vi-00 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) @@ -592,11 +603,12 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) 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 +Writing spool header file: TESTSUITE/spool/input///hdr.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |userx@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool/input///10HmbA-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss @@ -613,6 +625,7 @@ seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmbA-0005vi-00 +Trying spool file TESTSUITE/spool/input///10HmbA-0005vi-00-D reading spool file 10HmbA-0005vi-00-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER @@ -729,11 +742,12 @@ Writing retry data for T:userx@test.ex dbfn_write: key=T:userx@test.ex end of retry processing delivery deferred: update_spool=1 header_rewritten=0 -Writing spool header file +Writing spool header file: TESTSUITE/spool/input///hdr.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |userx@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool/input///10HmbA-0005vi-00-H Size of headers = sss end delivery of 10HmbA-0005vi-00 search_tidyup called diff --git a/test/stderr/5006 b/test/stderr/5006 index 15e322819..a7878a284 100644 --- a/test/stderr/5006 +++ b/test/stderr/5006 @@ -25,6 +25,7 @@ I Message-Id: F From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 +Data file name: TESTSUITE/spool/input///10HmaX-0005vi-00-D Data file written for message 10HmaX-0005vi-00 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) @@ -33,11 +34,12 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) 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 +Writing spool header file: TESTSUITE/spool/input///hdr.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |userx@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool/input///10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss @@ -55,6 +57,7 @@ seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmaX-0005vi-00 +Trying spool file TESTSUITE/spool/input///10HmaX-0005vi-00-D reading spool file 10HmaX-0005vi-00-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER -- cgit v1.2.3