From 0971ec06ad925235fd3c6dae90a4fbc852ee72e8 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Tue, 10 May 2016 16:00:57 +0100 Subject: [PATCH] shift queue name use up to top layer in spooldir hierachy --- src/src/queue.c | 27 ++++++++++---------- src/src/receive.c | 2 +- test/scripts/0000-Basic/0574 | 2 +- test/stderr/0022 | 6 ++--- test/stderr/0218 | 8 +++--- test/stderr/0275 | 8 +++--- test/stderr/0278 | 8 +++--- test/stderr/0294 | 12 ++++----- test/stderr/0303 | 4 +-- test/stderr/0317 | 12 ++++----- test/stderr/0361 | 8 +++--- test/stderr/0371 | 2 +- test/stderr/0386 | 16 ++++++------ test/stderr/0388 | 10 ++++---- test/stderr/0402 | 8 +++--- test/stderr/0403 | 8 +++--- test/stderr/0404 | 16 ++++++------ test/stderr/0408 | 8 +++--- test/stderr/0420 | 4 +-- test/stderr/0465 | 8 +++--- test/stderr/0471 | 6 ++--- test/stderr/0487 | 8 +++--- test/stderr/0489 | 48 ++++++++++++++++++------------------ test/stderr/0514 | 2 +- test/stderr/2600 | 8 +++--- test/stderr/5004 | 8 +++--- test/stderr/5005 | 40 +++++++++++++++--------------- test/stderr/5006 | 8 +++--- 28 files changed, 153 insertions(+), 152 deletions(-) diff --git a/src/src/queue.c b/src/src/queue.c index d8c276013..f53759c43 100644 --- a/src/src/queue.c +++ b/src/src/queue.c @@ -12,49 +12,50 @@ -/* The number of nodes to use for the bottom-up merge sort when a list of queue -items is to be ordered. The code for this sort was contributed as a patch by -Michael Haardt. */ - -#define LOG2_MAXNODES 32 - - - /* Routines with knowlege of spool layout */ static void spool_pname_buf(uschar * buf, int len) { -snprintf(CS buf, len, "%s/input/%s", spool_directory, queue_name); +snprintf(CS buf, len, "%s/%s/input", spool_directory, queue_name); } static uschar * spool_dname(const uschar * purpose, uschar * subdir) { return string_sprintf("%s/%s/%s/%s", - spool_directory, purpose, queue_name, subdir); + spool_directory, queue_name, purpose, subdir); } uschar * spool_sname(const uschar * purpose, uschar * subdir) { return string_sprintf("%s%s%s%s%s", + queue_name, *queue_name ? "/" : "", purpose, - *queue_name ? "/" : "", queue_name, - *message_subdir ? "/" : "", message_subdir); + *subdir ? "/" : "", subdir); } uschar * spool_fname(const uschar * purpose, uschar * subdir, uschar * fname, uschar * suffix) { return string_sprintf("%s/%s/%s/%s/%s%s", - spool_directory, purpose, queue_name, subdir, fname, suffix); + spool_directory, queue_name, purpose, subdir, fname, suffix); } #ifndef COMPILE_UTILITY + +/* The number of nodes to use for the bottom-up merge sort when a list of queue +items is to be ordered. The code for this sort was contributed as a patch by +Michael Haardt. */ + +#define LOG2_MAXNODES 32 + + + /************************************************* * Helper sort function for queue_get_spool_list * *************************************************/ diff --git a/src/src/receive.c b/src/src/receive.c index a0d975897..8e4384ae1 100644 --- a/src/src/receive.c +++ b/src/src/receive.c @@ -2869,7 +2869,7 @@ if ((data_fd = Uopen(spool_name, O_RDWR|O_CREAT|O_EXCL, SPOOL_MODE)) < 0) { if (errno == ENOENT) { - (void)directory_make(spool_directory, + (void) directory_make(spool_directory, spool_sname(US"input", message_subdir), INPUT_DIRECTORY_MODE, TRUE); data_fd = Uopen(spool_name, O_RDWR|O_CREAT|O_EXCL, SPOOL_MODE); diff --git a/test/scripts/0000-Basic/0574 b/test/scripts/0000-Basic/0574 index 3c7a06c5a..7fe6ddb05 100644 --- a/test/scripts/0000-Basic/0574 +++ b/test/scripts/0000-Basic/0574 @@ -3,7 +3,7 @@ # no_msglog_check # -exim -bs +exim -bs MAIL FROM: RCPT TO: DATA diff --git a/test/stderr/0022 b/test/stderr/0022 index ad072543c..c51b15bda 100644 --- a/test/stderr/0022 +++ b/test/stderr/0022 @@ -45,7 +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 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] @@ -115,7 +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 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] @@ -183,7 +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 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/0218 b/test/stderr/0218 index 68c8448f7..fe4ee2df9 100644 --- a/test/stderr/0218 +++ b/test/stderr/0218 @@ -5,7 +5,7 @@ Single queue run LOG: queue_run MAIN Start queue run: pid=pppp -qq queue running combined directories -looking in TESTSUITE/spool/input/ +looking in TESTSUITE/spool//input delivering 10HmaX-0005vi-00 (queue run pid ppppp) R: client (ACL) T: send_to_server (ACL) @@ -13,7 +13,7 @@ delivering 10HmaY-0005vi-00 (queue run pid ppppp) R: client (ACL) T: send_to_server (ACL) queue running combined directories -looking in TESTSUITE/spool/input/ +looking in TESTSUITE/spool//input delivering 10HmaX-0005vi-00 (queue run pid ppppp) R: client (ACL) T: send_to_server (ACL) @@ -67,7 +67,7 @@ Single queue run LOG: queue_run MAIN Start queue run: pid=pppp -qq queue running combined directories -looking in TESTSUITE/spool/input/ +looking in TESTSUITE/spool//input delivering 10HmaZ-0005vi-00 (queue run pid ppppp) R: client (ACL) T: send_to_server (ACL) @@ -75,7 +75,7 @@ delivering 10HmbA-0005vi-00 (queue run pid ppppp) R: client (ACL) T: send_to_server (ACL) queue running combined directories -looking in TESTSUITE/spool/input/ +looking in TESTSUITE/spool//input delivering 10HmaZ-0005vi-00 (queue run pid ppppp) R: client (ACL) T: send_to_server (ACL) diff --git a/test/stderr/0275 b/test/stderr/0275 index 53d60770b..0806065d4 100644 --- a/test/stderr/0275 +++ b/test/stderr/0275 @@ -141,7 +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 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) @@ -150,12 +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: TESTSUITE/spool/input///hdr.pppp +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 +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 @@ -181,7 +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 +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 5ef41ea6d..2a1afdd06 100644 --- a/test/stderr/0278 +++ b/test/stderr/0278 @@ -92,7 +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 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) @@ -101,12 +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: TESTSUITE/spool/input///hdr.pppp +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 +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 @@ -128,7 +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 +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 d950630dd..abd94f4f1 100644 --- a/test/stderr/0294 +++ b/test/stderr/0294 @@ -38,7 +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 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) @@ -46,8 +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: TESTSUITE/spool/input///hdr.pppp -Renaming spool header file: TESTSUITE/spool/input///10HmaX-0005vi-00-H +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 @@ -69,7 +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 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) @@ -78,8 +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: TESTSUITE/spool/input///hdr.pppp -Renaming spool header file: TESTSUITE/spool/input///10HmaY-0005vi-00-H +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 dc27c67cc..cc6b08b27 100644 --- a/test/stderr/0303 +++ b/test/stderr/0303 @@ -90,7 +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 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] @@ -163,7 +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 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 c9b4bb89f..5ffdc4a36 100644 --- a/test/stderr/0317 +++ b/test/stderr/0317 @@ -17,7 +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 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) @@ -25,8 +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: TESTSUITE/spool/input///hdr.pppp -Renaming spool header file: TESTSUITE/spool/input///10HmaX-0005vi-00-H +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 @@ -57,7 +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 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) @@ -65,8 +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: TESTSUITE/spool/input///hdr.pppp -Renaming spool header file: TESTSUITE/spool/input///10HmaY-0005vi-00-H +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 78ca892c0..1c8029894 100644 --- a/test/stderr/0361 +++ b/test/stderr/0361 @@ -35,7 +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 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) @@ -44,12 +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: TESTSUITE/spool/input///hdr.pppp +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 +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 @@ -69,7 +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 +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 2ce08ca37..2eabbaa6f 100644 --- a/test/stderr/0371 +++ b/test/stderr/0371 @@ -75,7 +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 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 c58af3219..422f74d21 100644 --- a/test/stderr/0386 +++ b/test/stderr/0386 @@ -191,7 +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 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) @@ -205,12 +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: TESTSUITE/spool/input///hdr.pppp +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 +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 @@ -230,7 +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 +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] @@ -371,7 +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 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) @@ -385,12 +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: TESTSUITE/spool/input///hdr.pppp +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 +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 @@ -410,7 +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 +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 02bbe1b2a..d45a21121 100644 --- a/test/stderr/0388 +++ b/test/stderr/0388 @@ -202,7 +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 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) @@ -210,8 +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: TESTSUITE/spool/input///hdr.pppp -Renaming spool header file: TESTSUITE/spool/input///10HmaY-0005vi-00-H +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 @@ -282,8 +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: TESTSUITE/spool/input///hdr.pppp -Renaming spool header file: TESTSUITE/spool/input///10HmaX-0005vi-00-H +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 7dbf3a12a..9f95393f3 100644 --- a/test/stderr/0402 +++ b/test/stderr/0402 @@ -37,7 +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 name: TESTSUITE/spool//input//10HmaX-0005vi-00-D Data file written for message 10HmaX-0005vi-00 considering: ${tod_full} expanding: ${tod_full} @@ -149,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: TESTSUITE/spool/input///hdr.pppp +Writing spool header file: TESTSUITE/spool//input//hdr.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 @@ -162,7 +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 +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 @@ -188,7 +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 +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 382ce1137..0f5338b38 100644 --- a/test/stderr/0403 +++ b/test/stderr/0403 @@ -25,7 +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 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) @@ -34,12 +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: TESTSUITE/spool/input///hdr.pppp +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 +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 @@ -57,7 +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 +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 54d077603..f1c32cf94 100644 --- a/test/stderr/0404 +++ b/test/stderr/0404 @@ -125,7 +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 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) @@ -134,12 +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: TESTSUITE/spool/input///hdr.pppp +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 +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 @@ -160,7 +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 +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 @@ -289,14 +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 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: TESTSUITE/spool/input///hdr.pppp +Writing spool header file: TESTSUITE/spool//input//hdr.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 @@ -1515,7 +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 +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 @@ -1535,7 +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 +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 8a57ad9b7..96b57117d 100644 --- a/test/stderr/0408 +++ b/test/stderr/0408 @@ -25,7 +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 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) @@ -34,12 +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: TESTSUITE/spool/input///hdr.pppp +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 +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 @@ -57,7 +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 +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 886eb12eb..42f303134 100644 --- a/test/stderr/0420 +++ b/test/stderr/0420 @@ -39,7 +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 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 @@ -66,7 +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 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 1dc75f2cf..01b71ac81 100644 --- a/test/stderr/0465 +++ b/test/stderr/0465 @@ -69,7 +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 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) @@ -82,12 +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: TESTSUITE/spool/input///hdr.pppp +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 +Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H Size of headers = sss LOG: MAIN <= <> U=CALLER P=local-smtp S=sss @@ -140,7 +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 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 02d1b4bb1..eba0e4a52 100644 --- a/test/stderr/0471 +++ b/test/stderr/0471 @@ -25366,7 +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 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) @@ -25375,12 +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: TESTSUITE/spool/input///hdr.pppp +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 +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 5728165da..1f4f5116e 100644 --- a/test/stderr/0487 +++ b/test/stderr/0487 @@ -49,7 +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 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) @@ -59,12 +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: TESTSUITE/spool/input///hdr.pppp +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 +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 @@ -85,7 +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 +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 df98dd23c..23b0212a0 100644 --- a/test/stderr/0489 +++ b/test/stderr/0489 @@ -14,7 +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 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) @@ -23,8 +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: TESTSUITE/spool/input///hdr.pppp -Renaming spool header file: TESTSUITE/spool/input///10HmaX-0005vi-00-H +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 @@ -46,7 +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 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) @@ -55,8 +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: TESTSUITE/spool/input///hdr.pppp -Renaming spool header file: TESTSUITE/spool/input///10HmaY-0005vi-00-H +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 @@ -77,7 +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 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) @@ -86,8 +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: TESTSUITE/spool/input///hdr.pppp -Renaming spool header file: TESTSUITE/spool/input///10HmaZ-0005vi-00-H +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 @@ -108,7 +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 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) @@ -117,8 +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: TESTSUITE/spool/input///hdr.pppp -Renaming spool header file: TESTSUITE/spool/input///10HmbA-0005vi-00-H +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 @@ -139,7 +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 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) @@ -148,8 +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: TESTSUITE/spool/input///hdr.pppp -Renaming spool header file: TESTSUITE/spool/input///10HmbB-0005vi-00-H +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 @@ -170,7 +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 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) @@ -179,8 +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: TESTSUITE/spool/input///hdr.pppp -Renaming spool header file: TESTSUITE/spool/input///10HmbC-0005vi-00-H +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 @@ -201,7 +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 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) @@ -210,8 +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: TESTSUITE/spool/input///hdr.pppp -Renaming spool header file: TESTSUITE/spool/input///10HmbD-0005vi-00-H +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 @@ -232,7 +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 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) @@ -241,8 +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: TESTSUITE/spool/input///hdr.pppp -Renaming spool header file: TESTSUITE/spool/input///10HmbE-0005vi-00-H +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/0514 b/test/stderr/0514 index 931e51649..0c24042f8 100644 --- a/test/stderr/0514 +++ b/test/stderr/0514 @@ -6,7 +6,7 @@ admin user changed uid/gid: privilege not needed uid=EXIM_UID gid=EXIM_GID pid=pppp set_process_info: pppp listing the queue -looking in TESTSUITE/spool/input/ +looking in TESTSUITE/spool//input reading spool file 10HmaX-0005vi-00-H user=spaced user uid=CALLER_UID gid=CALLER_GID sender="spaced user"@myhost.test.ex sender_local=1 ident=spaced user diff --git a/test/stderr/2600 b/test/stderr/2600 index c74693c66..6f2eaeac1 100644 --- a/test/stderr/2600 +++ b/test/stderr/2600 @@ -309,7 +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 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) @@ -318,12 +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: TESTSUITE/spool/input///hdr.pppp +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 +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 @@ -341,7 +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 +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 bf8809495..c619887d3 100644 --- a/test/stderr/5004 +++ b/test/stderr/5004 @@ -27,7 +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 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) @@ -36,12 +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: TESTSUITE/spool/input///hdr.pppp +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 +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 @@ -61,7 +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 +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 a9f06f4f6..ad683388f 100644 --- a/test/stderr/5005 +++ b/test/stderr/5005 @@ -25,7 +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 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) @@ -34,12 +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: TESTSUITE/spool/input///hdr.pppp +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 +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 @@ -57,7 +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 +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 @@ -212,7 +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 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) @@ -221,12 +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: TESTSUITE/spool/input///hdr.pppp +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 +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 @@ -243,7 +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 +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 @@ -399,7 +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 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) @@ -408,12 +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: TESTSUITE/spool/input///hdr.pppp +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 +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 @@ -430,7 +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 +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 @@ -554,12 +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: TESTSUITE/spool/input///hdr.pppp +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 +Renaming spool header file: TESTSUITE/spool//input//10HmaZ-0005vi-00-H Size of headers = sss end delivery of 10HmaZ-0005vi-00 search_tidyup called @@ -594,7 +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 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) @@ -603,12 +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: TESTSUITE/spool/input///hdr.pppp +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 +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 @@ -625,7 +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 +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 @@ -742,12 +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: TESTSUITE/spool/input///hdr.pppp +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 +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 a7878a284..6162c9bb0 100644 --- a/test/stderr/5006 +++ b/test/stderr/5006 @@ -25,7 +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 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) @@ -34,12 +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: TESTSUITE/spool/input///hdr.pppp +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 +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 @@ -57,7 +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 +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 -- 2.30.2