Gitweb:
https://git.exim.org/exim.git/commitdiff/32393657bff79d9925ec865aebb066c9409c4e27
Commit: 32393657bff79d9925ec865aebb066c9409c4e27
Parent: eb24befc3e9ad0a36ef8f0bc3527a9bc6c923a7b
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Sat Mar 21 23:27:06 2020 +0000
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Sun Mar 22 20:13:39 2020 +0000
pass through exec
---
doc/doc-docbook/spec.xfpt | 8 +++
src/src/child.c | 5 ++
src/src/deliver.c | 8 +--
src/src/exim.c | 8 ++-
src/src/rda.c | 2 +-
test/stderr/0021 | 12 ++--
test/stderr/0037 | 18 +++---
test/stderr/0143 | 10 +--
test/stderr/0169 | 12 ++--
test/stderr/0218 | 8 +--
test/stderr/0264 | 6 +-
test/stderr/0275 | 14 ++--
test/stderr/0278 | 14 ++--
test/stderr/0283 | 46 ++++++-------
test/stderr/0293 | 5 --
test/stderr/0315 | 48 +++++++-------
test/stderr/0332 | 4 +-
test/stderr/0333 | 4 +-
test/stderr/0357 | 10 +--
test/stderr/0358 | 10 +--
test/stderr/0360 | 30 ++++-----
test/stderr/0361 | 30 ++++-----
test/stderr/0370 | 20 +++---
test/stderr/0374 | 104 ++++++++++++++---------------
test/stderr/0375 | 162 +++++++++++++++++++++++-----------------------
test/stderr/0377 | 24 +++----
test/stderr/0378 | 54 ++++++++--------
test/stderr/0379 | 18 +++---
test/stderr/0380 | 12 ++--
test/stderr/0382 | 16 ++---
test/stderr/0386 | 28 ++++----
test/stderr/0388 | 10 +--
test/stderr/0393 | 44 ++++++-------
test/stderr/0402 | 38 +++++------
test/stderr/0403 | 14 ++--
test/stderr/0404 | 40 ++++++------
test/stderr/0408 | 14 ++--
test/stderr/0426 | 32 ++++-----
test/stderr/0433 | 12 ++--
test/stderr/0437 | 12 ++--
test/stderr/0438 | 6 +-
test/stderr/0450 | 10 +--
test/stderr/0476 | 10 +--
test/stderr/0487 | 14 ++--
test/stderr/0512 | 12 ++--
test/stderr/0529 | 12 ++--
test/stderr/0544 | 10 +--
test/stderr/1007 | 16 ++---
test/stderr/2013 | 24 +++----
test/stderr/2035 | 14 ++--
test/stderr/2113 | 24 +++----
test/stderr/2135 | 14 ++--
test/stderr/2600 | 14 ++--
test/stderr/2610 | 14 ++--
test/stderr/2620 | 14 ++--
test/stderr/4052 | 10 +--
test/stderr/4520 | 10 +--
test/stderr/5000 | 12 ++--
test/stderr/5004 | 20 +++---
test/stderr/5005 | 56 ++++++++--------
test/stderr/5006 | 14 ++--
test/stderr/5008 | 24 +++----
62 files changed, 667 insertions(+), 653 deletions(-)
diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index f91d517..b9f012a 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -3871,6 +3871,14 @@ 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 &%-MCd%&
+.oindex "&%-MCd%&"
+This option is not intended for use by external callers. It is used internally
+by Exim in conjunction with the &%-d%& option
+to pass on an information string on the purpose of the process.
+.wen
+
.vitem &%-MCG%&&~<&'queue&~name'&>
.oindex "&%-MCG%&"
This option is not intended for use by external callers. It is used internally
diff --git a/src/src/child.c b/src/src/child.c
index 3aa6962..ba7e899 100644
--- a/src/src/child.c
+++ b/src/src/child.c
@@ -109,6 +109,11 @@ if (!minimal)
if (debug_selector != 0)
argv[n++] = string_sprintf("-d=0x%x", debug_selector);
}
+ DEBUG(D_any)
+ {
+ argv[n++] = US"-MCd";
+ argv[n++] = US process_purpose;
+ }
if (!f.testsuite_delays) argv[n++] = US"-odd";
if (f.dont_deliver) argv[n++] = US"-N";
if (f.queue_smtp) argv[n++] = US"-odqs";
diff --git a/src/src/deliver.c b/src/src/deliver.c
index 88fe2f9..497b3c8 100644
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -2268,7 +2268,7 @@ a clean slate and doesn't interfere with the parent process. */
search_tidyup();
-if ((pid = exim_fork(US"delivery (local)")) == 0)
+if ((pid = exim_fork(US"delivery-local")) == 0)
{
BOOL replicate = TRUE;
@@ -2615,7 +2615,7 @@ if (addr->special_action == SPECIAL_WARN && addr->transport->warn_message)
"message for %s transport): %s", addr->transport->warn_message,
addr->transport->name, expand_string_message);
- else if ((pid = child_open_exim(&fd, US"warning message")) > 0)
+ else if ((pid = child_open_exim(&fd, US"tpt-warning-message")) > 0)
{
FILE *f = fdopen(fd, "wb");
if (errors_reply_to && !contains_header(US"Reply-To", warn_message))
@@ -7537,7 +7537,7 @@ while (addr_failed)
/* Make a subprocess to send a message */
- if ((pid = child_open_exim(&fd, US"bounce message")) < 0)
+ if ((pid = child_open_exim(&fd, US"bounce-message")) < 0)
log_write(0, LOG_MAIN|LOG_PANIC_DIE, "Process %d (parent %d) failed to "
"create child process to send failure message: %s", getpid(),
getppid(), strerror(errno));
@@ -8191,7 +8191,7 @@ else if (addr_defer != (address_item *)(+1))
{
header_line *h;
int fd;
- pid_t pid = child_open_exim(&fd, US"delay-warning message");
+ pid_t pid = child_open_exim(&fd, US"delay-warning-message");
if (pid > 0)
{
diff --git a/src/src/exim.c b/src/src/exim.c
index ae958af..2ac0720 100644
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -2760,6 +2760,12 @@ for (i = 1; i < argc; i++)
case 'D': smtp_peer_options |= OPTION_DSN; break;
+ /* -MCd: for debug, set a process-purpose string */
+
+ case 'd': if (++i < argc) process_purpose = argv[i];
+ else badarg = TRUE;
+ break;
+
/* -MCG: set the queue name, to a non-default value */
case 'G': if (++i < argc) queue_name = string_copy(argv[i]);
@@ -5695,7 +5701,7 @@ while (more)
pid_t pid;
search_tidyup();
- if ((pid = exim_fork(US"local-accept delivery")) == 0)
+ if ((pid = exim_fork(US"local-accept-delivery")) == 0)
{
int rc;
close_unwanted(); /* Close unwanted file descriptors and TLS */
diff --git a/src/src/rda.c b/src/src/rda.c
index 85791c2..498a061 100644
--- a/src/src/rda.c
+++ b/src/src/rda.c
@@ -615,7 +615,7 @@ with the parent process. */
oldsignal = signal(SIGCHLD, SIG_DFL);
search_tidyup();
-if ((pid = exim_fork(US"router interpret")) == 0)
+if ((pid = exim_fork(US"router-interpret")) == 0)
{
header_line *waslast = header_last; /* Save last header */
diff --git a/test/stderr/0021 b/test/stderr/0021
index e7f6414..f789bba 100644
--- a/test/stderr/0021
+++ b/test/stderr/0021
@@ -186,18 +186,18 @@ end of ACL "rcpt": ACCEPT
>>
LOG: MAIN
<= ok@test3 H=[10.9.8.8] U=CALLER P=smtp S=sss
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
dropping to exim gid; retaining priv uid
x in "!bad"? yes (end of list)
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
LOG: MAIN
=> x <x@y> R=accept T=appendfile
LOG: MAIN
diff --git a/test/stderr/0037 b/test/stderr/0037
index 7a3b56c..799344c 100644
--- a/test/stderr/0037
+++ b/test/stderr/0037
@@ -4,9 +4,9 @@ trusted user
admin user
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -44,14 +44,14 @@ $home = >/usr<
calling userfilter router
rda_interpret (file): 'TESTSUITE/aux-var/0037.f-user'
expanded: 'TESTSUITE/aux-var/0037.f-user'
-fresh-exec forking for router interpret
-postfork: router interpret
+local-accept-delivery forking for router-interpret
+postfork: router-interpret
ssss bytes read from TESTSUITE/aux-var/0037.f-user
data is an Exim filter program
Filter: start of processing
Filter: end of processing
>>>>>>>>>>>>>>>> Exim pid=pppp (rda) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forked for router interpret: npppp
+local-accept-delivery forked for router-interpret: npppp
rda_interpret: subprocess yield=0 error=NULL
userfilter router generated userx@???
errors_to=NULL transport=NULL
@@ -108,9 +108,9 @@ After routing:
Failed addresses:
Deferred addresses:
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
LOG: MAIN
=> userx <filter-userx@???> R=user_accept2 T=appendfile
LOG: MAIN
diff --git a/test/stderr/0143 b/test/stderr/0143
index 9471704..d7bcb92 100644
--- a/test/stderr/0143
+++ b/test/stderr/0143
@@ -4,9 +4,9 @@ admin user
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -15,7 +15,7 @@ dropping to exim gid; retaining priv uid
router_name <my_main_router>
>>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
--------> userx@??? <--------
-fresh-exec forking for transport
+local-accept-delivery forking for transport
postfork: transport
transport_name <my_smtp>
my_smtp transport entered
@@ -56,7 +56,7 @@ no messages waiting for 127.0.0.1
SMTP>> QUIT
cmd buf flush ddd bytes
SMTP(close)>>
-fresh-exec forked for transport: npppp
+local-accept-delivery forked for transport: npppp
Leaving my_smtp transport
LOG: MAIN
=> userx@??? R=my_main_router T=my_smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
diff --git a/test/stderr/0169 b/test/stderr/0169
index d8ab0ef..8bc3f18 100644
--- a/test/stderr/0169
+++ b/test/stderr/0169
@@ -3,9 +3,9 @@ configuration file is TESTSUITE/test-config
admin user
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -13,8 +13,8 @@ admin user
dropping to exim gid; retaining priv uid
>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
--------> userx@??? <--------
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
appendfile transport entered
appendfile: mode=600 notify_comsat=0 quota=52428800 warning=41%
file=TESTSUITE/test-mail/userx format=unix
@@ -35,7 +35,7 @@ writing data block fd=dddd size=sss timeout=0
writing data block fd=dddd size=sss timeout=0
quota = 52428800 threshold = 21495808 old size = sssss message size = sss
appendfile yields 0 with errno=dd more_errno=dd
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forked for delivery-local: npppp
appendfile transport returned OK for userx@???
added retry item for T:userx@???: errno=dd more_errno=dd flags=1
LOG: MAIN
diff --git a/test/stderr/0218 b/test/stderr/0218
index d775090..af919d5 100644
--- a/test/stderr/0218
+++ b/test/stderr/0218
@@ -70,13 +70,13 @@ admin user
dropping to exim gid; retaining priv uid
delivering 10HmaY-0005vi-00 (queue run pid ppppp)
R: client (ACL)
-fresh-exec forking for transport
+continued-transport forking for transport
postfork: transport
T: send_to_server (ACL)
SMTP>> MAIL FROM:<CALLER@???>
SMTP>> RCPT TO:<b@???>
SMTP>> DATA
-fresh-exec forked for transport: npppp
+continued-transport forked for transport: npppp
SMTP<< 250 OK
SMTP<< 250 OK
SMTP<< 351 Send more
@@ -267,13 +267,13 @@ admin user
dropping to exim gid; retaining priv uid
delivering 10HmbC-0005vi-00 (queue run pid ppppp)
R: client (ACL)
-fresh-exec forking for transport
+continued-transport forking for transport
postfork: transport
T: send_to_server (ACL)
SMTP>> MAIL FROM:<CALLER@???>
SMTP>> RCPT TO:<c@???>
SMTP>> DATA
-fresh-exec forked for transport: npppp
+continued-transport forked for transport: npppp
SMTP<< 250 OK
SMTP<< 250 OK
SMTP<< 351 OK
diff --git a/test/stderr/0264 b/test/stderr/0264
index 2beb125..a87af81 100644
--- a/test/stderr/0264
+++ b/test/stderr/0264
@@ -9,9 +9,9 @@ DSN: **** SPOOL_OUT - address: <rz.b@outside> errorsto: <NULL> orcpt: <NULL> dsn
Renaming spool header file: TESTSUITE/spool//input//10HmbJ-0005vi-00-H
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
diff --git a/test/stderr/0275 b/test/stderr/0275
index 365f804..f5a9d15 100644
--- a/test/stderr/0275
+++ b/test/stderr/0275
@@ -144,10 +144,10 @@ LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
search_tidyup called
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -odi -Mc 10HmaX-0005vi-00
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=EXIM_GID pid=pppp
@@ -289,8 +289,8 @@ search_tidyup called
failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
no retry data available
search_tidyup called
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
changed uid/gid: local delivery to userx <userx@???> transport=t1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=NULL current=/
@@ -303,7 +303,7 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0
maildir_use_size_file=no
locking by lockfile fcntl
search_tidyup called
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forked for delivery-local: npppp
journalling userx@???
t1 transport returned OK for userx@???
post-process userx@??? (0)
diff --git a/test/stderr/0278 b/test/stderr/0278
index ddd3970..6d6cd94 100644
--- a/test/stderr/0278
+++ b/test/stderr/0278
@@ -103,10 +103,10 @@ LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
search_tidyup called
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -odi -Mc 10HmaX-0005vi-00
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=EXIM_GID pid=pppp
@@ -203,8 +203,8 @@ search_tidyup called
failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
no retry data available
search_tidyup called
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
changed uid/gid: local delivery to CALLER <CALLER@???> transport=t1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=CALLER_HOME current=CALLER_HOME
@@ -217,7 +217,7 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0
maildir_use_size_file=no
locking by lockfile fcntl
search_tidyup called
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forked for delivery-local: npppp
journalling CALLER@???
t1 transport returned OK for CALLER@???
post-process CALLER@??? (0)
diff --git a/test/stderr/0283 b/test/stderr/0283
index cc345b1..ebf3529 100644
--- a/test/stderr/0283
+++ b/test/stderr/0283
@@ -14,9 +14,9 @@ getpwnam() succeeded uid=uuuu gid=gggg
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=EXIM_GID pid=pppp
@@ -30,25 +30,25 @@ seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
seeking password data for user "root": cache not available
getpwnam() succeeded uid=uuuu gid=gggg
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
changed uid/gid: local delivery to somebody <somebody@???> transport=t1
uid=EXIM_UID gid=EXIM_GID pid=pppp
-delivery (local) forking for pipe-tpt-cmd
+delivery-local forking for pipe-tpt-cmd
postfork: pipe-tpt-cmd
-fresh-exec forked for delivery (local): npppp
-delivery (local) forked for pipe-tpt-cmd: npppp
-delivery (local) forking for pipe-transport output
+local-accept-delivery forked for delivery-local: npppp
+delivery-local forked for pipe-tpt-cmd: npppp
+delivery-local forking for pipe-transport output
postfork: pipe-transport output
-delivery (local) forked for pipe-transport output: npppp
+delivery-local forked for pipe-transport output: npppp
transport error EPIPE ignored
LOG: MAIN
** somebody@??? R=rest T=t1: return message generated
changed uid/gid: post-delivery tidying
uid=EXIM_UID gid=EXIM_GID pid=pppp
-fresh-exec forking for bounce message
+local-accept-delivery forking for bounce message
postfork: bounce message
-fresh-exec forked for bounce message: npppp
+local-accept-delivery forked for bounce message: npppp
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=EXIM_GID pid=pppp
@@ -65,9 +65,9 @@ seeking password data for user "root": cache not available
getpwnam() succeeded uid=uuuu gid=gggg
LOG: MAIN
<= <> R=10HmaY-0005vi-00 U=EXIMUSER P=local S=sss
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+bounce message forking for local-accept-delivery
+postfork: local-accept-delivery
+bounce message forked for local-accept-delivery: npppp
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=EXIM_GID pid=pppp
@@ -81,11 +81,11 @@ seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
seeking password data for user "root": cache not available
getpwnam() succeeded uid=uuuu gid=gggg
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
changed uid/gid: local delivery to CALLER <CALLER@???> transport=t2
uid=CALLER_UID gid=CALLER_GID pid=pppp
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forked for delivery-local: npppp
LOG: MAIN
=> CALLER <CALLER@???> R=caller T=t2
changed uid/gid: post-delivery tidying
@@ -113,9 +113,9 @@ seeking password data for user "root": cache not available
getpwnam() succeeded uid=uuuu gid=gggg
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=EXIM_GID pid=pppp
@@ -131,9 +131,9 @@ seeking password data for user "root": cache not available
getpwnam() succeeded uid=uuuu gid=gggg
LOG: MAIN PANIC
User 0 set for t3 transport is on the never_users list
-fresh-exec forking for logfile create
+local-accept-delivery forking for logfile create
postfork: logfile create
-fresh-exec forked for logfile create: npppp
+local-accept-delivery forked for logfile create: npppp
LOG: MAIN
== never@??? R=never T=t3 defer (-29): User 0 set for t3 transport is on the never_users list
changed uid/gid: post-delivery tidying
diff --git a/test/stderr/0293 b/test/stderr/0293
index a89c4b8..03af0c8 100644
--- a/test/stderr/0293
+++ b/test/stderr/0293
@@ -2,11 +2,6 @@ LOG: smtp_connection MAIN
SMTP connection from CALLER
LOG: MAIN
<= x@y U=CALLER P=local-smtp S=sss
-delivering 10HmaX-0005vi-00
-LOG: MAIN
- => one <one@z> R=r1 T=t1
-LOG: MAIN
- Completed
LOG: MAIN
<= x@y U=CALLER P=local-smtp S=sss
LOG: delay_delivery MAIN
diff --git a/test/stderr/0315 b/test/stderr/0315
index 8355825..ac9ce9a 100644
--- a/test/stderr/0315
+++ b/test/stderr/0315
@@ -4,9 +4,9 @@ admin user
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -31,15 +31,15 @@ checking domains
calling r1 router
r1 router called for y@???
domain = ten-1.test.ex
-fresh-exec forking for fakens-search
+local-accept-delivery forking for fakens-search
postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
+local-accept-delivery forked for fakens-search: npppp
+local-accept-delivery forking for fakens-search
postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
+local-accept-delivery forked for fakens-search: npppp
+local-accept-delivery forking for fakens-search
postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
+local-accept-delivery forked for fakens-search: npppp
set transport t1
queued for t1 transport: local_part = y
domain = ten-1.test.ex
@@ -60,10 +60,10 @@ After routing:
y@???
Failed addresses:
Deferred addresses:
-fresh-exec forking for transport
+local-accept-delivery forking for transport
postfork: transport
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forked for transport: npppp
+local-accept-delivery forked for transport: npppp
LOG: MAIN
*> x@??? R=r1 T=t1 H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option"
LOG: MAIN
@@ -77,9 +77,9 @@ configuration file is TESTSUITE/test-config
admin user
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -107,15 +107,15 @@ local_part=y domain=ten-2.test.ex
calling r2 router
r2 router called for y@???
domain = ten-2.test.ex
-fresh-exec forking for fakens-search
+local-accept-delivery forking for fakens-search
postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
+local-accept-delivery forked for fakens-search: npppp
+local-accept-delivery forking for fakens-search
postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
+local-accept-delivery forked for fakens-search: npppp
+local-accept-delivery forking for fakens-search
postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
+local-accept-delivery forked for fakens-search: npppp
set transport t1
queued for t1 transport: local_part = y
domain = ten-2.test.ex
@@ -136,9 +136,9 @@ local_part=x domain=ten-2.test.ex
calling r2 router
r2 router called for x@???
domain = ten-2.test.ex
-fresh-exec forking for fakens-search
+local-accept-delivery forking for fakens-search
postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
+local-accept-delivery forked for fakens-search: npppp
queued for t1 transport: local_part = x
domain = ten-2.test.ex
errors_to=NULL
@@ -155,10 +155,10 @@ After routing:
y@???
Failed addresses:
Deferred addresses:
-fresh-exec forking for transport
+local-accept-delivery forking for transport
postfork: transport
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forked for transport: npppp
+local-accept-delivery forked for transport: npppp
LOG: MAIN
*> x@??? R=r2 T=t1 H=ten-2.test.ex [V4NET.0.0.2] C="delivery bypassed by -N option"
LOG: MAIN
diff --git a/test/stderr/0332 b/test/stderr/0332
index eaf97e3..a7036e5 100644
--- a/test/stderr/0332
+++ b/test/stderr/0332
@@ -90,10 +90,10 @@ After routing:
Failed addresses:
Deferred addresses:
delay@???
-fresh-exec forking for transport
+continued-transport forking for transport
postfork: transport
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forked for transport: npppp
+continued-transport forked for transport: npppp
locking TESTSUITE/spool/db/wait-t1.lockfile
LOG: MAIN
=> ok@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1]* C="250 OK"
diff --git a/test/stderr/0333 b/test/stderr/0333
index f15d1d9..34a9973 100644
--- a/test/stderr/0333
+++ b/test/stderr/0333
@@ -85,10 +85,10 @@ After routing:
Failed addresses:
Deferred addresses:
delay@???
-fresh-exec forking for transport
+continued-transport forking for transport
postfork: transport
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forked for transport: npppp
+continued-transport forked for transport: npppp
locking TESTSUITE/spool/db/wait-t1.lockfile
LOG: MAIN
=> ok@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1]* C="250 OK"
diff --git a/test/stderr/0357 b/test/stderr/0357
index dcce26b..633d9fd 100644
--- a/test/stderr/0357
+++ b/test/stderr/0357
@@ -4,9 +4,9 @@ admin user
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -25,13 +25,13 @@ After routing:
userx@???
Failed addresses:
Deferred addresses:
-fresh-exec forking for transport
+local-accept-delivery forking for transport
postfork: transport
checking status of 127.0.0.1
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
added retry item for R:userx@???:<CALLER@???>: errno=-44 more_errno=dd,A flags=0
-fresh-exec forked for transport: npppp
+local-accept-delivery forked for transport: npppp
reading retry information for R:userx@???:<CALLER@???> from subprocess
added retry item
LOG: MAIN
diff --git a/test/stderr/0358 b/test/stderr/0358
index ea470c6..5aa7d8a 100644
--- a/test/stderr/0358
+++ b/test/stderr/0358
@@ -4,9 +4,9 @@ admin user
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -30,14 +30,14 @@ After routing:
usery@???
Failed addresses:
Deferred addresses:
-fresh-exec forking for transport
+local-accept-delivery forking for transport
postfork: transport
checking status of 127.0.0.1
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
added retry item for R:userx@???:<CALLER@???>: errno=-44 more_errno=dd,A flags=0
added retry item for R:usery@???:<CALLER@???>: errno=-44 more_errno=dd,A flags=0
-fresh-exec forked for transport: npppp
+local-accept-delivery forked for transport: npppp
reading retry information for R:userx@???:<CALLER@???> from subprocess
added retry item
reading retry information for R:usery@???:<CALLER@???> from subprocess
diff --git a/test/stderr/0360 b/test/stderr/0360
index 6bb0486..af11caa 100644
--- a/test/stderr/0360
+++ b/test/stderr/0360
@@ -4,9 +4,9 @@ admin user
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -106,19 +106,19 @@ checking domains
calling r1 router
r1 router called for unknown@???
domain = recurse.test.ex
-fresh-exec forking for fakens-search
+local-accept-delivery forking for fakens-search
postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
+local-accept-delivery forked for fakens-search: npppp
r1 router widened recurse.test.ex to recurse.test.ex.test.ex
-fresh-exec forking for fakens-search
+local-accept-delivery forking for fakens-search
postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
+local-accept-delivery forked for fakens-search: npppp
+local-accept-delivery forking for fakens-search
postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
+local-accept-delivery forked for fakens-search: npppp
+local-accept-delivery forking for fakens-search
postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
+local-accept-delivery forked for fakens-search: npppp
domain changed to recurse.test.ex.test.ex
rewriting header lines
re-routed to unknown@???
@@ -139,9 +139,9 @@ checking domains
calling r1 router
r1 router called for unknown@???
domain = recurse.test.ex.test.ex
-fresh-exec forking for fakens-search
+local-accept-delivery forking for fakens-search
postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
+local-accept-delivery forked for fakens-search: npppp
set transport t1
queued for t1 transport: local_part = unknown
domain = recurse.test.ex.test.ex
@@ -160,10 +160,10 @@ After routing:
Failed addresses:
Deferred addresses:
defer@???
-fresh-exec forking for transport
+local-accept-delivery forking for transport
postfork: transport
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forked for transport: npppp
+local-accept-delivery forked for transport: npppp
LOG: MAIN
*> unknown@??? <cms@???> R=r1 T=t1 H=recurse.test.ex.test.ex [V4NET.99.0.2] C="delivery bypassed by -N option"
>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0361 b/test/stderr/0361
index 1003d75..25bbaba 100644
--- a/test/stderr/0361
+++ b/test/stderr/0361
@@ -50,10 +50,10 @@ Size of headers = sss
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
search_tidyup called
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -N -odi -Mc 10HmaY-0005vi-00
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -N -odi -Mc 10HmaY-0005vi-00
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=EXIM_GID pid=pppp
@@ -101,9 +101,9 @@ r1 router called for kilos@???
domain = recurse.test.ex
recurse.test.ex in "*"? yes (matched "*")
DNS lookup of recurse.test.ex (MX) using fakens
-fresh-exec forking for fakens-search
+local-accept-delivery forking for fakens-search
postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
+local-accept-delivery forked for fakens-search: npppp
DNS lookup of recurse.test.ex (MX) gave HOST_NOT_FOUND
returning DNS_NOMATCH
faking res_search(MX) response length as 65535
@@ -111,21 +111,21 @@ faking res_search(MX) response length as 65535
r1 router widened recurse.test.ex to recurse.test.ex.test.ex
recurse.test.ex.test.ex in "*"? yes (matched "*")
DNS lookup of recurse.test.ex.test.ex (MX) using fakens
-fresh-exec forking for fakens-search
+local-accept-delivery forking for fakens-search
postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
+local-accept-delivery forked for fakens-search: npppp
DNS lookup of recurse.test.ex.test.ex (MX) gave NO_DATA
returning DNS_NODATA
faking res_search(MX) response length as 65535
writing neg-cache entry for recurse.test.ex.test.ex-MX-xxxx, ttl 3000
recurse.test.ex.test.ex (MX resp) DNSSEC
-fresh-exec forking for fakens-search
+local-accept-delivery forking for fakens-search
postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
+local-accept-delivery forked for fakens-search: npppp
DNS lookup of recurse.test.ex.test.ex (A) using fakens
-fresh-exec forking for fakens-search
+local-accept-delivery forking for fakens-search
postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
+local-accept-delivery forked for fakens-search: npppp
DNS lookup of recurse.test.ex.test.ex (A) succeeded
fully qualified name = recurse.test.ex.test.ex
recurse.test.ex.test.ex V4NET.99.0.2 mx=-1 sort=xx
@@ -230,8 +230,8 @@ search_tidyup called
failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
no retry data available
search_tidyup called
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
changed uid/gid: local delivery to kilos <kilos@???> transport=t2
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=NULL current=/
@@ -245,7 +245,7 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0
locking by lockfile fcntl
*** delivery by t2 transport bypassed by -N option
search_tidyup called
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forked for delivery-local: npppp
journalling kilos@???/t2
t2 transport returned OK for kilos@???
post-process kilos@??? (0)
diff --git a/test/stderr/0370 b/test/stderr/0370
index 1219fb0..84a2090 100644
--- a/test/stderr/0370
+++ b/test/stderr/0370
@@ -8,9 +8,9 @@ changed uid/gid: privilege not needed
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=EXIM_GID pid=pppp
@@ -20,20 +20,20 @@ admin user
dropping to exim gid; retaining priv uid
>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
--------> |TESTSUITE/bin/iefbr14 <--------
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
changed uid/gid: local delivery to |TESTSUITE/bin/iefbr14 <|TESTSUITE/bin/iefbr14> transport=t1
uid=EXIM_UID gid=CALLER_GID pid=pppp
t1 transport entered
direct command:
argv[0] = 'TESTSUITE/bin/iefbr14'
-delivery (local) forking for pipe-tpt-cmd
+delivery-local forking for pipe-tpt-cmd
postfork: pipe-tpt-cmd
-fresh-exec forked for delivery (local): npppp
-delivery (local) forked for pipe-tpt-cmd: npppp
-delivery (local) forking for pipe-transport output
+local-accept-delivery forked for delivery-local: npppp
+delivery-local forked for pipe-tpt-cmd: npppp
+delivery-local forking for pipe-transport output
postfork: pipe-transport output
-delivery (local) forked for pipe-transport output: npppp
+delivery-local forked for pipe-transport output: npppp
Writing message to pipe
writing data block fd=dddd size=sss timeout=3600
writing error EEE: Broken pipe
diff --git a/test/stderr/0374 b/test/stderr/0374
index 80cfeca..24fc97d 100644
--- a/test/stderr/0374
+++ b/test/stderr/0374
@@ -4,9 +4,9 @@ admin user
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -340,106 +340,106 @@ After routing:
Failed addresses:
Deferred addresses:
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
LOG: MAIN
=> a1 <a1@???> R=real T=real
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
LOG: MAIN
=> b1 <b1@???> R=real T=real
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
LOG: MAIN
=> c1 <c1@???> R=real T=real
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
LOG: MAIN
=> d1 <d1@???> R=real T=real
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
LOG: MAIN
=> d2 <d2@???> R=real T=real
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
LOG: MAIN
=> d3 <d3@???> R=real T=real
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
LOG: MAIN
=> a1 <a1@???> R=u1 T=ut1
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
-delivery (local) forking for pipe-tpt-cmd
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
+delivery-local forking for pipe-tpt-cmd
postfork: pipe-tpt-cmd
-fresh-exec forked for delivery (local): npppp
-delivery (local) forked for pipe-tpt-cmd: npppp
-delivery (local) forking for pipe-transport output
+local-accept-delivery forked for delivery-local: npppp
+delivery-local forked for pipe-tpt-cmd: npppp
+delivery-local forking for pipe-transport output
postfork: pipe-transport output
-delivery (local) forked for pipe-transport output: npppp
+delivery-local forked for pipe-transport output: npppp
transport error EPIPE ignored
LOG: MAIN
** b1@??? R=ut2 T=ut2: Child process of ut2 transport returned 127 (could mean unable to exec or command does not exist) from command: /non/existent/file
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
-delivery (local) forking for pipe-tpt-cmd
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
+delivery-local forking for pipe-tpt-cmd
postfork: pipe-tpt-cmd
-fresh-exec forked for delivery (local): npppp
-delivery (local) forked for pipe-tpt-cmd: npppp
-delivery (local) forking for pipe-transport output
+local-accept-delivery forked for delivery-local: npppp
+delivery-local forked for pipe-tpt-cmd: npppp
+delivery-local forking for pipe-transport output
postfork: pipe-transport output
-delivery (local) forked for pipe-transport output: npppp
+delivery-local forked for pipe-transport output: npppp
transport error EPIPE ignored
LOG: MAIN
== c1@??? R=ut3 T=ut3 defer (0): Child process of ut3 transport returned 127 (could mean unable to exec or command does not exist) from command: /non/existent/file
-fresh-exec forking for transport
+local-accept-delivery forking for transport
postfork: transport
locking TESTSUITE/spool/db/retry.lockfile
locking TESTSUITE/spool/db/wait-ut4.lockfile
-fresh-exec forked for transport: npppp
+local-accept-delivery forked for transport: npppp
LOG: MAIN
=> d1@??? R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1] C="250 OK"
-fresh-exec forking for transport
+local-accept-delivery forking for transport
postfork: transport
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forked for transport: npppp
+local-accept-delivery forked for transport: npppp
LOG: MAIN
== d2@??? R=ut4 T=ut4 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d2@???>: 450 soft error
-fresh-exec forking for transport
+local-accept-delivery forking for transport
postfork: transport
locking TESTSUITE/spool/db/retry.lockfile
locking TESTSUITE/spool/db/wait-ut4.lockfile
-fresh-exec forked for transport: npppp
+local-accept-delivery forked for transport: npppp
LOG: MAIN
** d3@??? R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d3@???>: 550 hard error
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forking for bounce message
+local-accept-delivery forking for bounce message
postfork: bounce message
-fresh-exec forked for bounce message: npppp
+local-accept-delivery forked for bounce message: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
LOG: MAIN
<= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+bounce message forking for local-accept-delivery
+postfork: local-accept-delivery
+bounce message forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -489,9 +489,9 @@ After routing:
Failed addresses:
Deferred addresses:
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
LOG: MAIN
=> CALLER <CALLER@???> R=real T=real
LOG: MAIN
diff --git a/test/stderr/0375 b/test/stderr/0375
index c9a0629..a60c29b 100644
--- a/test/stderr/0375
+++ b/test/stderr/0375
@@ -4,9 +4,9 @@ admin user
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -760,151 +760,151 @@ After routing:
Deferred addresses:
g1@???
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
LOG: MAIN
=> a1 <a1@???> P=<CALLER@???> R=real T=real
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
LOG: MAIN
=> b1 <b1@???> P=<CALLER@???> R=real T=real
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
LOG: MAIN
=> c1 <c1@???> P=<CALLER@???> R=real T=real
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
LOG: MAIN
=> d1 <d1@???> P=<CALLER@???> R=real T=real
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
LOG: MAIN
=> d2 <d2@???> P=<CALLER@???> R=real T=real
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
LOG: MAIN
=> d3 <d3@???> P=<CALLER@???> R=real T=real
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
LOG: MAIN
=> e1 <e1@???> P=<CALLER@???> R=real T=real
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
LOG: MAIN
=> f1 <f1@???> P=<CALLER@???> R=real T=real
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
LOG: MAIN
=> f2 <f2@???> P=<CALLER@???> R=real T=real
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
LOG: MAIN
=> f3 <f3@???> P=<CALLER@???> R=real T=real
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
LOG: MAIN
=> a1 <a1@???> P=<> R=u1 T=ut1
log writing disabled
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
-delivery (local) forking for pipe-tpt-cmd
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
+delivery-local forking for pipe-tpt-cmd
postfork: pipe-tpt-cmd
-fresh-exec forked for delivery (local): npppp
-delivery (local) forked for pipe-tpt-cmd: npppp
-delivery (local) forking for pipe-transport output
+local-accept-delivery forked for delivery-local: npppp
+delivery-local forked for pipe-tpt-cmd: npppp
+delivery-local forking for pipe-transport output
postfork: pipe-transport output
-delivery (local) forked for pipe-transport output: npppp
+delivery-local forked for pipe-transport output: npppp
transport error EPIPE ignored
LOG: MAIN
** b1@??? P=<> R=ut2 T=ut2: Child process of ut2 transport returned 127 (could mean unable to exec or command does not exist) from command: /non/existent/file
log writing disabled
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
-delivery (local) forking for pipe-tpt-cmd
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
+delivery-local forking for pipe-tpt-cmd
postfork: pipe-tpt-cmd
-fresh-exec forked for delivery (local): npppp
-delivery (local) forked for pipe-tpt-cmd: npppp
-delivery (local) forking for pipe-transport output
+local-accept-delivery forked for delivery-local: npppp
+delivery-local forked for pipe-tpt-cmd: npppp
+delivery-local forking for pipe-transport output
postfork: pipe-transport output
-delivery (local) forked for pipe-transport output: npppp
+delivery-local forked for pipe-transport output: npppp
transport error EPIPE ignored
LOG: MAIN
== c1@??? R=ut3 T=ut3 defer (0): Child process of ut3 transport returned 127 (could mean unable to exec or command does not exist) from command: /non/existent/file
log writing disabled
-fresh-exec forking for transport
+local-accept-delivery forking for transport
postfork: transport
locking TESTSUITE/spool/db/retry.lockfile
locking TESTSUITE/spool/db/wait-ut4.lockfile
-fresh-exec forked for transport: npppp
+local-accept-delivery forked for transport: npppp
LOG: MAIN
=> d1@??? P=<> R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1] C="250 OK"
log writing disabled
-fresh-exec forking for transport
+local-accept-delivery forking for transport
postfork: transport
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forked for transport: npppp
+local-accept-delivery forked for transport: npppp
LOG: MAIN
== d2@??? R=ut4 T=ut4 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d2@???>: 450 soft error
log writing disabled
-fresh-exec forking for transport
+local-accept-delivery forking for transport
postfork: transport
locking TESTSUITE/spool/db/retry.lockfile
locking TESTSUITE/spool/db/wait-ut4.lockfile
-fresh-exec forked for transport: npppp
+local-accept-delivery forked for transport: npppp
LOG: MAIN
** d3@??? P=<> R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d3@???>: 550 hard error
log writing disabled
-fresh-exec forking for transport
+local-accept-delivery forking for transport
postfork: transport
locking TESTSUITE/spool/db/retry.lockfile
locking TESTSUITE/spool/db/wait-ut5.lockfile
-fresh-exec forked for transport: npppp
+local-accept-delivery forked for transport: npppp
LOG: MAIN
** e1@??? P=<> R=ut5 T=ut5 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<e1@???>: 550 hard error
log writing disabled
-fresh-exec forking for transport
+local-accept-delivery forking for transport
postfork: transport
locking TESTSUITE/spool/db/retry.lockfile
locking TESTSUITE/spool/db/wait-ut6.lockfile
-fresh-exec forked for transport: npppp
+local-accept-delivery forked for transport: npppp
LOG: MAIN
=> f1@??? P=<CALLER@???> R=ut6 T=ut6 H=127.0.0.1 [127.0.0.1] C="250 OK"
log writing disabled
-fresh-exec forking for transport
+local-accept-delivery forking for transport
postfork: transport
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forked for transport: npppp
+local-accept-delivery forked for transport: npppp
LOG: MAIN
== f2@??? R=ut6 T=ut6 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<f2@???>: 450 soft error
log writing disabled
-fresh-exec forking for transport
+local-accept-delivery forking for transport
postfork: transport
locking TESTSUITE/spool/db/retry.lockfile
locking TESTSUITE/spool/db/wait-ut6.lockfile
-fresh-exec forked for transport: npppp
+local-accept-delivery forked for transport: npppp
LOG: MAIN
** f3@??? P=<CALLER@???> R=ut6 T=ut6 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<f3@???>: 550 hard error
log writing disabled
@@ -912,18 +912,18 @@ locking TESTSUITE/spool/db/retry.lockfile
LOG: MAIN
f3@??? <f3@???>: error ignored
log writing disabled
-fresh-exec forking for bounce message
+local-accept-delivery forking for bounce message
postfork: bounce message
-fresh-exec forked for bounce message: npppp
+local-accept-delivery forked for bounce message: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
LOG: MAIN
<= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+bounce message forking for local-accept-delivery
+postfork: local-accept-delivery
+bounce message forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -989,9 +989,9 @@ After routing:
Failed addresses:
Deferred addresses:
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
LOG: MAIN
=> CALLER <CALLER@???> P=<> R=real T=real
LOG: MAIN
@@ -1011,9 +1011,9 @@ configuration file is TESTSUITE/test-config
admin user
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -1099,15 +1099,15 @@ After routing:
Failed addresses:
Deferred addresses:
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
LOG: MAIN
=> h1 <h1@???> P=<CALLER@???> R=real T=real
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
LOG: MAIN
=> h1 <h1@???> P=<CALLER@???> R=ut8 T=ut1
log writing disabled
diff --git a/test/stderr/0377 b/test/stderr/0377
index 91d58ec..e5d4e5f 100644
--- a/test/stderr/0377
+++ b/test/stderr/0377
@@ -4,9 +4,9 @@ admin user
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -302,21 +302,21 @@ After routing:
defer_bbbb@???
defer_cccc@???
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
LOG: MAIN
=> aaaa <aaaa@???> R=seen_aaaa T=t1
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
LOG: MAIN
=> bbbb <bbbb@???> R=bbbb_0 T=t1
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
LOG: MAIN
=> cccc <cccc@???> R=cccc_accept T=t1
locking TESTSUITE/spool/db/retry.lockfile
diff --git a/test/stderr/0378 b/test/stderr/0378
index 27632ea..3c422c1 100644
--- a/test/stderr/0378
+++ b/test/stderr/0378
@@ -4,9 +4,9 @@ admin user
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -44,13 +44,13 @@ save TESTSUITE/test-mail/file
pipe "/bin/sh -c exit"
mail subject autoreply
text "This is an autoreply"' (tainted)
-fresh-exec forking for router interpret
-postfork: router interpret
+local-accept-delivery forking for router-interpret
+postfork: router-interpret
data is an Exim filter program
Filter: start of processing
Filter: end of processing
>>>>>>>>>>>>>>>> Exim pid=pppp (rda) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forked for router interpret: npppp
+local-accept-delivery forked for router-interpret: npppp
rda_interpret: subprocess yield=0 error=NULL
set transport t3
aaaa router generated >CALLER@???
@@ -121,20 +121,20 @@ After routing:
Deferred addresses:
defer_aaaa@???
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
-delivery (local) forking for autoreply
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
+delivery-local forking for autoreply
postfork: autoreply
-fresh-exec forked for delivery (local): npppp
-delivery (local) forked for autoreply: npppp
+local-accept-delivery forked for delivery-local: npppp
+delivery-local forked for autoreply: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
LOG: MAIN
<= <> R=10HmaX-0005vi-00 U=CALLER P=local S=sss
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+autoreply forking for local-accept-delivery
+postfork: local-accept-delivery
+autoreply forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -173,22 +173,22 @@ LOG: MAIN
LOG: MAIN
=> >CALLER@??? <aaaa@???> R=aaaa T=t3
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
-delivery (local) forking for pipe-tpt-cmd
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
+delivery-local forking for pipe-tpt-cmd
postfork: pipe-tpt-cmd
-fresh-exec forked for delivery (local): npppp
-delivery (local) forked for pipe-tpt-cmd: npppp
-delivery (local) forking for pipe-transport output
+local-accept-delivery forked for delivery-local: npppp
+delivery-local forked for pipe-tpt-cmd: npppp
+delivery-local forking for pipe-transport output
postfork: pipe-transport output
-delivery (local) forked for pipe-transport output: npppp
+delivery-local forked for pipe-transport output: npppp
transport error EPIPE ignored
LOG: MAIN
=> |/bin/sh -c exit <aaaa@???> R=aaaa T=t2
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
LOG: MAIN
=> TESTSUITE/test-mail/file <aaaa@???> R=aaaa T=t1
locking TESTSUITE/spool/db/retry.lockfile
@@ -261,14 +261,14 @@ save TESTSUITE/test-mail/file
pipe "/bin/sh -c exit"
mail subject autoreply
text "This is an autoreply"' (tainted)
-qrun delivery forking for router interpret
-postfork: router interpret
+qrun delivery forking for router-interpret
+postfork: router-interpret
data is an Exim filter program
Filter: start of processing
Filter: end of processing
>>>>>>>>>>>>>>>> Exim pid=pppp (rda) terminating with rc=0 >>>>>>>>>>>>>>>>
fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for router interpret: npppp
+qrun delivery forked for router-interpret: npppp
rda_interpret: subprocess yield=0 error=NULL
set transport t3
aaaa router generated >CALLER@???
diff --git a/test/stderr/0379 b/test/stderr/0379
index 2035bd8..e789d50 100644
--- a/test/stderr/0379
+++ b/test/stderr/0379
@@ -4,9 +4,9 @@ admin user
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -129,15 +129,15 @@ After routing:
Deferred addresses:
defer@???
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
LOG: MAIN
=> bbbb <aaaa@???> R=bc T=t1
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
LOG: MAIN
=> cccc <aaaa@???> R=bc T=t1
locking TESTSUITE/spool/db/retry.lockfile
diff --git a/test/stderr/0380 b/test/stderr/0380
index 698cce5..7f05f1e 100644
--- a/test/stderr/0380
+++ b/test/stderr/0380
@@ -4,9 +4,9 @@ admin user
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -82,9 +82,9 @@ After routing:
Deferred addresses:
aaaa@???
locking TESTSUITE/spool/db/retry.lockfile
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
LOG: MAIN
=> bbbb <bbbb@???> R=r3 T=t1
locking TESTSUITE/spool/db/retry.lockfile
diff --git a/test/stderr/0382 b/test/stderr/0382
index 7605a7b..8c48c2c 100644
--- a/test/stderr/0382
+++ b/test/stderr/0382
@@ -4,9 +4,9 @@ admin user
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -18,18 +18,18 @@ running system filter
system filter returned 1
LOG: MAIN
** userx@??? R=r1: forced fail
-fresh-exec forking for bounce message
+local-accept-delivery forking for bounce message
postfork: bounce message
-fresh-exec forked for bounce message: npppp
+local-accept-delivery forked for bounce message: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
LOG: MAIN
<= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+bounce message forking for local-accept-delivery
+postfork: local-accept-delivery
+bounce message forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
diff --git a/test/stderr/0386 b/test/stderr/0386
index c8f39d0..bd53315 100644
--- a/test/stderr/0386
+++ b/test/stderr/0386
@@ -249,10 +249,10 @@ LOG: MAIN
<= x@y H=[V4NET.11.12.13] U=CALLER P=smtp S=sss
SMTP>> 250 OK id=10HmaX-0005vi-00
search_tidyup called
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -odi -Mc 10HmaX-0005vi-00
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=EXIM_GID pid=pppp
@@ -326,8 +326,8 @@ search_tidyup called
failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
no retry data available
search_tidyup called
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
changed uid/gid: local delivery to 2 <2@b> transport=t1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=NULL current=/
@@ -350,7 +350,7 @@ writing data block fd=dddd size=sss timeout=0
writing data block fd=dddd size=sss timeout=0
appendfile yields 0 with errno=dd more_errno=dd
search_tidyup called
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forked for delivery-local: npppp
journalling 2@b
t1 transport returned OK for 2@b
post-process 2@b (0)
@@ -448,10 +448,10 @@ LOG: MAIN
<= x@y H=[V4NET.11.12.13] U=CALLER P=smtp S=sss
SMTP>> 250 OK id=10HmaY-0005vi-00
search_tidyup called
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -odi -Mc 10HmaY-0005vi-00
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaY-0005vi-00
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=EXIM_GID pid=pppp
@@ -524,8 +524,8 @@ search_tidyup called
failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
no retry data available
search_tidyup called
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
changed uid/gid: local delivery to 2 <2@b> transport=t1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=NULL current=/
@@ -548,7 +548,7 @@ writing data block fd=dddd size=sss timeout=0
writing data block fd=dddd size=sss timeout=0
appendfile yields 0 with errno=dd more_errno=dd
search_tidyup called
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forked for delivery-local: npppp
journalling 2@b
t1 transport returned OK for 2@b
post-process 2@b (0)
diff --git a/test/stderr/0388 b/test/stderr/0388
index c77110e..17f60e9 100644
--- a/test/stderr/0388
+++ b/test/stderr/0388
@@ -174,7 +174,7 @@ LOG: MAIN
end of retry processing
fresh-exec forking for bounce message
postfork: bounce message
-exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xd7715ced -odi -odi -t -oem -oi -f <> -E10HmaX-0005vi-00
+exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xd7715ced -MCd bounce message -odi -odi -t -oem -oi -f <> -E10HmaX-0005vi-00
fresh-exec forked for bounce message: npppp
Exim version x.yz ....
changed uid/gid: forcing real = effective
@@ -230,10 +230,10 @@ Size of headers = sss
LOG: MAIN
<= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
search_tidyup called
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xd7715ced -odi -Mc 10HmaY-0005vi-00
-fresh-exec forked for local-accept delivery: npppp
+bounce message forking for local-accept-delivery
+postfork: local-accept-delivery
+exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xd7715ced -MCd local-accept-delivery -odi -Mc 10HmaY-0005vi-00
+bounce message forked for local-accept-delivery: npppp
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=EXIM_GID pid=pppp
diff --git a/test/stderr/0393 b/test/stderr/0393
index b751994..d9938f9 100644
--- a/test/stderr/0393
+++ b/test/stderr/0393
@@ -4,9 +4,9 @@ admin user
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -14,8 +14,8 @@ admin user
dropping to exim gid; retaining priv uid
>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
--------> userx@??? <--------
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
direct command:
argv[0] = '/bin/cat'
direct command after expansion:
@@ -33,17 +33,17 @@ lock file created
mailbox TESTSUITE/test-mail/userx is locked
writing to file TESTSUITE/test-mail/userx
writing data block fd=dddd size=sss timeout=0
-delivery (local) forking for transport-filter
+delivery-local forking for transport-filter
postfork: transport-filter
-fresh-exec forked for delivery (local): npppp
-delivery (local) forked for transport-filter: npppp
+local-accept-delivery forked for delivery-local: npppp
+delivery-local forked for transport-filter: npppp
process pppp running as transport filter: fd_write=dddd fd_read=dddd
-delivery (local) forking for transport filter writer
+delivery-local forking for transport filter writer
postfork: transport filter writer
cannot use sendfile for body: spoolfile not wireformat
writing data block fd=dddd size=sss timeout=0
>>>>>>>>>>>>>>>> Exim pid=pppp (tpt-filter writer) terminating with rc=0 >>>>>>>>>>>>>>>>
-delivery (local) forked for transport filter writer: npppp
+delivery-local forked for transport filter writer: npppp
process pppp writing to transport filter
copying from the filter
waiting for filter process
@@ -64,9 +64,9 @@ configuration file is TESTSUITE/test-config
admin user
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -74,8 +74,8 @@ admin user
dropping to exim gid; retaining priv uid
>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
--------> userx@??? <--------
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
direct command:
direct command after expansion:
appendfile transport entered
@@ -95,7 +95,7 @@ cannot use sendfile for body: spoolfile not wireformat
writing data block fd=dddd size=sss timeout=0
writing data block fd=dddd size=sss timeout=0
appendfile yields 0 with errno=dd more_errno=dd
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forked for delivery-local: npppp
t1 transport returned OK for userx@???
LOG: MAIN
=> userx <userx@???> R=r1 T=t1
@@ -108,9 +108,9 @@ configuration file is TESTSUITE/test-config
admin user
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -118,8 +118,8 @@ admin user
dropping to exim gid; retaining priv uid
>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
--------> userx@??? <--------
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
direct command:
argv[0] = '${if={1}{1}{}{}}'
direct command after expansion:
@@ -141,7 +141,7 @@ cannot use sendfile for body: spoolfile not wireformat
writing data block fd=dddd size=sss timeout=0
writing data block fd=dddd size=sss timeout=0
appendfile yields 0 with errno=dd more_errno=dd
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forked for delivery-local: npppp
t1 transport returned OK for userx@???
LOG: MAIN
=> userx <userx@???> R=r1 T=t1
diff --git a/test/stderr/0402 b/test/stderr/0402
index 4e403a6..0158b4c 100644
--- a/test/stderr/0402
+++ b/test/stderr/0402
@@ -174,10 +174,10 @@ LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
search_tidyup called
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715dfd -odi -Mc 10HmaX-0005vi-00
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715dfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=EXIM_GID pid=pppp
@@ -459,8 +459,8 @@ no retry data available
╰─────result: /non-exist/usery
╰──(tainted)
search_tidyup called
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
changed uid/gid: local delivery to TESTSUITE/test-mail/junk <TESTSUITE/test-mail/junk> transport=ft1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=/non-exist/usery current=/
@@ -505,7 +505,7 @@ writing data block fd=dddd size=sss timeout=0
writing data block fd=dddd size=sss timeout=0
appendfile yields 0 with errno=dd more_errno=dd
search_tidyup called
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forked for delivery-local: npppp
journalling TESTSUITE/test-mail/junk:rd+usery@???
ft1 transport returned OK for TESTSUITE/test-mail/junk
post-process TESTSUITE/test-mail/junk (0)
@@ -521,8 +521,8 @@ LOG: MAIN
failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
no retry data available
search_tidyup called
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
changed uid/gid: local delivery to TESTSUITE/test-mail/junk <TESTSUITE/test-mail/junk> transport=ft1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=/non-exist/CALLER current=/
@@ -567,7 +567,7 @@ writing data block fd=dddd size=sss timeout=0
writing data block fd=dddd size=sss timeout=0
appendfile yields 0 with errno=dd more_errno=dd
search_tidyup called
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forked for delivery-local: npppp
journalling TESTSUITE/test-mail/junk:rd+CALLER@???
ft1 transport returned OK for TESTSUITE/test-mail/junk
post-process TESTSUITE/test-mail/junk (0)
@@ -583,8 +583,8 @@ LOG: MAIN
failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
no retry data available
search_tidyup called
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
changed uid/gid: local delivery to CALLER <CALLER@???> transport=t1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=/non-exist/CALLER current=/
@@ -597,7 +597,7 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0
maildir_use_size_file=no
locking by lockfile fcntl
search_tidyup called
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forked for delivery-local: npppp
journalling CALLER@???
t1 transport returned OK for CALLER@???
post-process CALLER@??? (0)
@@ -616,8 +616,8 @@ no retry data available
╰─────result: /non-exist/usery
╰──(tainted)
search_tidyup called
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
changed uid/gid: local delivery to usery <usery@???> transport=t1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=/non-exist/usery current=/
@@ -630,7 +630,7 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0
maildir_use_size_file=no
locking by lockfile fcntl
search_tidyup called
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forked for delivery-local: npppp
journalling usery@???
t1 transport returned OK for usery@???
post-process usery@??? (0)
@@ -649,8 +649,8 @@ no retry data available
╰─────result: /userz
╰──(tainted)
search_tidyup called
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
changed uid/gid: local delivery to userz <userz@???> transport=t2
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=/userz current=/
@@ -663,7 +663,7 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0
maildir_use_size_file=no
locking by lockfile fcntl
search_tidyup called
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forked for delivery-local: npppp
journalling userz@???
t2 transport returned OK for userz@???
post-process userz@??? (0)
diff --git a/test/stderr/0403 b/test/stderr/0403
index 766376d..bb3dba3 100644
--- a/test/stderr/0403
+++ b/test/stderr/0403
@@ -44,10 +44,10 @@ LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
search_tidyup called
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -N -odi -Mc 10HmaX-0005vi-00
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -N -odi -Mc 10HmaX-0005vi-00
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=EXIM_GID pid=pppp
@@ -163,8 +163,8 @@ search_tidyup called
failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
no retry data available
search_tidyup called
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
changed uid/gid: local delivery to TESTSUITE/test-mail/junk <TESTSUITE/test-mail/junk> transport=t1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=/usr current=/usr
@@ -183,7 +183,7 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0
locking by lockfile fcntl
*** delivery by t1 transport bypassed by -N option
search_tidyup called
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forked for delivery-local: npppp
journalling TESTSUITE/test-mail/junk:userx@???
t1 transport returned OK for TESTSUITE/test-mail/junk
post-process TESTSUITE/test-mail/junk (0)
diff --git a/test/stderr/0404 b/test/stderr/0404
index 70bab7a..21c5eac 100644
--- a/test/stderr/0404
+++ b/test/stderr/0404
@@ -143,10 +143,10 @@ LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
search_tidyup called
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -odi -Mc 10HmaX-0005vi-00
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=EXIM_GID pid=pppp
@@ -201,8 +201,8 @@ expanded: '#Exim filter
mail text rhubarb
seen finish'
search_tidyup called
-fresh-exec forking for router interpret
-postfork: router interpret
+local-accept-delivery forking for router-interpret
+postfork: router-interpret
changed uid/gid: r2 router (recipient is userx@???)
uid=CALLER_UID gid=CALLER_GID pid=pppp
turned off address rewrite logging (not root or exim in this process)
@@ -211,7 +211,7 @@ Filter: start of processing
Filter: end of processing
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (rda) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forked for router interpret: npppp
+local-accept-delivery forked for router-interpret: npppp
rda_interpret: subprocess yield=0 error=NULL
set transport t1
r2 router generated >sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???, ...
@@ -248,19 +248,19 @@ search_tidyup called
failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
no retry data available
search_tidyup called
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
changed uid/gid: local delivery to >sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???, ... <>sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???, ...> transport=t1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=NULL current=/
set_process_info: pppp **** string overflowed buffer ****
t1 transport entered
taking data from address
-delivery (local) forking for autoreply
+delivery-local forking for autoreply
postfork: autoreply
-exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -odi -odi -t -oem -oi -f <> -E10HmaX-0005vi-00
-fresh-exec forked for delivery (local): npppp
-delivery (local) forked for autoreply: npppp
+exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd autoreply -odi -odi -t -oem -oi -f <> -E10HmaX-0005vi-00
+local-accept-delivery forked for delivery-local: npppp
+delivery-local forked for autoreply: npppp
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
@@ -1531,10 +1531,10 @@ Size of headers = sss
LOG: MAIN
<= <> R=10HmaX-0005vi-00 U=CALLER P=local S=sss
search_tidyup called
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -odi -Mc 10HmaY-0005vi-00
-fresh-exec forked for local-accept delivery: npppp
+autoreply forking for local-accept-delivery
+postfork: local-accept-delivery
+exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaY-0005vi-00
+autoreply forked for local-accept-delivery: npppp
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=EXIM_GID pid=pppp
@@ -17996,8 +17996,8 @@ sender@??? is a duplicate address: discarded
failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
no retry data available
search_tidyup called
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
changed uid/gid: local delivery to sender <sender@???> transport=t2
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=NULL current=/
@@ -18022,7 +18022,7 @@ writing data block fd=dddd size=sss timeout=0
writing data block fd=dddd size=sss timeout=0
appendfile yields 0 with errno=dd more_errno=dd
search_tidyup called
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forked for delivery-local: npppp
journalling sender@???
t2 transport returned OK for sender@???
post-process sender@??? (0)
diff --git a/test/stderr/0408 b/test/stderr/0408
index 7e26327..1317c01 100644
--- a/test/stderr/0408
+++ b/test/stderr/0408
@@ -44,10 +44,10 @@ LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
search_tidyup called
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -odi -Mc 10HmaX-0005vi-00
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=EXIM_GID pid=pppp
@@ -144,8 +144,8 @@ search_tidyup called
failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
no retry data available
search_tidyup called
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
changed uid/gid: local delivery to userx <userx@???> transport=t1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=NULL current=/
@@ -168,7 +168,7 @@ writing data block fd=dddd size=sss timeout=0
writing data block fd=dddd size=sss timeout=0
appendfile yields 0 with errno=dd more_errno=dd
search_tidyup called
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forked for delivery-local: npppp
journalling userx@???
t1 transport returned OK for userx@???
post-process userx@??? (0)
diff --git a/test/stderr/0426 b/test/stderr/0426
index b41aed9..6d02a39 100644
--- a/test/stderr/0426
+++ b/test/stderr/0426
@@ -4,9 +4,9 @@ admin user
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -29,16 +29,16 @@ local_part=x domain=uppercase.test.ex
calling r1 router
r1 router called for x@???
domain = uppercase.test.ex
-fresh-exec forking for fakens-search
+local-accept-delivery forking for fakens-search
postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
+local-accept-delivery forked for fakens-search: npppp
uppercase.test.ex (MX resp) DNSSEC
-fresh-exec forking for fakens-search
+local-accept-delivery forking for fakens-search
postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
+local-accept-delivery forked for fakens-search: npppp
+local-accept-delivery forking for fakens-search
postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
+local-accept-delivery forked for fakens-search: npppp
local host found for non-MX address
fully qualified name = UpperCase.test.ex
uppercase.test.ex 127.0.0.1 mx=-1 sort=xx
@@ -59,25 +59,25 @@ After routing:
x@???
Failed addresses:
Deferred addresses:
-fresh-exec forking for transport
+local-accept-delivery forking for transport
postfork: transport
locking TESTSUITE/spool/db/retry.lockfile
locking TESTSUITE/spool/db/wait-t1.lockfile
-fresh-exec forked for transport: npppp
+local-accept-delivery forked for transport: npppp
LOG: MAIN
** x@??? R=r1 T=t1 H=uppercase.test.ex [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@???>: 550 Unknown
-fresh-exec forking for bounce message
+local-accept-delivery forking for bounce message
postfork: bounce message
-fresh-exec forked for bounce message: npppp
+local-accept-delivery forked for bounce message: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
LOG: MAIN
<= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+bounce message forking for local-accept-delivery
+postfork: local-accept-delivery
+bounce message forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
diff --git a/test/stderr/0433 b/test/stderr/0433
index 67cafe1..686e992 100644
--- a/test/stderr/0433
+++ b/test/stderr/0433
@@ -20,7 +20,7 @@ daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
fresh-exec forking for daemon del pidfile
pppp postfork: daemon del pidfile
-pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225 -C TESTSUITE/test-config -d=0xf7795cfd -oP TESTSUITE/spool/exim-daemon.pid -oPX
+pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon del pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
fresh-exec forked for daemon del pidfile: npppp
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -45,7 +45,7 @@ daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
fresh-exec forking for daemon del pidfile
pppp postfork: daemon del pidfile
-pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -C TESTSUITE/test-config -d=0xf7795cfd -oP TESTSUITE/spool/exim-daemon.pid -oPX
+pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon del pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
fresh-exec forked for daemon del pidfile: npppp
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -71,7 +71,7 @@ daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
fresh-exec forking for daemon del pidfile
pppp postfork: daemon del pidfile
-pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; 127.0.0.1.1228 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -oP TESTSUITE/spool/exim-daemon.pid -oPX
+pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; 127.0.0.1.1228 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon del pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
fresh-exec forked for daemon del pidfile: npppp
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -97,7 +97,7 @@ daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
fresh-exec forking for daemon del pidfile
pppp postfork: daemon del pidfile
-pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; 0.0.0.0; 127.0.0.1.1228 -C TESTSUITE/test-config -d=0xf7795cfd -oP TESTSUITE/spool/exim-daemon.pid -oPX
+pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; 0.0.0.0; 127.0.0.1.1228 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon del pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
fresh-exec forked for daemon del pidfile: npppp
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -124,7 +124,7 @@ daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
fresh-exec forking for daemon del pidfile
pppp postfork: daemon del pidfile
-pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; 127.0.0.1.1228 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -oP TESTSUITE/spool/exim-daemon.pid -oPX
+pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; 127.0.0.1.1228 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon del pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
fresh-exec forked for daemon del pidfile: npppp
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -151,7 +151,7 @@ daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
fresh-exec forking for daemon del pidfile
pppp postfork: daemon del pidfile
-pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -oP TESTSUITE/spool/exim-daemon.pid -oPX
+pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon del pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
fresh-exec forked for daemon del pidfile: npppp
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0437 b/test/stderr/0437
index acb7860..6118f55 100644
--- a/test/stderr/0437
+++ b/test/stderr/0437
@@ -31,8 +31,8 @@ postfork: qrun delivery
lookup yielded: t1
search_tidyup called
search_tidyup called
-qrun delivery forking for delivery (local)
-postfork: delivery (local)
+qrun delivery forking for delivery-local
+postfork: delivery-local
search_open: lsearch "TESTSUITE/aux-fixed/0437.ls"
search_find: file="TESTSUITE/aux-fixed/0437.ls"
key="file" partial=-1 affix=NULL starflags=0
@@ -46,7 +46,7 @@ postfork: delivery (local)
lookup yielded: file
search_tidyup called
fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for delivery (local): npppp
+qrun delivery forked for delivery-local: npppp
LOG: MAIN
=> userx <userx@???> R=r1 T=t1
LOG: MAIN
@@ -69,8 +69,8 @@ postfork: qrun delivery
lookup yielded: t1
search_tidyup called
search_tidyup called
-qrun delivery forking for delivery (local)
-postfork: delivery (local)
+qrun delivery forking for delivery-local
+postfork: delivery-local
search_open: lsearch "TESTSUITE/aux-fixed/0437.ls"
search_find: file="TESTSUITE/aux-fixed/0437.ls"
key="file" partial=-1 affix=NULL starflags=0
@@ -84,7 +84,7 @@ postfork: delivery (local)
lookup yielded: file
search_tidyup called
fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for delivery (local): npppp
+qrun delivery forked for delivery-local: npppp
LOG: MAIN
=> userx <userx@???> R=r1 T=t1
LOG: MAIN
diff --git a/test/stderr/0438 b/test/stderr/0438
index 4fffbc4..c9b14d2 100644
--- a/test/stderr/0438
+++ b/test/stderr/0438
@@ -22,7 +22,7 @@ daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
fresh-exec forking for daemon del pidfile
pppp postfork: daemon del pidfile
-pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -oP TESTSUITE/spool/exim-daemon.pid -oPX
+pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon del pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
fresh-exec forked for daemon del pidfile: npppp
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -48,7 +48,7 @@ daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
fresh-exec forking for daemon del pidfile
pppp postfork: daemon del pidfile
-pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -oP TESTSUITE/spool/exim-daemon.anotherpid -oPX
+pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon del pidfile -oP TESTSUITE/spool/exim-daemon.anotherpid -oPX
fresh-exec forked for daemon del pidfile: npppp
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -74,7 +74,7 @@ daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
fresh-exec forking for daemon del pidfile
pppp postfork: daemon del pidfile
-pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -oP TESTSUITE/spool/mypidfile -oPX
+pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon del pidfile -oP TESTSUITE/spool/mypidfile -oPX
fresh-exec forked for daemon del pidfile: npppp
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0450 b/test/stderr/0450
index 63d0e7e..8926729 100644
--- a/test/stderr/0450
+++ b/test/stderr/0450
@@ -4,9 +4,9 @@ admin user
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -14,7 +14,7 @@ admin user
dropping to exim gid; retaining priv uid
>>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
--------> userx@??? <--------
-fresh-exec forking for transport
+local-accept-delivery forking for transport
postfork: transport
t1 transport entered
userx@???
@@ -27,7 +27,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... failed: Connection refused
LOG: MAIN
H=127.0.0.1 [127.0.0.1] Connection refused
added retry item for T:127.0.0.1:127.0.0.1:1225: errno=dd more_errno=dd,A flags=2
-fresh-exec forked for transport: npppp
+local-accept-delivery forked for transport: npppp
all IP addresses skipped or deferred at least one address
updating wait-t1 database
added to list for 127.0.0.1
diff --git a/test/stderr/0476 b/test/stderr/0476
index 9a77586..40a3bc0 100644
--- a/test/stderr/0476
+++ b/test/stderr/0476
@@ -74,9 +74,9 @@ admin user
set_process_info: pppp accepting a local non-SMTP message from <>
LOG: MAIN
<= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+bounce message forking for local-accept-delivery
+postfork: local-accept-delivery
+bounce message forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -86,7 +86,7 @@ set_process_info: pppp delivering specified messages
set_process_info: pppp delivering 10HmaZ-0005vi-00
>>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
--------> CALLER@??? <--------
-fresh-exec forking for transport
+local-accept-delivery forking for transport
postfork: transport
set_process_info: pppp delivering 10HmaZ-0005vi-00 using t1
t1 transport entered
@@ -102,7 +102,7 @@ LOG: MAIN
H=127.0.0.1 [127.0.0.1] Connection refused
set_process_info: pppp delivering 10HmaZ-0005vi-00: just tried 127.0.0.1 [127.0.0.1]:PORT_S for CALLER@???: result DEFER
added retry item for T:127.0.0.1:127.0.0.1:1224: errno=dd more_errno=dd,A flags=2
-fresh-exec forked for transport: npppp
+local-accept-delivery forked for transport: npppp
all IP addresses skipped or deferred at least one address
updating wait-t1 database
added to list for 127.0.0.1
diff --git a/test/stderr/0487 b/test/stderr/0487
index e9153a5..5caae6b 100644
--- a/test/stderr/0487
+++ b/test/stderr/0487
@@ -71,10 +71,10 @@ LOG: MAIN
created log directory TESTSUITE/spool/log
SMTP>> 250 OK id=10HmaX-0005vi-00
search_tidyup called
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -odi -Mc 10HmaX-0005vi-00
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=EXIM_GID pid=pppp
@@ -146,8 +146,8 @@ search_tidyup called
failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
no retry data available
search_tidyup called
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
changed uid/gid: local delivery to userx <userx@???> transport=t1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=NULL current=/
@@ -172,7 +172,7 @@ writing data block fd=dddd size=sss timeout=0
writing data block fd=dddd size=sss timeout=0
appendfile yields 0 with errno=dd more_errno=dd
search_tidyup called
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forked for delivery-local: npppp
journalling userx@???
t1 transport returned OK for userx@???
post-process userx@??? (0)
diff --git a/test/stderr/0512 b/test/stderr/0512
index 2a1d811..b37d691 100644
--- a/test/stderr/0512
+++ b/test/stderr/0512
@@ -78,9 +78,9 @@ trusted user
admin user
LOG: MAIN
<= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+bounce message forking for local-accept-delivery
+postfork: local-accept-delivery
+bounce message forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -158,9 +158,9 @@ trusted user
admin user
LOG: MAIN
<= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+bounce message forking for local-accept-delivery
+postfork: local-accept-delivery
+bounce message forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
diff --git a/test/stderr/0529 b/test/stderr/0529
index f7e6fe2..26a2d15 100644
--- a/test/stderr/0529
+++ b/test/stderr/0529
@@ -4,9 +4,9 @@ admin user
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -31,9 +31,9 @@ After routing:
Deferred addresses:
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
+local-accept-delivery forked for delivery-local: npppp
added retry item for T:TESTSUITE/test-mail/rmbox:x@???: errno=-22 more_errno=dd flags=0
LOG: MAIN
== TESTSUITE/test-mail/rmbox <x@???> R=r1 T=t1 defer (-22): mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/rmbox)
diff --git a/test/stderr/0544 b/test/stderr/0544
index 1383687..cdad6f0 100644
--- a/test/stderr/0544
+++ b/test/stderr/0544
@@ -119,22 +119,22 @@ admin user
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
configuration file is TESTSUITE/test-config
trusted user
admin user
dropping to exim gid; retaining priv uid
-fresh-exec forking for transport
+local-accept-delivery forking for transport
postfork: transport
╭considering: $domain
├──expanding: $domain
╰─────result: domain1.ex
╰──(tainted)
-fresh-exec forked for transport: npppp
+local-accept-delivery forked for transport: npppp
LOG: MAIN
== userx@??? R=smarthost T=smtp defer (-1): first-pass only routing due to -odqs, queue_smtp_domains or control=queue
LOG: MAIN
diff --git a/test/stderr/1007 b/test/stderr/1007
index 55d29e2..bef07f7 100644
--- a/test/stderr/1007
+++ b/test/stderr/1007
@@ -21,7 +21,7 @@ daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
fresh-exec forking for daemon del pidfile
pppp postfork: daemon del pidfile
-pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225 -C TESTSUITE/test-config -d=0xf7795cfd -oP TESTSUITE/spool/exim-daemon.pid -oPX
+pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon del pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
fresh-exec forked for daemon del pidfile: npppp
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -48,7 +48,7 @@ daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
fresh-exec forking for daemon del pidfile
pppp postfork: daemon del pidfile
-pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -C TESTSUITE/test-config -d=0xf7795cfd -oP TESTSUITE/spool/exim-daemon.pid -oPX
+pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon del pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
fresh-exec forked for daemon del pidfile: npppp
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -76,7 +76,7 @@ daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
fresh-exec forking for daemon del pidfile
pppp postfork: daemon del pidfile
-pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; ::0 ; 127.0.0.1.1228 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -oP TESTSUITE/spool/exim-daemon.pid -oPX
+pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; ::0 ; 127.0.0.1.1228 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon del pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
fresh-exec forked for daemon del pidfile: npppp
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -104,7 +104,7 @@ daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
fresh-exec forking for daemon del pidfile
pppp postfork: daemon del pidfile
-pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; 0.0.0.0; 127.0.0.1.1228 ; ::0 -C TESTSUITE/test-config -d=0xf7795cfd -oP TESTSUITE/spool/exim-daemon.pid -oPX
+pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; 0.0.0.0; 127.0.0.1.1228 ; ::0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon del pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
fresh-exec forked for daemon del pidfile: npppp
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -129,7 +129,7 @@ daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
fresh-exec forking for daemon del pidfile
pppp postfork: daemon del pidfile
-pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 -C TESTSUITE/test-config -d=0xf7795cfd -oP TESTSUITE/spool/exim-daemon.pid -oPX
+pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon del pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
fresh-exec forked for daemon del pidfile: npppp
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -157,7 +157,7 @@ daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
fresh-exec forking for daemon del pidfile
pppp postfork: daemon del pidfile
-pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; ::0 ; 127.0.0.1.1228 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -oP TESTSUITE/spool/exim-daemon.pid -oPX
+pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; ::0 ; 127.0.0.1.1228 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon del pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
fresh-exec forked for daemon del pidfile: npppp
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -186,7 +186,7 @@ daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
fresh-exec forking for daemon del pidfile
pppp postfork: daemon del pidfile
-pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; ::0 ; 127.0.0.1.1228 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -oP TESTSUITE/spool/exim-daemon.pid -oPX
+pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; ::0 ; 127.0.0.1.1228 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon del pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
fresh-exec forked for daemon del pidfile: npppp
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -214,7 +214,7 @@ daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
fresh-exec forking for daemon del pidfile
pppp postfork: daemon del pidfile
-pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -oP TESTSUITE/spool/exim-daemon.pid -oPX
+pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon del pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
fresh-exec forked for daemon del pidfile: npppp
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/2013 b/test/stderr/2013
index 1db091f..d26ff20 100644
--- a/test/stderr/2013
+++ b/test/stderr/2013
@@ -81,7 +81,7 @@ configuration file is TESTSUITE/test-config
trusted user
admin user
dropping to exim gid; retaining priv uid
-fresh-exec forking for transport
+continued-transport forking for transport
postfork: transport
SMTP>> MAIL FROM:<CALLER@???> SIZE=ssss
SMTP>> RCPT TO:<userz@???>
@@ -95,7 +95,7 @@ transport forking for continued-transport interproc
postfork: continued-transport interproc
continued-transport interproc forking for continued-transport
postfork: continued-transport
-fresh-exec forked for transport: npppp
+continued-transport forked for transport: npppp
transport forked for continued-transport interproc: npppp
continued-transport interproc forked for continued-transport: npppp
SMTP(close)>>
@@ -109,7 +109,7 @@ configuration file is TESTSUITE/test-config
trusted user
admin user
dropping to exim gid; retaining priv uid
-fresh-exec forking for transport
+continued-transport forking for transport
postfork: transport
SMTP>> MAIL FROM:<CALLER@???> SIZE=ssss
SMTP>> RCPT TO:<usery@???>
@@ -122,7 +122,7 @@ cmd buf flush ddd bytes
SMTP>> QUIT
cmd buf flush ddd bytes
SMTP(close)>>
-fresh-exec forked for transport: npppp
+continued-transport forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (TLS proxy) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
=> usery@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbC-0005vi-00"
@@ -215,7 +215,7 @@ configuration file is TESTSUITE/test-config
trusted user
admin user
dropping to exim gid; retaining priv uid
-fresh-exec forking for transport
+continued-transport forking for transport
postfork: transport
SMTP>> MAIL FROM:<CALLER@???> SIZE=ssss
SMTP>> RCPT TO:<userc@???>
@@ -229,7 +229,7 @@ transport forking for continued-transport interproc
postfork: continued-transport interproc
continued-transport interproc forking for continued-transport
postfork: continued-transport
-fresh-exec forked for transport: npppp
+continued-transport forked for transport: npppp
transport forked for continued-transport interproc: npppp
continued-transport interproc forked for continued-transport: npppp
SMTP(close)>>
@@ -243,7 +243,7 @@ configuration file is TESTSUITE/test-config
trusted user
admin user
dropping to exim gid; retaining priv uid
-fresh-exec forking for transport
+continued-transport forking for transport
postfork: transport
SMTP>> MAIL FROM:<CALLER@???> SIZE=ssss
SMTP>> RCPT TO:<userb@???>
@@ -256,7 +256,7 @@ cmd buf flush ddd bytes
SMTP>> QUIT
cmd buf flush ddd bytes
SMTP(close)>>
-fresh-exec forked for transport: npppp
+continued-transport forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (TLS proxy) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
=> userb@??? R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbI-0005vi-00"
@@ -352,11 +352,11 @@ configuration file is TESTSUITE/test-config
trusted user
admin user
dropping to exim gid; retaining priv uid
-fresh-exec forking for transport
+continued-transport forking for transport
postfork: transport
SMTP>> STARTTLS
cmd buf flush ddd bytes
-fresh-exec forked for transport: npppp
+continued-transport forked for transport: npppp
SMTP<< 220 TLS go ahead
SMTP>> EHLO myhost.test.ex
cmd buf flush ddd bytes
@@ -398,11 +398,11 @@ configuration file is TESTSUITE/test-config
trusted user
admin user
dropping to exim gid; retaining priv uid
-fresh-exec forking for transport
+continued-transport forking for transport
postfork: transport
SMTP>> STARTTLS
cmd buf flush ddd bytes
-fresh-exec forked for transport: npppp
+continued-transport forked for transport: npppp
SMTP<< 220 TLS go ahead
SMTP>> EHLO myhost.test.ex
cmd buf flush ddd bytes
diff --git a/test/stderr/2035 b/test/stderr/2035
index 7f4c1b1..4c05eac 100644
--- a/test/stderr/2035
+++ b/test/stderr/2035
@@ -35,17 +35,17 @@ sync_responses expect rcpt
SMTP<< 250 Accepted
LOG: MAIN
<= CALLER@??? U=CALLER P=local-smtp S=sss
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+fresh-exec forked for local-accept-delivery: npppp
LOG: smtp_connection MAIN
SMTP connection from CALLER closed by QUIT
>>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
-local-accept delivery forking for tls-proxy interproc
+local-accept-delivery forking for tls-proxy interproc
postfork: tls-proxy interproc
tls-proxy interproc forking for tls proxy
postfork: tls proxy
-local-accept delivery forked for tls-proxy interproc: npppp
+local-accept-delivery forked for tls-proxy interproc: npppp
proxy-proc inter-pid pppp
tls-proxy interproc forked for tls proxy: npppp
proxy-proc final-pid pppp
@@ -56,7 +56,7 @@ admin user
dropping to exim gid; retaining priv uid
>>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
--------> userb@??? <--------
-fresh-exec forking for transport
+local-accept-delivery forking for transport
postfork: transport
t1 transport entered
userb@???
@@ -80,7 +80,7 @@ ok=1 send_quit=1 send_rset=0 continue_more=0 yield=0 first_address is NULL
SMTP>> QUIT
cmd buf flush ddd bytes
SMTP(close)>>
-fresh-exec forked for transport: npppp
+local-accept-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (TLS proxy) terminating with rc=0 >>>>>>>>>>>>>>>>
Leaving t1 transport
LOG: MAIN
diff --git a/test/stderr/2113 b/test/stderr/2113
index 70a7f42..7f0115f 100644
--- a/test/stderr/2113
+++ b/test/stderr/2113
@@ -81,7 +81,7 @@ configuration file is TESTSUITE/test-config
trusted user
admin user
dropping to exim gid; retaining priv uid
-fresh-exec forking for transport
+continued-transport forking for transport
postfork: transport
SMTP>> MAIL FROM:<CALLER@???> SIZE=ssss
SMTP>> RCPT TO:<userz@???>
@@ -95,7 +95,7 @@ transport forking for continued-transport interproc
postfork: continued-transport interproc
continued-transport interproc forking for continued-transport
postfork: continued-transport
-fresh-exec forked for transport: npppp
+continued-transport forked for transport: npppp
transport forked for continued-transport interproc: npppp
continued-transport interproc forked for continued-transport: npppp
SMTP(close)>>
@@ -109,7 +109,7 @@ configuration file is TESTSUITE/test-config
trusted user
admin user
dropping to exim gid; retaining priv uid
-fresh-exec forking for transport
+continued-transport forking for transport
postfork: transport
SMTP>> MAIL FROM:<CALLER@???> SIZE=ssss
SMTP>> RCPT TO:<usery@???>
@@ -122,7 +122,7 @@ cmd buf flush ddd bytes
SMTP>> QUIT
cmd buf flush ddd bytes
SMTP(close)>>
-fresh-exec forked for transport: npppp
+continued-transport forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (TLS proxy) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
=> usery@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbC-0005vi-00"
@@ -215,7 +215,7 @@ configuration file is TESTSUITE/test-config
trusted user
admin user
dropping to exim gid; retaining priv uid
-fresh-exec forking for transport
+continued-transport forking for transport
postfork: transport
SMTP>> MAIL FROM:<CALLER@???> SIZE=ssss
SMTP>> RCPT TO:<userc@???>
@@ -229,7 +229,7 @@ transport forking for continued-transport interproc
postfork: continued-transport interproc
continued-transport interproc forking for continued-transport
postfork: continued-transport
-fresh-exec forked for transport: npppp
+continued-transport forked for transport: npppp
transport forked for continued-transport interproc: npppp
continued-transport interproc forked for continued-transport: npppp
SMTP(close)>>
@@ -243,7 +243,7 @@ configuration file is TESTSUITE/test-config
trusted user
admin user
dropping to exim gid; retaining priv uid
-fresh-exec forking for transport
+continued-transport forking for transport
postfork: transport
SMTP>> MAIL FROM:<CALLER@???> SIZE=ssss
SMTP>> RCPT TO:<userb@???>
@@ -256,7 +256,7 @@ cmd buf flush ddd bytes
SMTP>> QUIT
cmd buf flush ddd bytes
SMTP(close)>>
-fresh-exec forked for transport: npppp
+continued-transport forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (TLS proxy) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
=> userb@??? R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbI-0005vi-00"
@@ -352,11 +352,11 @@ configuration file is TESTSUITE/test-config
trusted user
admin user
dropping to exim gid; retaining priv uid
-fresh-exec forking for transport
+continued-transport forking for transport
postfork: transport
SMTP>> STARTTLS
cmd buf flush ddd bytes
-fresh-exec forked for transport: npppp
+continued-transport forked for transport: npppp
SMTP<< 220 TLS go ahead
SMTP>> EHLO myhost.test.ex
cmd buf flush ddd bytes
@@ -398,11 +398,11 @@ configuration file is TESTSUITE/test-config
trusted user
admin user
dropping to exim gid; retaining priv uid
-fresh-exec forking for transport
+continued-transport forking for transport
postfork: transport
SMTP>> STARTTLS
cmd buf flush ddd bytes
-fresh-exec forked for transport: npppp
+continued-transport forked for transport: npppp
SMTP<< 220 TLS go ahead
SMTP>> EHLO myhost.test.ex
cmd buf flush ddd bytes
diff --git a/test/stderr/2135 b/test/stderr/2135
index 7f4c1b1..4c05eac 100644
--- a/test/stderr/2135
+++ b/test/stderr/2135
@@ -35,17 +35,17 @@ sync_responses expect rcpt
SMTP<< 250 Accepted
LOG: MAIN
<= CALLER@??? U=CALLER P=local-smtp S=sss
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+fresh-exec forked for local-accept-delivery: npppp
LOG: smtp_connection MAIN
SMTP connection from CALLER closed by QUIT
>>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
-local-accept delivery forking for tls-proxy interproc
+local-accept-delivery forking for tls-proxy interproc
postfork: tls-proxy interproc
tls-proxy interproc forking for tls proxy
postfork: tls proxy
-local-accept delivery forked for tls-proxy interproc: npppp
+local-accept-delivery forked for tls-proxy interproc: npppp
proxy-proc inter-pid pppp
tls-proxy interproc forked for tls proxy: npppp
proxy-proc final-pid pppp
@@ -56,7 +56,7 @@ admin user
dropping to exim gid; retaining priv uid
>>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
--------> userb@??? <--------
-fresh-exec forking for transport
+local-accept-delivery forking for transport
postfork: transport
t1 transport entered
userb@???
@@ -80,7 +80,7 @@ ok=1 send_quit=1 send_rset=0 continue_more=0 yield=0 first_address is NULL
SMTP>> QUIT
cmd buf flush ddd bytes
SMTP(close)>>
-fresh-exec forked for transport: npppp
+local-accept-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (TLS proxy) terminating with rc=0 >>>>>>>>>>>>>>>>
Leaving t1 transport
LOG: MAIN
diff --git a/test/stderr/2600 b/test/stderr/2600
index 6a0ef97..94b4949 100644
--- a/test/stderr/2600
+++ b/test/stderr/2600
@@ -331,10 +331,10 @@ LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
search_tidyup called
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -odi -Mc 10HmaX-0005vi-00
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=EXIM_GID pid=pppp
@@ -414,8 +414,8 @@ search_tidyup called
failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
no retry data available
search_tidyup called
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
changed uid/gid: local delivery to userx <userx@???> transport=t1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=NULL current=/
@@ -447,7 +447,7 @@ writing data block fd=dddd size=sss timeout=0
writing data block fd=dddd size=sss timeout=0
appendfile yields 0 with errno=dd more_errno=dd
search_tidyup called
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forked for delivery-local: npppp
journalling userx@???
t1 transport returned OK for userx@???
post-process userx@??? (0)
diff --git a/test/stderr/2610 b/test/stderr/2610
index 1da8bfd..6403d28 100644
--- a/test/stderr/2610
+++ b/test/stderr/2610
@@ -324,10 +324,10 @@ LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
search_tidyup called
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -odi -Mc 10HmaX-0005vi-00
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=EXIM_GID pid=pppp
@@ -409,8 +409,8 @@ close MYSQL connection: 127.0.0.1:1223/test/root
failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
no retry data available
search_tidyup called
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
changed uid/gid: local delivery to ph10 <ph10@???> transport=t1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=NULL current=/
@@ -444,7 +444,7 @@ writing data block fd=dddd size=sss timeout=0
appendfile yields 0 with errno=dd more_errno=dd
search_tidyup called
close MYSQL connection: 127.0.0.1:1223/test/root
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forked for delivery-local: npppp
journalling ph10@???
t1 transport returned OK for ph10@???
post-process ph10@??? (0)
diff --git a/test/stderr/2620 b/test/stderr/2620
index 597d960..1894744 100644
--- a/test/stderr/2620
+++ b/test/stderr/2620
@@ -342,10 +342,10 @@ LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
search_tidyup called
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -odi -Mc 10HmaX-0005vi-00
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=EXIM_GID pid=pppp
@@ -427,8 +427,8 @@ close PGSQL connection: localhost:1223/test/CALLER
failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
no retry data available
search_tidyup called
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
changed uid/gid: local delivery to CALLER <CALLER@???> transport=t1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=NULL current=/
@@ -462,7 +462,7 @@ writing data block fd=dddd size=sss timeout=0
appendfile yields 0 with errno=dd more_errno=dd
search_tidyup called
close PGSQL connection: localhost:1223/test/CALLER
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forked for delivery-local: npppp
journalling CALLER@???
t1 transport returned OK for CALLER@???
post-process CALLER@??? (0)
diff --git a/test/stderr/4052 b/test/stderr/4052
index b9629ad..7d93f2e 100644
--- a/test/stderr/4052
+++ b/test/stderr/4052
@@ -3,9 +3,9 @@ configuration file is TESTSUITE/test-config
admin user
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -13,7 +13,7 @@ admin user
dropping to exim gid; retaining priv uid
>>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
--------> extchange@??? <--------
-fresh-exec forking for transport
+local-accept-delivery forking for transport
postfork: transport
smtp transport entered
extchange@???
@@ -63,7 +63,7 @@ no messages waiting for 127.0.0.1
SMTP>> QUIT
cmd buf flush ddd bytes
SMTP(close)>>
-fresh-exec forked for transport: npppp
+local-accept-delivery forked for transport: npppp
Leaving smtp transport
LOG: MAIN
=> extchange@??? R=client T=smtp H=127.0.0.1 [127.0.0.1] L* C="250 message accepted"
diff --git a/test/stderr/4520 b/test/stderr/4520
index 440d9f6..b8f467b 100644
--- a/test/stderr/4520
+++ b/test/stderr/4520
@@ -3,21 +3,21 @@ configuration file is TESTSUITE/test-config
admin user
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
dropping to exim gid; retaining priv uid
-fresh-exec forking for transport
+local-accept-delivery forking for transport
postfork: transport
Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1225 ... connected
SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
SMTP>> EHLO myhost.test.ex
cmd buf flush ddd bytes
-fresh-exec forked for transport: npppp
+local-accept-delivery forked for transport: npppp
SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4]
250-SIZE 52428800
250-8BITMIME
diff --git a/test/stderr/5000 b/test/stderr/5000
index d6d1dff..cecc55a 100644
--- a/test/stderr/5000
+++ b/test/stderr/5000
@@ -4,9 +4,9 @@ configuration file is TESTSUITE/test-config
admin user
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -14,8 +14,8 @@ admin user
dropping to exim gid; retaining priv uid
>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
--------> userx@??? <--------
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
appendfile transport entered
appendfile: mode=600 notify_comsat=0 quota=20480 warning=0
directory=TESTSUITE/test-mail format=maildir
@@ -48,7 +48,7 @@ mailbox quota exceeded
maildir: time since "new" directory modified = 10s
Exim quota exceeded for tmp/dddddddddd.HddddddPddddd.myhost.test.ex
appendfile yields 1 with errno=-22 more_errno=dd
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forked for delivery-local: npppp
maildir_taggedX_appendfile transport returned DEFER for userx@???
added retry item for T:userx@???: errno=-22 more_errno=dd flags=0
LOG: MAIN
diff --git a/test/stderr/5004 b/test/stderr/5004
index 413bb51..af04187 100644
--- a/test/stderr/5004
+++ b/test/stderr/5004
@@ -46,10 +46,10 @@ LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
search_tidyup called
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -odi -Mc 10HmaX-0005vi-00
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=EXIM_GID pid=pppp
@@ -98,8 +98,8 @@ rda_interpret (string): '# Exim filter\nsave TESTSUITE/test-mail'
expanded: '# Exim filter
save TESTSUITE/test-mail'
search_tidyup called
-fresh-exec forking for router interpret
-postfork: router interpret
+local-accept-delivery forking for router-interpret
+postfork: router-interpret
changed uid/gid: r1 router (recipient is userx@???)
uid=CALLER_UID gid=CALLER_GID pid=pppp
turned off address rewrite logging (not root or exim in this process)
@@ -108,7 +108,7 @@ Filter: start of processing
Filter: end of processing
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (rda) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forked for router interpret: npppp
+local-accept-delivery forked for router-interpret: npppp
rda_interpret: subprocess yield=0 error=NULL
set transport t1
r1 router generated TESTSUITE/test-mail
@@ -145,8 +145,8 @@ search_tidyup called
failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
no retry data available
search_tidyup called
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
changed uid/gid: local delivery to TESTSUITE/test-mail <TESTSUITE/test-mail> transport=t1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=NULL current=/
@@ -169,7 +169,7 @@ renaming temporary file
renamed tmp/MAILDIR.mail.test.ex as new/MAILDIR.mail.test.ex
appendfile yields 0 with errno=dd more_errno=dd
search_tidyup called
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forked for delivery-local: npppp
journalling TESTSUITE/test-mail:userx@???
t1 transport returned OK for TESTSUITE/test-mail
post-process TESTSUITE/test-mail (0)
diff --git a/test/stderr/5005 b/test/stderr/5005
index d37d3bd..5a8e846 100644
--- a/test/stderr/5005
+++ b/test/stderr/5005
@@ -44,10 +44,10 @@ LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
search_tidyup called
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -odi -Mc 10HmaX-0005vi-00
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=EXIM_GID pid=pppp
@@ -117,8 +117,8 @@ search_tidyup called
failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
no retry data available
search_tidyup called
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
changed uid/gid: local delivery to nofile <nofile@???> transport=t1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=NULL current=/
@@ -160,7 +160,7 @@ renaming temporary file
renamed tmp/MAILDIR.myhost.test.ex as new/MAILDIR.myhost.test.ex
appendfile yields 0 with errno=dd more_errno=dd
search_tidyup called
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forked for delivery-local: npppp
journalling nofile@???
t1 transport returned OK for nofile@???
post-process nofile@??? (0)
@@ -238,10 +238,10 @@ Size of headers = sss
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
search_tidyup called
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -odi -Mc 10HmaY-0005vi-00
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaY-0005vi-00
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=EXIM_GID pid=pppp
@@ -310,8 +310,8 @@ search_tidyup called
failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
no retry data available
search_tidyup called
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
changed uid/gid: local delivery to userx <userx@???> transport=t1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=NULL current=/
@@ -355,7 +355,7 @@ renaming temporary file
renamed tmp/MAILDIR.myhost.test.ex as new/MAILDIR.myhost.test.ex
appendfile yields 0 with errno=dd more_errno=dd
search_tidyup called
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forked for delivery-local: npppp
journalling userx@???
t1 transport returned OK for userx@???
post-process userx@??? (0)
@@ -433,10 +433,10 @@ Size of headers = sss
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
search_tidyup called
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -odi -Mc 10HmaZ-0005vi-00
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaZ-0005vi-00
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=EXIM_GID pid=pppp
@@ -505,8 +505,8 @@ search_tidyup called
failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
no retry data available
search_tidyup called
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
changed uid/gid: local delivery to userx <userx@???> transport=t1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=NULL current=/
@@ -545,7 +545,7 @@ maildir: time since "new" directory modified = 10s
Exim quota exceeded for tmp/dddddddddd.HddddddPddddd.myhost.test.ex
appendfile yields 1 with errno=-22 more_errno=dd
search_tidyup called
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forked for delivery-local: npppp
t1 transport returned DEFER for userx@???
added retry item for T:userx@???: errno=-22 more_errno=dd flags=0
post-process userx@??? (1)
@@ -637,10 +637,10 @@ Size of headers = sss
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
search_tidyup called
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -odi -Mc 10HmbA-0005vi-00
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmbA-0005vi-00
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=EXIM_GID pid=pppp
@@ -717,8 +717,8 @@ retry record exists: age=ttt (max 1w)
EXIM_DBCLOSE(0xAAAAAAAA)
closed hints database and lockfile
search_tidyup called
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
changed uid/gid: local delivery to userx <userx@???> transport=t1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=NULL current=/
@@ -744,7 +744,7 @@ maildir: time since "new" directory modified = 10s
Exim quota exceeded for tmp/dddddddddd.HddddddPddddd.myhost.test.ex
appendfile yields 1 with errno=-22 more_errno=dd
search_tidyup called
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forked for delivery-local: npppp
t1 transport returned DEFER for userx@???
added retry item for T:userx@???: errno=-22 more_errno=dd flags=0
post-process userx@??? (1)
diff --git a/test/stderr/5006 b/test/stderr/5006
index 6b759c9..7fad8dc 100644
--- a/test/stderr/5006
+++ b/test/stderr/5006
@@ -44,10 +44,10 @@ LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
search_tidyup called
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -odi -Mc 10HmaX-0005vi-00
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=EXIM_GID pid=pppp
@@ -117,8 +117,8 @@ search_tidyup called
failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
no retry data available
search_tidyup called
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
changed uid/gid: local delivery to userx <userx@???> transport=t1
uid=CALLER_UID gid=CALLER_GID pid=pppp
home=NULL current=/
@@ -158,7 +158,7 @@ renaming temporary file
renamed tmp/MAILDIR.myhost.test.ex as new/MAILDIR.myhost.test.ex
appendfile yields 0 with errno=dd more_errno=dd
search_tidyup called
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forked for delivery-local: npppp
journalling userx@???
t1 transport returned OK for userx@???
post-process userx@??? (0)
diff --git a/test/stderr/5008 b/test/stderr/5008
index b85ce5d..0bcd835 100644
--- a/test/stderr/5008
+++ b/test/stderr/5008
@@ -4,9 +4,9 @@ admin user
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -14,8 +14,8 @@ admin user
dropping to exim gid; retaining priv uid
>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
--------> userx@??? <--------
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
appendfile transport entered
appendfile: mode=600 notify_comsat=0 quota=1048576 warning=0
directory=TESTSUITE/test-mail/userx format=maildir
@@ -36,7 +36,7 @@ writing data block fd=dddd size=sss timeout=0
renaming temporary file
renamed tmp/MAILDIR.myhost.test.ex as new/MAILDIR.myhost.test.ex
appendfile yields 0 with errno=dd more_errno=dd
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forked for delivery-local: npppp
t1 transport returned OK for userx@???
LOG: MAIN
=> userx <userx@???> R=r1 T=t1
@@ -49,9 +49,9 @@ configuration file is TESTSUITE/test-config
admin user
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp
+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+fresh-exec forked for local-accept-delivery: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -59,8 +59,8 @@ admin user
dropping to exim gid; retaining priv uid
>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
--------> userx@??? <--------
-fresh-exec forking for delivery (local)
-postfork: delivery (local)
+local-accept-delivery forking for delivery-local
+postfork: delivery-local
appendfile transport entered
appendfile: mode=600 notify_comsat=0 quota=1048576 warning=0
directory=TESTSUITE/test-mail/userx format=maildir
@@ -83,7 +83,7 @@ writing data block fd=dddd size=sss timeout=0
renaming temporary file
renamed tmp/MAILDIR.myhost.test.ex as new/MAILDIR.myhost.test.ex
appendfile yields 0 with errno=dd more_errno=dd
-fresh-exec forked for delivery (local): npppp
+local-accept-delivery forked for delivery-local: npppp
t1 transport returned OK for userx@???
LOG: MAIN
=> userx <userx@???> R=r1 T=t1
