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/runtest | 3 +++ 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 ++++- 24 files changed, 135 insertions(+), 36 deletions(-) (limited to 'test') diff --git a/test/runtest b/test/runtest index fa38ca019..fb93d8de3 100755 --- a/test/runtest +++ b/test/runtest @@ -1021,6 +1021,9 @@ RESET_AFTER_EXTRA_LINE_READ: # Environment cleaning next if /\w+ in keep_environment\? (yes|no)/; + # The spool header file name varies with PID + s%^(Writing spool header file: .*/hdr).[0-9]{1,5}%$1.pppp%; + # When Exim is checking the size of directories for maildir, it uses # the check_dir_size() function to scan directories. Of course, the order # of the files that are obtained using readdir() varies from system to 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 From 6073ad45c336ac31081bb1625f5415dc41344641 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sun, 8 May 2016 01:05:54 +0100 Subject: testcase --- doc/doc-docbook/spec.xfpt | 7 +++++++ src/src/exim.c | 8 ++++++-- src/src/queue.c | 13 +++++++++++-- test/confs/0574 | 45 ++++++++++++++++++++++++++++++++++++++++++++ test/log/0574 | 17 +++++++++++++++++ test/scripts/0000-Basic/0574 | 36 +++++++++++++++++++++++++++++++++++ test/stdout/0574 | 11 +++++++++++ 7 files changed, 133 insertions(+), 4 deletions(-) create mode 100644 test/confs/0574 create mode 100644 test/log/0574 create mode 100644 test/scripts/0000-Basic/0574 create mode 100644 test/stdout/0574 (limited to 'test') diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt index 8b615f831..4bc2e1118 100644 --- a/doc/doc-docbook/spec.xfpt +++ b/doc/doc-docbook/spec.xfpt @@ -3825,11 +3825,13 @@ This option is not intended for use by external callers. It is used internally by Exim in conjunction with the &%-MC%& option. It signifies that the remote host supports the ESMTP &_DSN_& extension. +.new .vitem &%-MCG%& .oindex "&%-MCG%&" This option is not intended for use by external callers. It is used internally by Exim in conjunction with the &%-MC%& option. It signifies that an alternate queue is used, named by the following option. +.wen .vitem &%-MCP%& .oindex "&%-MCP%&" @@ -4462,6 +4464,7 @@ The &'l'& (the letter &"ell"&) flag specifies that only local deliveries are to be done. If a message requires any remote deliveries, it remains on the queue for later delivery. +.new .vitem &%-q[q][i][f[f]][l][G]%& .oindex "&%-qG%&" .cindex queue named @@ -4471,6 +4474,7 @@ If the &'G'& flag and a name is present, the queue runner operates on the queue with the given name rather than the default queue. Because the name is the remainder of the option string, any periodic-run interval must be given as a separate &%-q%& option. +.wen .vitem &%-q%&<&'qflags'&>&~<&'start&~id'&>&~<&'end&~id'&> When scanning the queue, Exim can be made to skip over messages whose ids are @@ -28583,12 +28587,15 @@ all the conditions are true, wherever it appears in an ACL command, whereas effect. +.new .vitem &*queue*&&~=&~<&'text'&> This modifier specifies the use of a named queue for spool files for the message. This could be used, for example, for known high-volume burst sources of traffic, or for quarantine of messages. Separate queue-runner processes will be needed for named queues. +If the text after expansion is empty, the default queue is used. +.wen .vitem &*remove_header*&&~=&~<&'text'&> diff --git a/src/src/exim.c b/src/src/exim.c index 6432a4c2f..e4597c287 100644 --- a/src/src/exim.c +++ b/src/src/exim.c @@ -3243,7 +3243,7 @@ for (i = 1; i < argc; i++) if (*argrest == 'G') { - queue_name = string_copy(argrest); + queue_name = string_copy(argrest+1); do ++argrest; while (*argrest); } @@ -4675,7 +4675,11 @@ if (queue_interval == 0 && !daemon_listen) (start_queue_run_id == NULL)? US"" : start_queue_run_id, (stop_queue_run_id == NULL)? US"" : US" stopping at ", (stop_queue_run_id == NULL)? US"" : stop_queue_run_id); - set_process_info("running the queue (single queue run)"); + if (*queue_name) + set_process_info(CS string_sprintf( + "running the '%s' queue (single queue run)", queue_name)); + else + set_process_info("running the queue (single queue run)"); queue_run(start_queue_run_id, stop_queue_run_id, FALSE); exim_exit(EXIT_SUCCESS); } diff --git a/src/src/queue.c b/src/src/queue.c index c97179092..b6dff1107 100644 --- a/src/src/queue.c +++ b/src/src/queue.c @@ -391,7 +391,11 @@ if (!recurse) } log_detail = string_copy(big_buffer); - log_write(L_queue_run, LOG_MAIN, "Start queue run: %s", log_detail); + if (*queue_name) + log_write(L_queue_run, LOG_MAIN, "Start '%s' queue run: %s", + queue_name, log_detail); + else + log_write(L_queue_run, LOG_MAIN, "Start queue run: %s", log_detail); } /* If deliver_selectstring is a regex, compile it. */ @@ -700,7 +704,12 @@ if (queue_2stage) /* At top level, log the end of the run. */ -if (!recurse) log_write(L_queue_run, LOG_MAIN, "End queue run: %s", log_detail); +if (!recurse) + if (*queue_name) + log_write(L_queue_run, LOG_MAIN, "End '%s' queue run: %s", + queue_name, log_detail); + else + log_write(L_queue_run, LOG_MAIN, "End queue run: %s", log_detail); } diff --git a/test/confs/0574 b/test/confs/0574 new file mode 100644 index 000000000..aa3e93a9e --- /dev/null +++ b/test/confs/0574 @@ -0,0 +1,45 @@ +# Exim test configuration 0574 + +SERVER = + +exim_path = EXIM_PATH +keep_environment = +host_lookup_order = bydns +spool_directory = DIR/spool +log_file_path = DIR/spool/log/SERVER%slog +gecos_pattern = "" +gecos_name = CALLER_NAME +tls_advertise_hosts = + +log_selector = +received_recipients +sender_on_delivery + +acl_smtp_rcpt = accept queue = \ + ${if or {{eq {SERVER}{server}}{eq {normal}{$local_part}}} {} {$local_part}} +queue_only +queue_run_in_order + +#--------------- + +begin routers + +dump: + driver = redirect + condition = ${if eq {SERVER}{server}{yes}{no}} + data = :blackhole: + +all: + driver = manualroute + route_list = * 127.0.0.1 + self = send + transport = out + +#--------------- + +begin transports + +out: + driver = smtp + port = PORT_D + +# End + diff --git a/test/log/0574 b/test/log/0574 new file mode 100644 index 000000000..cf13480bc --- /dev/null +++ b/test/log/0574 @@ -0,0 +1,17 @@ +1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local-smtp S=sss for normal@test.ex +1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local-smtp S=sss for alternate@test.ex +1999-03-02 09:44:33 Start queue run: pid=pppp -qq +1999-03-02 09:44:33 10HmaX-0005vi-00 => normal@test.ex F= R=all T=out H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaZ-0005vi-00" +1999-03-02 09:44:33 10HmaX-0005vi-00 Completed +1999-03-02 09:44:33 End queue run: pid=pppp -qq +1999-03-02 09:44:33 Start 'nosuchqueue' queue run: pid=pppp +1999-03-02 09:44:33 End 'nosuchqueue' queue run: pid=pppp +1999-03-02 09:44:33 Start 'alternate' queue run: pid=pppp +1999-03-02 09:44:33 10HmaY-0005vi-00 => alternate@test.ex F= R=all T=out H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00" +1999-03-02 09:44:33 10HmaY-0005vi-00 Completed +1999-03-02 09:44:33 End 'alternate' queue run: pid=pppp + +******** SERVER ******** +1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 +1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name for normal@test.ex +1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaY-0005vi-00@the.local.host.name for alternate@test.ex diff --git a/test/scripts/0000-Basic/0574 b/test/scripts/0000-Basic/0574 new file mode 100644 index 000000000..53f7a5da1 --- /dev/null +++ b/test/scripts/0000-Basic/0574 @@ -0,0 +1,36 @@ +# named queues +# Exim test configuration 0574 +# +exim -DSERVER=server -bd -oX PORT_D +**** +# +exim -bs +MAIL FROM: +RCPT TO: +DATA +Subject: test + +foo +. +RSET +MAIL FROM: +RCPT TO: +DATA +Subject: test + +foo +. +QUIT +**** +# +exim -qq +**** +# +exim -qGnosuchqueue +**** +# +exim -qGalternate +**** +# +killdaemon +no_msglog_check diff --git a/test/stdout/0574 b/test/stdout/0574 new file mode 100644 index 000000000..47285d74a --- /dev/null +++ b/test/stdout/0574 @@ -0,0 +1,11 @@ +220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +250 OK +250 Accepted +354 Enter message, ending with "." on a line by itself +250 OK id=10HmaX-0005vi-00 +250 Reset OK +250 OK +250 Accepted +354 Enter message, ending with "." on a line by itself +250 OK id=10HmaY-0005vi-00 +221 the.local.host.name closing connection -- cgit v1.2.3 From afa6d3adc30bd4898825af38763ce008cab5a774 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sun, 8 May 2016 01:24:47 +0100 Subject: logging --- doc/doc-docbook/spec.xfpt | 1 + src/src/deliver.c | 9 +++++++++ src/src/receive.c | 3 +++ test/log/0574 | 4 ++-- 4 files changed, 15 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt index 4bc2e1118..bb00fa1d2 100644 --- a/doc/doc-docbook/spec.xfpt +++ b/doc/doc-docbook/spec.xfpt @@ -35566,6 +35566,7 @@ the following table: &`P `& on &`<=`& lines: protocol used &` `& on &`=>`& and &`**`& lines: return path &`PRX `& on &'<='& and&`=>`& lines: proxy address +&`Q `& alternate queue name &`QT `& on &`=>`& lines: time spent on queue so far &` `& on &"Completed"& lines: time spent on queue &`R `& on &`<=`& lines: reference for local bounce diff --git a/src/src/deliver.c b/src/src/deliver.c index 631a3e18a..1fd3d46c0 100644 --- a/src/src/deliver.c +++ b/src/src/deliver.c @@ -880,6 +880,9 @@ if (LOGGING(sender_on_delivery) || msg) sender_address, US">"); +if (*queue_name) + s = string_append(s, &size, &ptr, 2, US" Q=", queue_name); + #ifdef EXPERIMENTAL_SRS if(addr->prop.srs_sender) s = string_append(s, &size, &ptr, 3, US" SRS=<", addr->prop.srs_sender, US">"); @@ -1267,6 +1270,9 @@ else if (result == DEFER || result == PANIC) s = string_cat(s, &size, &ptr, log_address); + if (*queue_name) + s = string_append(s, &size, &ptr, 2, US" Q=", queue_name); + /* Either driver_name contains something and driver_kind contains " router" or " transport" (note the leading space), or driver_name is a null string and driver_kind contains "routing" without the leading @@ -1388,6 +1394,9 @@ else if (LOGGING(sender_on_delivery)) s = string_append(s, &size, &ptr, 3, US" F=<", sender_address, US">"); + if (*queue_name) + s = string_append(s, &size, &ptr, 2, US" Q=", queue_name); + /* Return path may not be set if no delivery actually happened */ if (used_return_path && LOGGING(return_path_on_delivery)) diff --git a/src/src/receive.c b/src/src/receive.c index ea99cfb2b..c783cedfd 100644 --- a/src/src/receive.c +++ b/src/src/receive.c @@ -3804,6 +3804,9 @@ if (LOGGING(8bitmime)) s = string_append(s, &size, &sptr, 2, US" M8S=", big_buffer); } +if (*queue_name) + s = string_append(s, &size, &sptr, 2, US" Q=", queue_name); + /* If an addr-spec in a message-id contains a quoted string, it can contain any characters except " \ and CR and so in particular it can contain NL! Therefore, make sure we use a printing-characters only version for the log. diff --git a/test/log/0574 b/test/log/0574 index cf13480bc..206a95f38 100644 --- a/test/log/0574 +++ b/test/log/0574 @@ -1,5 +1,5 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local-smtp S=sss for normal@test.ex -1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local-smtp S=sss for alternate@test.ex +1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local-smtp S=sss Q=alternate for alternate@test.ex 1999-03-02 09:44:33 Start queue run: pid=pppp -qq 1999-03-02 09:44:33 10HmaX-0005vi-00 => normal@test.ex F= R=all T=out H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaZ-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed @@ -7,7 +7,7 @@ 1999-03-02 09:44:33 Start 'nosuchqueue' queue run: pid=pppp 1999-03-02 09:44:33 End 'nosuchqueue' queue run: pid=pppp 1999-03-02 09:44:33 Start 'alternate' queue run: pid=pppp -1999-03-02 09:44:33 10HmaY-0005vi-00 => alternate@test.ex F= R=all T=out H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00" +1999-03-02 09:44:33 10HmaY-0005vi-00 => alternate@test.ex F= Q=alternate R=all T=out H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 1999-03-02 09:44:33 End 'alternate' queue run: pid=pppp -- cgit v1.2.3 From dc7e5e528d1193fdd82676e451ac32751f28851b Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sun, 8 May 2016 12:43:06 +0100 Subject: testcase --- test/confs/0574 | 20 ++++++-------------- test/log/0574 | 9 ++------- test/scripts/0000-Basic/0574 | 4 ---- 3 files changed, 8 insertions(+), 25 deletions(-) (limited to 'test') diff --git a/test/confs/0574 b/test/confs/0574 index aa3e93a9e..722988a29 100644 --- a/test/confs/0574 +++ b/test/confs/0574 @@ -13,8 +13,7 @@ tls_advertise_hosts = log_selector = +received_recipients +sender_on_delivery -acl_smtp_rcpt = accept queue = \ - ${if or {{eq {SERVER}{server}}{eq {normal}{$local_part}}} {} {$local_part}} +acl_smtp_rcpt = accept queue = ${if eq {normal}{$local_part} {} {$local_part}} queue_only queue_run_in_order @@ -22,24 +21,17 @@ queue_run_in_order begin routers -dump: - driver = redirect - condition = ${if eq {SERVER}{server}{yes}{no}} - data = :blackhole: - all: - driver = manualroute - route_list = * 127.0.0.1 - self = send - transport = out + driver = accept + transport = dump #--------------- begin transports -out: - driver = smtp - port = PORT_D +dump: + driver = pipe + command = true # End diff --git a/test/log/0574 b/test/log/0574 index 206a95f38..70b22192a 100644 --- a/test/log/0574 +++ b/test/log/0574 @@ -1,17 +1,12 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local-smtp S=sss for normal@test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local-smtp S=sss Q=alternate for alternate@test.ex 1999-03-02 09:44:33 Start queue run: pid=pppp -qq -1999-03-02 09:44:33 10HmaX-0005vi-00 => normal@test.ex F= R=all T=out H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaZ-0005vi-00" +1999-03-02 09:44:33 10HmaX-0005vi-00 => normal F= R=all T=dump 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 End queue run: pid=pppp -qq 1999-03-02 09:44:33 Start 'nosuchqueue' queue run: pid=pppp 1999-03-02 09:44:33 End 'nosuchqueue' queue run: pid=pppp 1999-03-02 09:44:33 Start 'alternate' queue run: pid=pppp -1999-03-02 09:44:33 10HmaY-0005vi-00 => alternate@test.ex F= Q=alternate R=all T=out H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00" +1999-03-02 09:44:33 10HmaY-0005vi-00 => alternate F= Q=alternate R=all T=dump 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 1999-03-02 09:44:33 End 'alternate' queue run: pid=pppp - -******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 -1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name for normal@test.ex -1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@the.local.host.name H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaY-0005vi-00@the.local.host.name for alternate@test.ex diff --git a/test/scripts/0000-Basic/0574 b/test/scripts/0000-Basic/0574 index 53f7a5da1..162b51f85 100644 --- a/test/scripts/0000-Basic/0574 +++ b/test/scripts/0000-Basic/0574 @@ -1,9 +1,6 @@ # named queues # Exim test configuration 0574 # -exim -DSERVER=server -bd -oX PORT_D -**** -# exim -bs MAIL FROM: RCPT TO: @@ -32,5 +29,4 @@ exim -qGnosuchqueue exim -qGalternate **** # -killdaemon no_msglog_check -- cgit v1.2.3 From fa665e0b7252b5916f0fbd57d6ef8c1f0a9b080f Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sun, 8 May 2016 13:25:57 +0100 Subject: periodic queue runner --- doc/doc-docbook/spec.xfpt | 7 ++++--- src/src/daemon.c | 5 ++++- src/src/exim.c | 11 +++++++---- test/log/0574 | 10 ++++++++++ test/scripts/0000-Basic/0574 | 22 +++++++++++++++++++++- test/stdout/0574 | 6 ++++++ 6 files changed, 52 insertions(+), 9 deletions(-) (limited to 'test') diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt index bb00fa1d2..7b1e1ecb6 100644 --- a/doc/doc-docbook/spec.xfpt +++ b/doc/doc-docbook/spec.xfpt @@ -4465,15 +4465,16 @@ be done. If a message requires any remote deliveries, it remains on the queue for later delivery. .new -.vitem &%-q[q][i][f[f]][l][G]%& +.vitem &%-q[q][i][f[f]][l][G[/