Gitweb:
https://git.exim.org/exim.git/commitdiff/8102279385f5f70c959aa219feca37031c0a1828
Commit: 8102279385f5f70c959aa219feca37031c0a1828
Parent: 4b01271fa595a08e68ba8c58d6404e83623aa9c8
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Sun Mar 22 18:30:18 2020 +0000
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Sun Mar 22 20:14:24 2020 +0000
exit-time debug
---
src/src/daemon.c | 20 ++++---
src/src/exim.c | 70 +++++++++++------------
src/src/functions.h | 4 +-
src/src/log.c | 6 +-
src/src/moan.c | 2 +-
src/src/queue.c | 9 +--
src/src/rda.c | 2 +-
src/src/readconf.c | 6 +-
src/src/receive.c | 8 +--
src/src/route.c | 4 +-
src/src/smtp_in.c | 8 +--
src/src/tls.c | 2 +-
src/src/transport.c | 2 +-
src/src/transports/smtp.c | 2 +-
test/stderr/0002 | 14 ++---
test/stderr/0021 | 6 +-
test/stderr/0022 | 6 +-
test/stderr/0037 | 6 +-
test/stderr/0044 | 4 +-
test/stderr/0078 | 8 +--
test/stderr/0084 | 2 +-
test/stderr/0085 | 4 +-
test/stderr/0092 | 2 +-
test/stderr/0094 | 2 +-
test/stderr/0117 | 6 +-
test/stderr/0123 | 2 +-
test/stderr/0143 | 4 +-
test/stderr/0149 | 2 +-
test/stderr/0161 | 12 ++--
test/stderr/0169 | 4 +-
test/stderr/0183 | 10 ++--
test/stderr/0218 | 128 ++++++++++++++++++++---------------------
test/stderr/0249 | 2 +-
test/stderr/0264 | 4 +-
test/stderr/0275 | 8 +--
test/stderr/0277 | 10 ++--
test/stderr/0278 | 8 +--
test/stderr/0279 | 4 +-
test/stderr/0283 | 12 ++--
test/stderr/0293 | 5 ++
test/stderr/0294 | 8 +--
test/stderr/0297 | 4 +-
test/stderr/0303 | 4 +-
test/stderr/0315 | 8 +--
test/stderr/0317 | 4 +-
test/stderr/0332 | 20 +++----
test/stderr/0333 | 4 +-
test/stderr/0357 | 36 ++++++------
test/stderr/0358 | 16 +++---
test/stderr/0360 | 12 ++--
test/stderr/0361 | 4 +-
test/stderr/0362 | 2 +-
test/stderr/0364 | 2 +-
test/stderr/0368 | 2 +-
test/stderr/0370 | 4 +-
test/stderr/0371 | 2 +-
test/stderr/0374 | 8 +--
test/stderr/0375 | 12 ++--
test/stderr/0376 | 56 +++++++++---------
test/stderr/0377 | 20 +++----
test/stderr/0378 | 24 ++++----
test/stderr/0379 | 12 ++--
test/stderr/0380 | 4 +-
test/stderr/0381 | 2 +-
test/stderr/0382 | 16 +++---
test/stderr/0386 | 8 +--
test/stderr/0387 | 2 +-
test/stderr/0388 | 6 +-
test/stderr/0391 | 2 +-
test/stderr/0393 | 14 ++---
test/stderr/0396 | 2 +-
test/stderr/0398 | 2 +-
test/stderr/0399 | 2 +-
test/stderr/0402 | 4 +-
test/stderr/0403 | 4 +-
test/stderr/0404 | 10 ++--
test/stderr/0408 | 4 +-
test/stderr/0414 | 2 +-
test/stderr/0419 | 2 +-
test/stderr/0426 | 8 +--
test/stderr/0432 | 4 +-
test/stderr/0433 | 24 ++++----
test/stderr/0435 | 2 +-
test/stderr/0437 | 22 +++----
test/stderr/0438 | 12 ++--
test/stderr/0450 | 16 +++---
test/stderr/0462 | 6 +-
test/stderr/0463 | 2 +-
test/stderr/0464 | 2 +-
test/stderr/0465 | 6 +-
test/stderr/0469 | 2 +-
test/stderr/0471 | 2 +-
test/stderr/0473 | 4 +-
test/stderr/0476 | 30 +++++-----
test/stderr/0479 | 2 +-
test/stderr/0483 | 2 +-
test/stderr/0484 | 2 +-
test/stderr/0487 | 4 +-
test/stderr/0489 | 16 +++---
test/stderr/0499 | 2 +-
test/stderr/0512 | 40 ++++++-------
test/stderr/0529 | 12 ++--
test/stderr/0543 | 18 +++---
test/stderr/0544 | 6 +-
test/stderr/0545 | 4 +-
test/stderr/0554 | 4 +-
test/stderr/0563 | 2 +-
test/stderr/0575 | 2 +-
test/stderr/0578 | 56 +++++++++---------
test/stderr/0609 | 20 +++----
test/stderr/1006 | 4 +-
test/stderr/1007 | 32 +++++------
test/stderr/2013 | 142 +++++++++++++++++++++++-----------------------
test/stderr/2035 | 6 +-
test/stderr/2113 | 142 +++++++++++++++++++++++-----------------------
test/stderr/2135 | 6 +-
test/stderr/2200 | 4 +-
test/stderr/2201 | 40 ++++++-------
test/stderr/2202 | 2 +-
test/stderr/2600 | 12 ++--
test/stderr/2610 | 8 +--
test/stderr/2620 | 10 ++--
test/stderr/3000 | 2 +-
test/stderr/3201 | 4 +-
test/stderr/3210 | 2 +-
test/stderr/3212 | 2 +-
test/stderr/3400 | 2 +-
test/stderr/4052 | 4 +-
test/stderr/4520 | 4 +-
test/stderr/4802 | 4 +-
test/stderr/4803 | 4 +-
test/stderr/5000 | 4 +-
test/stderr/5004 | 6 +-
test/stderr/5005 | 16 +++---
test/stderr/5006 | 4 +-
test/stderr/5008 | 8 +--
test/stderr/5204 | 18 +++---
test/stderr/5410 | 6 +-
test/stderr/5420 | 6 +-
test/stdout/0574 | 2 +-
140 files changed, 809 insertions(+), 801 deletions(-)
diff --git a/src/src/daemon.c b/src/src/daemon.c
index fa74ddb..1a747af 100644
--- a/src/src/daemon.c
+++ b/src/src/daemon.c
@@ -367,7 +367,7 @@ if (LOGGING(smtp_connection))
expansion above did a lookup. */
search_tidyup();
-pid = exim_fork(US"daemon accept");
+pid = exim_fork(US"daemon-accept");
/* Handle the child process */
@@ -418,7 +418,7 @@ if (pid == 0)
"please try again later.\r\n", FALSE);
mac_smtp_fflush();
search_tidyup();
- exim_underbar_exit(EXIT_FAILURE, US"conn-accept");
+ exim_underbar_exit(EXIT_FAILURE);
}
}
else if (*nah) smtp_active_hostname = nah;
@@ -505,7 +505,7 @@ if (pid == 0)
{
mac_smtp_fflush();
search_tidyup();
- exim_underbar_exit(EXIT_SUCCESS, US"conn-smtp");
+ exim_underbar_exit(EXIT_SUCCESS);
}
for (;;)
@@ -533,7 +533,7 @@ if (pid == 0)
cancel_cutthrough_connection(TRUE, US"receive dropped");
mac_smtp_fflush();
smtp_log_no_mail(); /* Log no mail if configured */
- exim_underbar_exit(EXIT_SUCCESS, US"conn-receive");
+ exim_underbar_exit(EXIT_SUCCESS);
}
if (message_id[0] == 0) continue; /* No message was accepted */
}
@@ -556,7 +556,7 @@ if (pid == 0)
/*XXX should we pause briefly, hoping that the client will be the
active TCP closer hence get the TCP_WAIT endpoint? */
DEBUG(D_receive) debug_printf("SMTP>>(close on process exit)\n");
- exim_underbar_exit(rc ? EXIT_FAILURE : EXIT_SUCCESS, US"conn-setup");
+ exim_underbar_exit(rc ? EXIT_FAILURE : EXIT_SUCCESS);
}
/* Show the recipients when debugging */
@@ -692,7 +692,7 @@ if (pid == 0)
(void) deliver_message(message_id, FALSE, FALSE);
search_tidyup();
- exim_underbar_exit(EXIT_SUCCESS, US"deliver_msg");
+ exim_underbar_exit(EXIT_SUCCESS);
}
if (dpid > 0)
@@ -954,7 +954,7 @@ else
DEBUG(D_any)
debug_printf("%s\n", string_open_failed(errno, "pid file %s",
pid_file_path));
-exim_exit(EXIT_SUCCESS, US"pid file remover");
+exim_exit(EXIT_SUCCESS);
}
@@ -994,7 +994,7 @@ if (f.running_in_test_harness || write_pid)
if (pid > 0)
child_close(pid, 1);
}
-exim_exit(EXIT_SUCCESS, US"daemon");
+exim_exit(EXIT_SUCCESS);
}
@@ -1200,6 +1200,8 @@ ip_address_item *addresses = NULL;
time_t last_connection_time = (time_t)0;
int local_queue_run_max = atoi(CS expand_string(queue_run_max));
+process_purpose = US"daemon";
+
/* If any debugging options are set, turn on the D_pid bit so that all
debugging lines get the pid added. */
@@ -2218,7 +2220,7 @@ for (;;)
else
#endif
queue_run(NULL, NULL, FALSE);
- exim_underbar_exit(EXIT_SUCCESS, US"queue-runner");
+ exim_underbar_exit(EXIT_SUCCESS);
}
if (pid < 0)
diff --git a/src/src/exim.c b/src/src/exim.c
index 1c0ea6b..7b1c8ea 100644
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -715,26 +715,26 @@ Returns: does not return
*/
void
-exim_exit(int rc, const uschar * process)
+exim_exit(int rc)
{
search_tidyup();
store_exit();
DEBUG(D_any)
- debug_printf(">>>>>>>>>>>>>>>> Exim pid=%d %s%s%sterminating with rc=%d "
- ">>>>>>>>>>>>>>>>\n", (int)getpid(),
- process ? "(" : "", process, process ? ") " : "", rc);
+ debug_printf(">>>>>>>>>>>>>>>> Exim pid=%d (%s) terminating with rc=%d "
+ ">>>>>>>>>>>>>>>>\n",
+ (int)getpid(), process_purpose, rc);
exit(rc);
}
void
-exim_underbar_exit(int rc, const uschar * process)
+exim_underbar_exit(int rc)
{
store_exit();
DEBUG(D_any)
- debug_printf(">>>>>>>>>>>>>>>> Exim pid=%d %s%s%sterminating with rc=%d "
- ">>>>>>>>>>>>>>>>\n", (int)getpid(),
- process ? "(" : "", process, process ? ") " : "", rc);
+ debug_printf(">>>>>>>>>>>>>>>> Exim pid=%d (%s) terminating with rc=%d "
+ ">>>>>>>>>>>>>>>>\n",
+ (int)getpid(), process_purpose, rc);
_exit(rc);
}
@@ -4441,7 +4441,7 @@ if (test_retry_arg >= 0)
if (test_retry_arg >= argc)
{
printf("-brt needs a domain or address argument\n");
- exim_exit(EXIT_FAILURE, US"main");
+ exim_exit(EXIT_FAILURE);
}
s1 = argv[test_retry_arg++];
s2 = NULL;
@@ -4546,7 +4546,7 @@ if (test_retry_arg >= 0)
printf("\n");
}
- exim_exit(EXIT_SUCCESS, US"main");
+ exim_exit(EXIT_SUCCESS);
}
/* Handle a request to list one or more configuration options */
@@ -4573,14 +4573,14 @@ if (list_options)
else
fail = !readconf_print(argv[i], NULL, flag_n);
}
- exim_exit(fail ? EXIT_FAILURE : EXIT_SUCCESS, US"main");
+ exim_exit(fail ? EXIT_FAILURE : EXIT_SUCCESS);
}
if (list_config)
{
set_process_info("listing config");
exim_exit(readconf_print(US"config", NULL, flag_n)
- ? EXIT_SUCCESS : EXIT_FAILURE, US"main");
+ ? EXIT_SUCCESS : EXIT_FAILURE);
}
@@ -4606,7 +4606,7 @@ if (msg_action_arg > 0 && msg_action != MSG_LOAD)
if (prod_requires_admin && !f.admin_user)
{
fprintf(stderr, "exim: Permission denied\n");
- exim_exit(EXIT_FAILURE, US"main");
+ exim_exit(EXIT_FAILURE);
}
set_process_info("delivering specified messages");
if (deliver_give_up) forced_delivery = f.deliver_force_thaw = TRUE;
@@ -4619,17 +4619,17 @@ if (msg_action_arg > 0 && msg_action != MSG_LOAD)
else if ((pid = exim_fork(US"cmdline-delivery")) == 0)
{
(void)deliver_message(argv[i], forced_delivery, deliver_give_up);
- exim_underbar_exit(EXIT_SUCCESS, US"cmdline-delivery");
+ exim_underbar_exit(EXIT_SUCCESS);
}
else if (pid < 0)
{
fprintf(stderr, "failed to fork delivery process for %s: %s\n", argv[i],
strerror(errno));
- exim_exit(EXIT_FAILURE, US"main");
+ exim_exit(EXIT_FAILURE);
}
else wait(&status);
}
- exim_exit(EXIT_SUCCESS, US"main");
+ exim_exit(EXIT_SUCCESS);
}
@@ -4648,7 +4648,7 @@ if (queue_interval == 0 && !f.daemon_listen)
else
set_process_info("running the queue (single queue run)");
queue_run(start_queue_run_id, stop_queue_run_id, FALSE);
- exim_exit(EXIT_SUCCESS, US"main");
+ exim_exit(EXIT_SUCCESS);
}
@@ -4818,10 +4818,10 @@ if (test_rewrite_arg >= 0)
if (test_rewrite_arg >= argc)
{
printf("-brw needs an address argument\n");
- exim_exit(EXIT_FAILURE, US"main");
+ exim_exit(EXIT_FAILURE);
}
rewrite_test(argv[test_rewrite_arg]);
- exim_exit(EXIT_SUCCESS, US"main");
+ exim_exit(EXIT_SUCCESS);
}
/* A locally-supplied message is considered to be coming from a local user
@@ -4936,7 +4936,7 @@ if (verify_address_mode || f.address_test_mode)
}
route_tidyup();
- exim_exit(exit_value, US"main");
+ exim_exit(exit_value);
}
/* Handle expansion checking. Either expand items on the command line, or read
@@ -5022,7 +5022,7 @@ if (expansion_test)
deliver_datafile = -1;
}
- exim_exit(EXIT_SUCCESS, US"main: expansion test");
+ exim_exit(EXIT_SUCCESS);
}
@@ -5116,7 +5116,7 @@ if (host_checking)
}
smtp_log_no_mail();
}
- exim_exit(EXIT_SUCCESS, US"main");
+ exim_exit(EXIT_SUCCESS);
}
@@ -5279,7 +5279,7 @@ if (smtp_input)
if (!smtp_start_session())
{
mac_smtp_fflush();
- exim_exit(EXIT_SUCCESS, US"smtp_start toplevel");
+ exim_exit(EXIT_SUCCESS);
}
}
@@ -5394,14 +5394,14 @@ while (more)
cancel_cutthrough_connection(TRUE, US"receive dropped");
if (more) goto moreloop;
smtp_log_no_mail(); /* Log no mail if configured */
- exim_exit(EXIT_FAILURE, US"receive toplevel");
+ exim_exit(EXIT_FAILURE);
}
}
else
{
cancel_cutthrough_connection(TRUE, US"message setup dropped");
smtp_log_no_mail(); /* Log no mail if configured */
- exim_exit(rc ? EXIT_FAILURE : EXIT_SUCCESS, US"msg setup toplevel");
+ exim_exit(rc ? EXIT_FAILURE : EXIT_SUCCESS);
}
}
@@ -5451,7 +5451,7 @@ while (more)
if (error_handling == ERRORS_STDERR)
{
fprintf(stderr, "exim: too many recipients\n");
- exim_exit(EXIT_FAILURE, US"main");
+ exim_exit(EXIT_FAILURE);
}
else
return
@@ -5485,7 +5485,7 @@ while (more)
{
fprintf(stderr, "exim: bad recipient address \"%s\": %s\n",
string_printing(list[i]), errmess);
- exim_exit(EXIT_FAILURE, US"main");
+ exim_exit(EXIT_FAILURE);
}
else
{
@@ -5557,7 +5557,7 @@ while (more)
for real; when reading the headers of a message for filter testing,
it is TRUE if the headers were terminated by '.' and FALSE otherwise. */
- if (message_id[0] == 0) exim_exit(EXIT_FAILURE, US"main");
+ if (message_id[0] == 0) exim_exit(EXIT_FAILURE);
} /* Non-SMTP message reception */
/* If this is a filter testing run, there are headers in store, but
@@ -5602,7 +5602,7 @@ while (more)
if (chdir("/")) /* Get away from wherever the user is running this from */
{
DEBUG(D_receive) debug_printf("chdir(\"/\") failed\n");
- exim_exit(EXIT_FAILURE, US"main");
+ exim_exit(EXIT_FAILURE);
}
/* Now we run either a system filter test, or a user filter test, or both.
@@ -5612,15 +5612,15 @@ while (more)
if ((filter_test & FTEST_SYSTEM) != 0)
if (!filter_runtest(filter_sfd, filter_test_sfile, TRUE, more))
- exim_exit(EXIT_FAILURE, US"main");
+ exim_exit(EXIT_FAILURE);
memcpy(filter_sn, filter_n, sizeof(filter_sn));
if ((filter_test & FTEST_USER) != 0)
if (!filter_runtest(filter_ufd, filter_test_ufile, FALSE, more))
- exim_exit(EXIT_FAILURE, US"main");
+ exim_exit(EXIT_FAILURE);
- exim_exit(EXIT_SUCCESS, US"main");
+ exim_exit(EXIT_SUCCESS);
}
/* Else act on the result of message reception. We should not get here unless
@@ -5722,7 +5722,7 @@ while (more)
rc = deliver_message(message_id, FALSE, FALSE);
search_tidyup();
exim_underbar_exit(!mua_wrapper || rc == DELIVER_MUA_SUCCEEDED
- ? EXIT_SUCCESS : EXIT_FAILURE, US"cmdline-delivery");
+ ? EXIT_SUCCESS : EXIT_FAILURE);
}
if (pid < 0)
@@ -5746,7 +5746,7 @@ while (more)
log_write(0, LOG_MAIN|LOG_PANIC,
"process %d crashed with signal %d while delivering %s",
(int)pid, status & 0x00ff, message_id);
- if (mua_wrapper && (status & 0xffff) != 0) exim_exit(EXIT_FAILURE, US"main");
+ if (mua_wrapper && (status & 0xffff) != 0) exim_exit(EXIT_FAILURE);
}
}
}
@@ -5778,7 +5778,7 @@ moreloop:
store_reset(reset_point);
}
-exim_exit(EXIT_SUCCESS, US"main"); /* Never returns */
+exim_exit(EXIT_SUCCESS); /* Never returns */
return 0; /* To stop compiler warning */
}
diff --git a/src/src/functions.h b/src/src/functions.h
index 9e5bba9..b8bf2a4 100644
--- a/src/src/functions.h
+++ b/src/src/functions.h
@@ -228,10 +228,10 @@ extern void msg_event_raise(const uschar *, const address_item *);
extern int exim_chown_failure(int, const uschar*, uid_t, gid_t);
extern const uschar * exim_errstr(int);
-extern void exim_exit(int, const uschar *) NORETURN;
+extern void exim_exit(int) NORETURN;
extern void exim_nullstd(void);
extern void exim_setugid(uid_t, gid_t, BOOL, uschar *);
-extern void exim_underbar_exit(int, const uschar *);
+extern void exim_underbar_exit(int) NORETURN;
extern void exim_wait_tick(struct timeval *, int);
extern int exp_bool(address_item *addr,
uschar *mtype, uschar *mname, unsigned dgb_opt, uschar *oname, BOOL bvalue,
diff --git a/src/src/log.c b/src/src/log.c
index 2dd85c4..d9cf23a 100644
--- a/src/src/log.c
+++ b/src/src/log.c
@@ -242,7 +242,7 @@ if (s1)
}
if (f.receive_call_bombout) receive_bomb_out(NULL, s2); /* does not return */
if (smtp_input) smtp_closedown(s2);
-exim_exit(EXIT_FAILURE, NULL);
+exim_exit(EXIT_FAILURE);
}
@@ -767,7 +767,7 @@ if (!log_buffer)
if (!(log_buffer = US malloc(LOG_BUFFER_SIZE)))
{
fprintf(stderr, "exim: failed to get store for log buffer\n");
- exim_exit(EXIT_FAILURE, NULL);
+ exim_exit(EXIT_FAILURE);
}
/* If we haven't already done so, inspect the setting of log_file_path to
@@ -983,7 +983,7 @@ if (!f.really_exim || f.log_testing_mode)
else
fprintf(log_stderr, "%s", CS log_buffer);
- if ((flags & LOG_PANIC_DIE) == LOG_PANIC_DIE) exim_exit(EXIT_FAILURE, US"");
+ if ((flags & LOG_PANIC_DIE) == LOG_PANIC_DIE) exim_exit(EXIT_FAILURE);
return;
}
diff --git a/src/src/moan.c b/src/src/moan.c
index 51f5da5..48d4f90 100644
--- a/src/src/moan.c
+++ b/src/src/moan.c
@@ -692,7 +692,7 @@ fprintf(stderr, "%d previous message%s successfully processed.\n",
fprintf(stderr, "The rest of the batch was abandoned.\n");
-exim_exit(yield, US"batch");
+exim_exit(yield);
}
diff --git a/src/src/queue.c b/src/src/queue.c
index 9dbf3e7..3235a41 100644
--- a/src/src/queue.c
+++ b/src/src/queue.c
@@ -649,12 +649,13 @@ for (int i = queue_run_in_order ? -1 : 0;
#endif
single_item_retry:
- if ((pid = exim_fork(US"qrun delivery")) == 0)
+ if ((pid = exim_fork(US"qrun-delivery")) == 0)
{
int rc;
(void)close(pfd[pipe_read]);
rc = deliver_message(fq->text, force_delivery, FALSE);
- exim_underbar_exit(rc == DELIVER_NOT_ATTEMPTED, US"qrun-delivery");
+ exim_underbar_exit(rc == DELIVER_NOT_ATTEMPTED
+ ? EXIT_FAILURE : EXIT_SUCCESS);
}
if (pid < 0)
log_write(0, LOG_MAIN|LOG_PANIC_DIE, "fork of delivery process from "
@@ -706,7 +707,7 @@ single_item_retry:
/* If initial of a 2-phase run, we are a child - so just exit */
if (f.queue_2stage && !queue_run_in_order)
- exim_exit(EXIT_SUCCESS, US"2-phase child");
+ exim_exit(EXIT_SUCCESS);
/* If we are in the test harness, and this is not the first of a 2-stage
queue run, update fudged queue times. */
@@ -723,7 +724,7 @@ single_item_retry:
go_around:
/* If initial of a 2-phase run, we are a child - so just exit */
if (f.queue_2stage && !queue_run_in_order)
- exim_exit(EXIT_SUCCESS, US"2-phase child");
+ exim_exit(EXIT_SUCCESS);
} /* End loop for list of messages */
tree_nonrecipients = NULL;
diff --git a/src/src/rda.c b/src/src/rda.c
index 498a061..0dc8591 100644
--- a/src/src/rda.c
+++ b/src/src/rda.c
@@ -768,7 +768,7 @@ if ((pid = exim_fork(US"router-interpret")) == 0)
out:
(void)close(fd);
search_tidyup();
- exim_underbar_exit(0, US"rda");
+ exim_underbar_exit(EXIT_SUCCESS);
bad:
DEBUG(D_rewrite) debug_printf("rda_interpret: failed write to pipe\n");
diff --git a/src/src/readconf.c b/src/src/readconf.c
index a506d9f..1243e90 100644
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -3283,7 +3283,7 @@ while ((s = get_config_line()))
if (isupper(*s))
{
- if (!macro_read_assignment(s)) exim_exit(EXIT_FAILURE, US"");
+ if (!macro_read_assignment(s)) exim_exit(EXIT_FAILURE);
continue;
}
@@ -3719,7 +3719,7 @@ while ((buffer = get_config_line()))
(d->info->init)(d);
d = NULL;
}
- if (!macro_read_assignment(buffer)) exim_exit(EXIT_FAILURE, US"");
+ if (!macro_read_assignment(buffer)) exim_exit(EXIT_FAILURE);
continue;
}
@@ -4232,7 +4232,7 @@ while(acl_line)
p = readconf_readname(name, sizeof(name), acl_line);
if (isupper(*name) && *p == '=')
{
- if (!macro_read_assignment(acl_line)) exim_exit(EXIT_FAILURE, US"");
+ if (!macro_read_assignment(acl_line)) exim_exit(EXIT_FAILURE);
acl_line = get_config_line();
continue;
}
diff --git a/src/src/receive.c b/src/src/receive.c
index 5e8b6fb..398250e 100644
--- a/src/src/receive.c
+++ b/src/src/receive.c
@@ -216,7 +216,7 @@ if (STATVFS(CS path, &statbuf) != 0)
log_write(0, LOG_MAIN|LOG_PANIC, "cannot accept message: failed to stat "
"%s directory %s: %s", name, path, strerror(errno));
smtp_closedown(US"spool or log directory problem");
- exim_exit(EXIT_FAILURE, NULL);
+ exim_exit(EXIT_FAILURE);
}
*inodeptr = (statbuf.F_FILES > 0)? statbuf.F_FAVAIL : -1;
@@ -372,7 +372,7 @@ if (!already_bombing_out)
/* Exit from the program (non-BSMTP cases) */
-exim_exit(EXIT_FAILURE, NULL);
+exim_exit(EXIT_FAILURE);
}
@@ -1172,7 +1172,7 @@ if (error_handling == ERRORS_SENDER)
else
fprintf(stderr, "exim: %s%s\n", text2, text1); /* Sic */
(void)fclose(f);
-exim_exit(error_rc, US"");
+exim_exit(error_rc);
}
@@ -3340,7 +3340,7 @@ if (extract_recip && (bad_addresses || recipients_count == 0))
{
Uunlink(spool_name);
(void)fclose(spool_data_file);
- exim_exit(error_rc, US"receiving");
+ exim_exit(error_rc);
}
}
diff --git a/src/src/route.c b/src/src/route.c
index 6226b06..c7833eb 100644
--- a/src/src/route.c
+++ b/src/src/route.c
@@ -759,9 +759,9 @@ while ((check = string_nextinlist(&listptr, &sep, buffer, sizeof(buffer))))
exim_setugid(uid, gid, TRUE,
string_sprintf("require_files check, file=%s", ss));
if (route_check_access(ss, uid, gid, 4))
- exim_underbar_exit(0, US"route-check-access");
+ exim_underbar_exit(EXIT_SUCCESS);
DEBUG(D_route) debug_printf("route_check_access() failed\n");
- exim_underbar_exit(1, US"route-check-access");
+ exim_underbar_exit(EXIT_FAILURE);
}
/* In the parent, wait for the child to finish */
diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index 268fd69..9055020 100644
--- a/src/src/smtp_in.c
+++ b/src/src/smtp_in.c
@@ -457,7 +457,7 @@ if (smtp_batched_input)
smtp_notquit_exit(US"command-timeout", US"421",
US"%s: SMTP command timeout - closing connection",
smtp_active_hostname);
-exim_exit(EXIT_FAILURE, US"receiving");
+exim_exit(EXIT_FAILURE);
}
void
@@ -468,7 +468,7 @@ if (smtp_batched_input)
moan_smtp_batch(NULL, "421 SIGTERM received"); /* Does not return */
smtp_notquit_exit(US"signal-exit", US"421",
US"%s: Service not available - closing connection", smtp_active_hostname);
-exim_exit(EXIT_FAILURE, US"receiving");
+exim_exit(EXIT_FAILURE);
}
void
@@ -931,7 +931,7 @@ if (!yield)
{
log_write(0, LOG_MAIN|LOG_PANIC, "string too large in smtp_printf()");
smtp_closedown(US"Unexpected error");
- exim_exit(EXIT_FAILURE, NULL);
+ exim_exit(EXIT_FAILURE);
}
/* If this is the first output for a (non-batch) RCPT command, see if all RCPTs
@@ -5800,7 +5800,7 @@ while (done <= 0)
}
enq_end(etrn_serialize_key);
- exim_underbar_exit(EXIT_SUCCESS, US"etrn-serialize-interproc");
+ exim_underbar_exit(EXIT_SUCCESS);
}
/* Back in the top level SMTP process. Check that we started a subprocess
diff --git a/src/src/tls.c b/src/src/tls.c
index 9732da5..1362032 100644
--- a/src/src/tls.c
+++ b/src/src/tls.c
@@ -455,7 +455,7 @@ if (pid == 0)
log_write(0, LOG_PANIC_DIE|LOG_CONFIG,
"tls_require_ciphers invalid: %s", errmsg);
fflush(NULL);
- exim_underbar_exit(0, NULL);
+ exim_underbar_exit(EXIT_SUCCESS);
}
do {
diff --git a/src/src/transport.c b/src/src/transport.c
index d2cb8c2..aca7c7f 100644
--- a/src/src/transport.c
+++ b/src/src/transport.c
@@ -1274,7 +1274,7 @@ if ((write_pid = exim_fork(US"tpt-filter-writer")) == 0)
!= sizeof(struct timeval)
)
rc = FALSE; /* compiler quietening */
- exim_underbar_exit(0, US"tpt-filter writer");
+ exim_underbar_exit(EXIT_SUCCESS);
}
save_errno = errno;
diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index 0bec253..fc5bb78 100644
--- a/src/src/transports/smtp.c
+++ b/src/src/transports/smtp.c
@@ -3361,7 +3361,7 @@ for (int fd_bits = 3; fd_bits; )
done:
testharness_pause_ms(100); /* let logging complete */
- exim_exit(0, US"TLS proxy");
+ exim_exit(EXIT_SUCCESS);
}
#endif
diff --git a/test/stderr/0002 b/test/stderr/0002
index 1d0ac43..f226142 100644
--- a/test/stderr/0002
+++ b/test/stderr/0002
@@ -85,7 +85,7 @@ LOG: MAIN PANIC
╰─────result: no
├──expanding: match_address: ${if match_address{a.b.c}{a.b.c}{yes}{no}}
╰─────result: match_address: no
->>>>>>>>>>>>>>>> Exim pid=pppp (main: expansion test) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
@@ -169,7 +169,7 @@ LOG: MAIN PANIC
\_____result: no
|--expanding: match_address: ${if match_address{a.b.c}{a.b.c}{yes}{no}}
\_____result: match_address: no
->>>>>>>>>>>>>>>> Exim pid=pppp (main: expansion test) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
@@ -203,7 +203,7 @@ dropping to exim gid; retaining priv uid
╭considering: -oMt sender_ident = $sender_ident
├──expanding: -oMt sender_ident = $sender_ident
╰─────result: -oMt sender_ident = me
->>>>>>>>>>>>>>>> Exim pid=pppp (main: expansion test) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
1999-03-02 09:44:33 no host name found for IP address V4NET.11.12.13
Exim version x.yz ....
configuration file is TESTSUITE/test-config
@@ -276,7 +276,7 @@ sender_rcvhost = ten-1.test.ex ([V4NET.0.0.1] ident=me)
╭considering: -oMt sender_ident = $sender_ident
├──expanding: -oMt sender_ident = $sender_ident
╰─────result: -oMt sender_ident = me
->>>>>>>>>>>>>>>> Exim pid=pppp (main: expansion test) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
@@ -344,7 +344,7 @@ SMTP>> 550 Administrative prohibition
LOG: connection_reject MAIN REJECT
H=ten-1.test.ex [V4NET.0.0.1] rejected connection in "connect" ACL
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
@@ -388,7 +388,7 @@ SMTP>> 550 Administrative prohibition
LOG: connection_reject MAIN REJECT
H=[V4NET.0.0.2] rejected connection in "connect" ACL
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -540,4 +540,4 @@ sender address = CALLER@???
1.2.3.4 in "1.2.3"? no (malformed IPv4 address or address mask)
1.2.3.4 in "1.2.3.4/abc"? no (malformed IPv4 address or address mask)
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main: expansion test) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0021 b/test/stderr/0021
index f789bba..96bf58e 100644
--- a/test/stderr/0021
+++ b/test/stderr/0021
@@ -103,7 +103,7 @@ accept: condition test succeeded in ACL "rcpt"
end of ACL "rcpt": ACCEPT
LOG: smtp_connection MAIN
SMTP connection from CALLER closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
1999-03-02 09:44:33 ACL "warn" with "message" setting found in a non-message (EHLO or HELO) ACL: cannot specify header lines here: message ignored
Exim version x.yz ....
configuration file is TESTSUITE/test-config
@@ -202,10 +202,10 @@ LOG: MAIN
=> x <x@y> R=accept T=appendfile
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: smtp_connection MAIN
SMTP connection from CALLER closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
1999-03-02 09:44:33 ACL "warn" with "message" setting found in a non-message (EHLO or HELO) ACL: cannot specify header lines here: message ignored
1999-03-02 09:44:33 rcpt accepted C=EHLO,MAIL,RCPT
1999-03-02 09:44:33 10HmaX-0005vi-00 10HmaX-0005vi-00 no recipients found in headers
diff --git a/test/stderr/0022 b/test/stderr/0022
index 0a83733..902fa4c 100644
--- a/test/stderr/0022
+++ b/test/stderr/0022
@@ -62,7 +62,7 @@ SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from [V4NET.9.8.7] closed by QUIT
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
@@ -130,7 +130,7 @@ SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from [V4NET.9.8.7] closed by QUIT
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
@@ -199,7 +199,7 @@ SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from [V4NET.9.8.7] closed by QUIT
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
>>> host in hosts_connection_nolog? no (end of list)
LOG: SMTP connection from [V4NET.9.8.7]
>>> host in host_lookup? no (option unset)
diff --git a/test/stderr/0037 b/test/stderr/0037
index 799344c..127db67 100644
--- a/test/stderr/0037
+++ b/test/stderr/0037
@@ -50,7 +50,7 @@ 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 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (router-interpret) terminating with rc=0 >>>>>>>>>>>>>>>>
local-accept-delivery forked for router-interpret: npppp
rda_interpret: subprocess yield=0 error=NULL
userfilter router generated userx@???
@@ -115,5 +115,5 @@ LOG: MAIN
=> userx <filter-userx@???> R=user_accept2 T=appendfile
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0044 b/test/stderr/0044
index 483c822..275ba99 100644
--- a/test/stderr/0044
+++ b/test/stderr/0044
@@ -149,7 +149,7 @@ SMTP>> 221 the.local.host.name closing connection
LOG: smtp_connection MAIN
SMTP connection from (exim.test.ex) [V4NET.11.12.13] closed by QUIT
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
@@ -284,4 +284,4 @@ SMTP>> 421 the.local.host.name lost input connection
LOG: lost_incoming_connection MAIN
unexpected disconnection while reading SMTP command from (exim.test.ex) [V4NET.99.99.99] D=qqs
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0078 b/test/stderr/0078
index 06dd2bd..fafb81e 100644
--- a/test/stderr/0078
+++ b/test/stderr/0078
@@ -40,7 +40,7 @@ routed by lookuphost router
envelope to: xx@???
transport: remote_smtp
host ten-1.test.ex [V4NET.0.0.1] MX=5 dnssec=no
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
@@ -91,7 +91,7 @@ routed by self router
envelope to: myhost.test.ex@???
transport: remote_smtp
host myhost.test.ex [V4NET.10.10.10]
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
@@ -162,7 +162,7 @@ routed by self2 router
envelope to: xx@???
transport: remote_smtp
host myhost.test.ex [V4NET.10.10.10]
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
@@ -181,4 +181,4 @@ fresh-exec forked for fakens-search: npppp
lookuphost router declined for xx@???
"more" is false: skipping remaining routers
no more routers
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=2 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0084 b/test/stderr/0084
index 8e4d16e..401a870 100644
--- a/test/stderr/0084
+++ b/test/stderr/0084
@@ -64,4 +64,4 @@ domain = myhost.test.ex
routed by smart router
envelope to: no@???
transport: <none>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0085 b/test/stderr/0085
index 001ee06..94a16b9 100644
--- a/test/stderr/0085
+++ b/test/stderr/0085
@@ -196,7 +196,7 @@ myhost.test.ex in "test.ex"? no (end of list)
smart2 router skipped: domains mismatch
no more routers
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=2 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
@@ -367,4 +367,4 @@ myhost.test.ex in "test.ex"? no (end of list)
smart2 router skipped: domains mismatch
no more routers
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=2 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0092 b/test/stderr/0092
index e07e849..690034a 100644
--- a/test/stderr/0092
+++ b/test/stderr/0092
@@ -109,7 +109,7 @@ LOG: lost_incoming_connection MAIN
SMTP data timeout (message abandoned) on connection from [V4NET.0.0.1] F=<userx@???>
SMTP>> 421 myhost.test.ex SMTP incoming data timeout - closing connection.
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp NULLterminating with rc=1 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>>
exim: timed out while reading - message abandoned
exim: timed out while reading - message abandoned
>>> host in hosts_connection_nolog? no (option unset)
diff --git a/test/stderr/0094 b/test/stderr/0094
index d8b1955..355c68b 100644
--- a/test/stderr/0094
+++ b/test/stderr/0094
@@ -168,4 +168,4 @@ SMTP>> 221 the.local.host.name closing connection
LOG: smtp_connection MAIN
SMTP connection from oneback.test.ex [V4NET.99.99.90] closed by QUIT
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0117 b/test/stderr/0117
index 5421be3..6b40b82 100644
--- a/test/stderr/0117
+++ b/test/stderr/0117
@@ -39,7 +39,7 @@ routed by lookuphost router
host ten-1.test.ex [V4NET.0.0.1] MX=5 dnssec=no
host ten-2.test.ex [V4NET.0.0.2] MX=6 dnssec=no
host ten-3.test.ex [V4NET.0.0.3] MX=7 dnssec=no
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
@@ -81,7 +81,7 @@ routed by lookuphost router
host ten-1.test.ex [V4NET.0.0.1] MX=5 dnssec=no
host ten-2.test.ex [V4NET.0.0.2] MX=6 dnssec=no
host ten-3.test.ex [V4NET.0.0.3] MX=7 dnssec=no
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
@@ -123,4 +123,4 @@ routed by lookuphost router
host ten-1.test.ex [V4NET.0.0.1] MX=5 dnssec=no
host ten-2.test.ex [V4NET.0.0.2] MX=6 dnssec=no
host ten-3.test.ex [V4NET.0.0.3] MX=7 dnssec=no
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0123 b/test/stderr/0123
index 93894e4..e6cdeea 100644
--- a/test/stderr/0123
+++ b/test/stderr/0123
@@ -432,4 +432,4 @@ parse_forward_list:
c3 router declined for z@???
no more routers
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=2 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0143 b/test/stderr/0143
index d7bcb92..15f53cc 100644
--- a/test/stderr/0143
+++ b/test/stderr/0143
@@ -62,5 +62,5 @@ LOG: MAIN
=> userx@??? R=my_main_router T=my_smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0149 b/test/stderr/0149
index 903b3b7..ded70e5 100644
--- a/test/stderr/0149
+++ b/test/stderr/0149
@@ -184,4 +184,4 @@ routed by domainlist2 router
transport: <none>
host V4NET.0.0.6 [V4NET.0.0.6]
host V4NET.0.0.7 [V4NET.0.0.7]
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0161 b/test/stderr/0161
index e7a79d0..b3eb4ea 100644
--- a/test/stderr/0161
+++ b/test/stderr/0161
@@ -45,7 +45,7 @@ routed by lookuphost router
envelope to: xx@???
transport: remote_smtp
host ten-1.test.ex [V4NET.0.0.1] MX=5 dnssec=no
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
@@ -106,7 +106,7 @@ routed by self router
envelope to: myhost.test.ex@???
transport: remote_smtp
host myhost.test.ex [V4NET.10.10.10]
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
@@ -187,7 +187,7 @@ routed by self2 router
envelope to: xx@???
transport: remote_smtp
host myhost.test.ex [V4NET.10.10.10]
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
@@ -211,7 +211,7 @@ fresh-exec forked for fakens-search: npppp
lookuphost router declined for xx@???
"more" is false: skipping remaining routers
no more routers
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=2 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
@@ -236,7 +236,7 @@ postfork: fakens-search
fresh-exec forked for fakens-search: npppp
lowest numbered MX record points to local host: mxt1.test.ex: address failed (self = fail)
failuphost router forced address failure
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=2 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
@@ -286,4 +286,4 @@ fresh-exec forking for fakens-search
postfork: fakens-search
fresh-exec forked for fakens-search: npppp
fail router forced address failure
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=2 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0169 b/test/stderr/0169
index 8bc3f18..f64cb79 100644
--- a/test/stderr/0169
+++ b/test/stderr/0169
@@ -42,5 +42,5 @@ LOG: MAIN
=> userx <userx@???> R=localuser T=appendfile
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0183 b/test/stderr/0183
index 6894262..6e18963 100644
--- a/test/stderr/0183
+++ b/test/stderr/0183
@@ -222,7 +222,7 @@ routed by lookuphost router
transport: smtp
host ten-1.test.ex [V4NET.0.0.1]
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=1 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>>
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
@@ -445,7 +445,7 @@ routed by lookuphost router
transport: smtp
host ten-1.test.ex [V4NET.0.0.1]
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=1 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>>
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
@@ -672,7 +672,7 @@ routed by lookuphost router
transport: smtp
host ten-1.test.ex [V4NET.0.0.1]
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=2 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
@@ -749,7 +749,7 @@ returning DNS_FAIL
srv router: defer for srv@???
message: host lookup did not complete
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=1 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>>
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
@@ -842,4 +842,4 @@ delay router declined for userd@???
"more" is false: skipping remaining routers
no more routers
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=2 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0218 b/test/stderr/0218
index 3171503..a2ae61e 100644
--- a/test/stderr/0218
+++ b/test/stderr/0218
@@ -7,33 +7,33 @@ LOG: queue_run MAIN
Start queue run: pid=pppp -qq
queue running combined directories
looking in TESTSUITE/spool//input
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
delivering 10HmaX-0005vi-00 (queue run pid ppppp)
R: client (ACL)
-qrun delivery forking for transport
+qrun-delivery forking for transport
postfork: transport
T: send_to_server (ACL)
-fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for transport: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
delivering 10HmaY-0005vi-00 (queue run pid ppppp)
R: client (ACL)
-qrun delivery forking for transport
+qrun-delivery forking for transport
postfork: transport
T: send_to_server (ACL)
-fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for transport: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
queue running combined directories
looking in TESTSUITE/spool//input
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
delivering 10HmaX-0005vi-00 (queue run pid ppppp)
R: client (ACL)
-qrun delivery forking for transport
+qrun-delivery forking for transport
postfork: transport
T: send_to_server (ACL)
Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
@@ -53,8 +53,8 @@ transport forking for continued-transport-interproc
postfork: continued-transport-interproc
continued-transport-interproc forking for continued-transport
postfork: continued-transport
-fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for transport: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for transport: npppp
transport forked for continued-transport-interproc: npppp
continued-transport-interproc forked for continued-transport: npppp
SMTP(close)>>
@@ -88,10 +88,10 @@ LOG: MAIN
=> b@??? F=<CALLER@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 OK"
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: queue_run MAIN
End queue run: pid=pppp -qq
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
@@ -101,33 +101,33 @@ LOG: queue_run MAIN
Start queue run: pid=pppp -qq
queue running combined directories
looking in TESTSUITE/spool//input
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
delivering 10HmaZ-0005vi-00 (queue run pid ppppp)
R: client (ACL)
-qrun delivery forking for transport
+qrun-delivery forking for transport
postfork: transport
T: send_to_server (ACL)
-fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for transport: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
delivering 10HmbA-0005vi-00 (queue run pid ppppp)
R: client (ACL)
-qrun delivery forking for transport
+qrun-delivery forking for transport
postfork: transport
T: send_to_server (ACL)
-fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for transport: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
queue running combined directories
looking in TESTSUITE/spool//input
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
delivering 10HmaZ-0005vi-00 (queue run pid ppppp)
R: client (ACL)
-qrun delivery forking for transport
+qrun-delivery forking for transport
postfork: transport
T: send_to_server (ACL)
Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
@@ -143,59 +143,59 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 503 Unexpected DATA
SMTP>> QUIT
SMTP(close)>>
-fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for transport: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for transport: npppp
LOG: MAIN
** a@??? F=<CALLER@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined MAIL FROM:<CALLER@???>: 550 NO
-qrun delivery forking for bounce-message
+qrun-delivery forking for bounce-message
postfork: bounce-message
-qrun delivery forked for bounce-message: npppp
+qrun-delivery forked for bounce-message: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
LOG: MAIN
<= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
Completed
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
delivering 10HmbA-0005vi-00 (queue run pid ppppp)
R: client (ACL)
-qrun delivery forking for transport
+qrun-delivery forking for transport
postfork: transport
T: send_to_server (ACL)
Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused
LOG: MAIN
H=127.0.0.1 [127.0.0.1] Connection refused
-fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for transport: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for transport: npppp
LOG: MAIN
== b@??? R=client T=send_to_server defer (dd): Connection refused
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: queue_run MAIN
End queue run: pid=pppp -qq
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp -qqf
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
delivering 10HmbA-0005vi-00 (queue run pid ppppp)
R: client (ACL)
-qrun delivery forking for transport
+qrun-delivery forking for transport
postfork: transport
T: send_to_server (ACL)
-fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for transport: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
delivering 10HmbB-0005vi-00 (queue run pid ppppp)
R: bounce (ACL)
LOG: MAIN
@@ -205,22 +205,22 @@ LOG: MAIN
LOG: MAIN
Completed
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forked for qrun delivery: npppp
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
+fresh-exec forked for qrun-delivery: npppp
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
delivering 10HmbC-0005vi-00 (queue run pid ppppp)
R: client (ACL)
-qrun delivery forking for transport
+qrun-delivery forking for transport
postfork: transport
T: send_to_server (ACL)
-fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for transport: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
delivering 10HmbA-0005vi-00 (queue run pid ppppp)
R: client (ACL)
-qrun delivery forking for transport
+qrun-delivery forking for transport
postfork: transport
T: send_to_server (ACL)
Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
@@ -240,23 +240,23 @@ transport forking for continued-transport-interproc
postfork: continued-transport-interproc
continued-transport-interproc forking for continued-transport
postfork: continued-transport
-fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for transport: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for transport: npppp
transport forked for continued-transport-interproc: npppp
continued-transport-interproc forked for continued-transport: npppp
SMTP(close)>>
LOG: MAIN
** b@??? F=<CALLER@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<b@???>: 550 Unknown
-qrun delivery forking for bounce-message
+qrun-delivery forking for bounce-message
postfork: bounce-message
-qrun delivery forked for bounce-message: npppp
+qrun-delivery forked for bounce-message: npppp
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
LOG: MAIN
<= <> R=10HmbA-0005vi-00 U=EXIMUSER P=local S=sss
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
Completed
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -285,7 +285,7 @@ LOG: MAIN
=> c@??? F=<CALLER@???> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 OK"
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: queue_run MAIN
End queue run: pid=pppp -qqf
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0249 b/test/stderr/0249
index e57ef27..c130aa0 100644
--- a/test/stderr/0249
+++ b/test/stderr/0249
@@ -17,4 +17,4 @@ LOG: address_rewrite MAIN
"User@???" from env-from rewritten as "User@???" by rule 2
LOG: address_rewrite MAIN
"User@???" from env-to rewritten as "User@???" by rule 2
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0264 b/test/stderr/0264
index a87af81..055b67a 100644
--- a/test/stderr/0264
+++ b/test/stderr/0264
@@ -104,5 +104,5 @@ DSN: Flags: 0x0
DSN: **** SPOOL_OUT - address: <rz.b@outside> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
Renaming spool header file: TESTSUITE/spool//input//10HmbJ-0005vi-00-H
end delivery of 10HmbJ-0005vi-00
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0275 b/test/stderr/0275
index f5a9d15..52536e3 100644
--- a/test/stderr/0275
+++ b/test/stderr/0275
@@ -97,7 +97,7 @@ routed by r3 router
envelope to: userx@???
transport: t1
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
@@ -333,9 +333,9 @@ LOG: MAIN
end delivery of 10HmaX-0005vi-00
search_tidyup called
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
@@ -403,4 +403,4 @@ SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from (test) [127.0.0.1] closed by QUIT
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0277 b/test/stderr/0277
index 187d492..7132101 100644
--- a/test/stderr/0277
+++ b/test/stderr/0277
@@ -42,7 +42,7 @@ SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from [V4NET.2.3.4] closed by QUIT
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
@@ -77,7 +77,7 @@ SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from [V4NET.6.7.8] closed by QUIT
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
@@ -125,7 +125,7 @@ SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from [V4NET.10.11.12] closed by QUIT
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
@@ -173,7 +173,7 @@ SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from [V4NET.1.1.1] closed by QUIT
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
@@ -220,4 +220,4 @@ SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from [V4NET.2.2.2] closed by QUIT
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0278 b/test/stderr/0278
index 6d6cd94..bea5f64 100644
--- a/test/stderr/0278
+++ b/test/stderr/0278
@@ -56,7 +56,7 @@ routed by r3 router
envelope to: CALLER@???
transport: t1
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
@@ -247,9 +247,9 @@ LOG: MAIN
end delivery of 10HmaX-0005vi-00
search_tidyup called
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
@@ -344,4 +344,4 @@ unknown in "+local_localparts : +expanded : +unexpanded"? no (end of list)
r5 router skipped: local_parts mismatch
no more routers
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=2 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0279 b/test/stderr/0279
index 2052244..4be33ea 100644
--- a/test/stderr/0279
+++ b/test/stderr/0279
@@ -70,7 +70,7 @@ routed by r3 router
envelope to: CALLER@???
transport: t1
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
@@ -106,4 +106,4 @@ parse_forward_list: :fail: matched *@+funny_domains
extract item: :fail: matched *@+funny_domains
rr1 router forced address failure
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=2 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0283 b/test/stderr/0283
index 13cc31b..9b70f1d 100644
--- a/test/stderr/0283
+++ b/test/stderr/0283
@@ -92,12 +92,12 @@ changed uid/gid: post-delivery tidying
uid=EXIM_UID gid=EXIM_GID pid=pppp
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
@@ -138,5 +138,5 @@ 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
uid=EXIM_UID gid=EXIM_GID pid=pppp
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0293 b/test/stderr/0293
index 03af0c8..a89c4b8 100644
--- a/test/stderr/0293
+++ b/test/stderr/0293
@@ -2,6 +2,11 @@ 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/0294 b/test/stderr/0294
index 55f7474..47aec2f 100644
--- a/test/stderr/0294
+++ b/test/stderr/0294
@@ -94,7 +94,7 @@ SMTP<< quit
SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from CALLER closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -142,7 +142,7 @@ SMTP<< quit
SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from [1.2.3.4] closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -191,7 +191,7 @@ SMTP<< quit
SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from [V4NET.9.8.7] closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -252,4 +252,4 @@ SMTP<< quit
SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from CALLER closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0297 b/test/stderr/0297
index f1a0a2e..42db67a 100644
--- a/test/stderr/0297
+++ b/test/stderr/0297
@@ -21,7 +21,7 @@ r1 router generated /a/b/c
routed by r1 router
envelope to: /a/b/c@???
transport: <none>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -45,7 +45,7 @@ r1 router generated /x/y/z
routed by r1 router
envelope to: /x/y/z@???
transport: <none>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
<= fil@ter U=CALLER P=local S=sss
delivering 10HmaX-0005vi-00
diff --git a/test/stderr/0303 b/test/stderr/0303
index 3ed99b6..ad3342b 100644
--- a/test/stderr/0303
+++ b/test/stderr/0303
@@ -110,7 +110,7 @@ SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from ([V4NET.2.3.4]) [V4NET.2.3.4] closed by QUIT
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
@@ -184,4 +184,4 @@ SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from host.name.tld [V4NET.2.3.4] closed by QUIT
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0315 b/test/stderr/0315
index ac9ce9a..f3bad37 100644
--- a/test/stderr/0315
+++ b/test/stderr/0315
@@ -70,8 +70,8 @@ LOG: MAIN
*> y@??? R=r1 T=t1 H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option"
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
@@ -165,5 +165,5 @@ LOG: MAIN
*> y@??? R=r2 T=t1 H=ten-2.test.ex [V4NET.0.0.2] C="delivery bypassed by -N option"
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0317 b/test/stderr/0317
index f509475..71d883d 100644
--- a/test/stderr/0317
+++ b/test/stderr/0317
@@ -31,7 +31,7 @@ Size of headers = sss
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
@@ -70,4 +70,4 @@ Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H
Size of headers = sss
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0332 b/test/stderr/0332
index 0dbc129..388a29d 100644
--- a/test/stderr/0332
+++ b/test/stderr/0332
@@ -4,8 +4,8 @@ admin user
dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: ok@???
@@ -34,7 +34,7 @@ After routing:
ok@???
Failed addresses:
Deferred addresses:
-qrun delivery forking for transport
+qrun-delivery forking for transport
postfork: transport
locking TESTSUITE/spool/db/retry.lockfile
locking TESTSUITE/spool/db/wait-t1.lockfile
@@ -42,8 +42,8 @@ transport forking for continued-transport-interproc
postfork: continued-transport-interproc
continued-transport-interproc forking for continued-transport
postfork: continued-transport
-fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for transport: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for transport: npppp
transport forked for continued-transport-interproc: npppp
continued-transport-interproc forked for continued-transport: npppp
LOG: MAIN
@@ -97,9 +97,9 @@ 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"
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
+>>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: delay@???
@@ -114,7 +114,7 @@ After routing:
Deferred addresses:
delay@???
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forked for qrun delivery: npppp
+fresh-exec forked for qrun-delivery: npppp
LOG: queue_run MAIN
End queue run: pid=pppp
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0333 b/test/stderr/0333
index 97c3633..21bac83 100644
--- a/test/stderr/0333
+++ b/test/stderr/0333
@@ -45,7 +45,7 @@ LOG: MAIN
=> ok@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK"
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -92,4 +92,4 @@ 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"
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0357 b/test/stderr/0357
index 633d9fd..619ee4a 100644
--- a/test/stderr/0357
+++ b/test/stderr/0357
@@ -48,16 +48,16 @@ Writing retry data for R:userx@???:<CALLER@???>
first failed=dddd last try=dddd next try=+2 expired=0
errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Temporary error
end of retry processing
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: userx@???
@@ -73,15 +73,15 @@ After routing:
userx@???
Failed addresses:
Deferred addresses:
-qrun delivery forking for transport
+qrun-delivery forking for transport
postfork: transport
checking status of 127.0.0.1
locking TESTSUITE/spool/db/retry.lockfile
no host retry record
no message retry record
added retry item for R:userx@???:<CALLER@???>: errno=-44 more_errno=dd,A flags=0
-fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for transport: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for transport: npppp
reading retry information for R:userx@???:<CALLER@???> from subprocess
existing delete item dropped
added retry item
@@ -112,15 +112,15 @@ end of retry processing
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: queue_run MAIN
End queue run: pid=pppp
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: userx@???
@@ -136,15 +136,15 @@ After routing:
userx@???
Failed addresses:
Deferred addresses:
-qrun delivery forking for transport
+qrun-delivery forking for transport
postfork: transport
checking status of 127.0.0.1
locking TESTSUITE/spool/db/retry.lockfile
no host retry record
no message retry record
added retry item for R:userx@???:<CALLER@???>: errno=-44 more_errno=dd,A flags=0
-fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for transport: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for transport: npppp
reading retry information for R:userx@???:<CALLER@???> from subprocess
existing delete item dropped
added retry item
@@ -175,15 +175,15 @@ end of retry processing
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: queue_run MAIN
End queue run: pid=pppp
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: userx@???
@@ -208,7 +208,7 @@ Deferred addresses:
userx@???: no retry items
end of retry processing
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forked for qrun delivery: npppp
+fresh-exec forked for qrun-delivery: npppp
LOG: queue_run MAIN
End queue run: pid=pppp
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0358 b/test/stderr/0358
index 5aa7d8a..90758b2 100644
--- a/test/stderr/0358
+++ b/test/stderr/0358
@@ -64,16 +64,16 @@ Writing retry data for R:userx@???:<CALLER@???>
first failed=dddd last try=dddd next try=+2 expired=0
errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 451 Temporary error
end of retry processing
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: userx@???
@@ -97,7 +97,7 @@ After routing:
usery@???
Failed addresses:
Deferred addresses:
-qrun delivery forking for transport
+qrun-delivery forking for transport
postfork: transport
checking status of 127.0.0.1
locking TESTSUITE/spool/db/retry.lockfile
@@ -105,8 +105,8 @@ no host retry record
no message retry record
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 qrun delivery: npppp
-qrun delivery forked for transport: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for transport: npppp
reading retry information for R:userx@???:<CALLER@???> from subprocess
existing delete item dropped
added retry item
@@ -158,4 +158,4 @@ end of retry processing
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: queue_run MAIN
End queue run: pid=pppp
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0360 b/test/stderr/0360
index af11caa..2d7e6aa 100644
--- a/test/stderr/0360
+++ b/test/stderr/0360
@@ -166,16 +166,16 @@ locking TESTSUITE/spool/db/retry.lockfile
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 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp -qf
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -266,7 +266,7 @@ After routing:
Deferred addresses:
defer@???
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forked for qrun delivery: npppp
+fresh-exec forked for qrun-delivery: npppp
LOG: queue_run MAIN
End queue run: pid=pppp -qf
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0361 b/test/stderr/0361
index 25bbaba..b595778 100644
--- a/test/stderr/0361
+++ b/test/stderr/0361
@@ -279,6 +279,6 @@ LOG: MAIN
end delivery of 10HmaY-0005vi-00
search_tidyup called
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0362 b/test/stderr/0362
index 02da290..71cb3bf 100644
--- a/test/stderr/0362
+++ b/test/stderr/0362
@@ -83,4 +83,4 @@ SMTP>> 221 the.local.host.name closing connection
LOG: smtp_connection MAIN
SMTP connection from [V4NET.0.0.0] closed by QUIT
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0364 b/test/stderr/0364
index 161975d..3e349bb 100644
--- a/test/stderr/0364
+++ b/test/stderr/0364
@@ -237,4 +237,4 @@ routed by r2 router
envelope to: xxx@???
transport: t1
host testsub.sub.test.ex [V4NET.99.0.3]
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=2 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0368 b/test/stderr/0368
index bdb9d6f..5246e11 100644
--- a/test/stderr/0368
+++ b/test/stderr/0368
@@ -77,4 +77,4 @@ postfork: fakens-search
fresh-exec forked for fakens-search: npppp
fully qualified name = ten-2.test.ex
ten-2.test.ex V4NET.0.0.2 mx=-1 sort=xx
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0370 b/test/stderr/0370
index 4585cb8..fb5b1d4 100644
--- a/test/stderr/0370
+++ b/test/stderr/0370
@@ -46,5 +46,5 @@ changed uid/gid: post-delivery tidying
uid=EXIM_UID gid=EXIM_GID pid=pppp
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0371 b/test/stderr/0371
index 1546b02..bc5b28b 100644
--- a/test/stderr/0371
+++ b/test/stderr/0371
@@ -140,4 +140,4 @@ SMTP>> 221 mail.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from (something) [V4NET.0.0.0] closed by QUIT
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0374 b/test/stderr/0374
index c721d8a..d1d1b99 100644
--- a/test/stderr/0374
+++ b/test/stderr/0374
@@ -496,7 +496,7 @@ LOG: MAIN
=> CALLER <CALLER@???> R=real T=real
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0375 b/test/stderr/0375
index da272aa..405a38a 100644
--- a/test/stderr/0375
+++ b/test/stderr/0375
@@ -996,16 +996,16 @@ LOG: MAIN
=> CALLER <CALLER@???> P=<> R=real T=real
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
d3@??? <d3@???>: error ignored
log writing disabled
LOG: MAIN
b1@??? <b1@???>: error ignored
log writing disabled
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
@@ -1113,5 +1113,5 @@ LOG: MAIN
log writing disabled
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0376 b/test/stderr/0376
index 9e1ec6c..7315bec 100644
--- a/test/stderr/0376
+++ b/test/stderr/0376
@@ -28,7 +28,7 @@ wrote callout cache domain record for localhost:
wrote positive callout cache address record for ok@localhost
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -45,7 +45,7 @@ callout cache: found address record for ok@localhost
callout cache: address record is positive
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -68,7 +68,7 @@ LOG: MAIN REJECT
H=[V4NET.0.0.1] U=root F=<ok@localhost> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -103,7 +103,7 @@ LOG: MAIN REJECT
H=[V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: (recipient): Sender verify failed
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -124,7 +124,7 @@ LOG: MAIN REJECT
H=[V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: (recipient): Sender verify failed
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -156,7 +156,7 @@ LOG: MAIN REJECT
H=[V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@???>: (mail): Sender verify failed
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -176,7 +176,7 @@ LOG: MAIN REJECT
H=[V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@???>: (mail): Sender verify failed
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -218,7 +218,7 @@ LOG: MAIN REJECT
H=[V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@???>: Sender verify failed
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -238,7 +238,7 @@ LOG: MAIN REJECT
H=[V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@???>: Sender verify failed
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -276,7 +276,7 @@ wrote callout cache domain record for otherhost2:
wrote positive callout cache address record for ok@otherhost2
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -294,7 +294,7 @@ callout cache: found address record for ok@otherhost2
callout cache: address record is positive
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -326,7 +326,7 @@ LOG: MAIN
(random)
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -344,7 +344,7 @@ LOG: MAIN
(random)
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -376,7 +376,7 @@ LOG: MAIN
(random)
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -394,7 +394,7 @@ LOG: MAIN
(random)
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -438,7 +438,7 @@ wrote callout cache domain record for otherhost41:
wrote positive callout cache address record for ok@otherhost41
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -457,7 +457,7 @@ callout cache: found address record for ok@otherhost41
callout cache: address record is positive
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -495,7 +495,7 @@ wrote callout cache domain record for otherhost21:
wrote positive callout cache address record for ok@otherhost21
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -527,7 +527,7 @@ wrote callout cache domain record for otherhost21:
wrote positive callout cache address record for ok2@otherhost21
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -564,7 +564,7 @@ wrote callout cache domain record for otherhost31:
wrote positive callout cache address record for ok@otherhost31
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -596,7 +596,7 @@ wrote callout cache domain record for otherhost31:
wrote positive callout cache address record for okok@otherhost31
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -633,7 +633,7 @@ wrote callout cache domain record for otherhost31:
wrote positive callout cache address record for okokok@otherhost31
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -666,7 +666,7 @@ LOG: MAIN REJECT
H=[V4NET.0.0.5] U=root F=<okok@otherhost51> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -704,7 +704,7 @@ wrote callout cache domain record for otherhost52:
wrote positive callout cache address record for okokok@otherhost52
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -738,7 +738,7 @@ LOG: MAIN
<= ok7@otherhost53 H=[V4NET.0.0.7] U=root P=smtp S=sss
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -770,7 +770,7 @@ LOG: MAIN
<= ok7@otherhost53 H=[V4NET.0.0.8] U=root P=smtp S=sss
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -810,7 +810,7 @@ wrote callout cache domain record for otherhost9:
wrote positive callout cache address record for ok@otherhost9
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -854,4 +854,4 @@ wrote callout cache domain record for test.ex:
wrote positive callout cache address record for z@???/<postmaster@???>
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0377 b/test/stderr/0377
index e5d4e5f..e6f31d3 100644
--- a/test/stderr/0377
+++ b/test/stderr/0377
@@ -320,16 +320,16 @@ local-accept-delivery forked for delivery-local: npppp
LOG: MAIN
=> cccc <cccc@???> R=cccc_accept T=t1
locking TESTSUITE/spool/db/retry.lockfile
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp -qf
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: aaaa@???
@@ -566,18 +566,18 @@ aaaa@??? was previously delivered (t1 transport): discarded
bbbb@??? was previously delivered (t1 transport): discarded
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forked for qrun delivery: npppp
+fresh-exec forked for qrun-delivery: npppp
LOG: queue_run MAIN
End queue run: pid=pppp -qf
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp -qf
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: aaaa@???
@@ -814,7 +814,7 @@ aaaa@??? was previously delivered (t1 transport): discarded
bbbb@??? was previously delivered (t1 transport): discarded
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forked for qrun delivery: npppp
+fresh-exec forked for qrun-delivery: npppp
LOG: queue_run MAIN
End queue run: pid=pppp -qf
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0378 b/test/stderr/0378
index bcd145c..26f87e9 100644
--- a/test/stderr/0378
+++ b/test/stderr/0378
@@ -49,7 +49,7 @@ 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 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (router-interpret) terminating with rc=0 >>>>>>>>>>>>>>>>
local-accept-delivery forked for router-interpret: npppp
rda_interpret: subprocess yield=0 error=NULL
set transport t3
@@ -168,8 +168,8 @@ After routing:
Deferred addresses:
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (autoreply) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
=> >CALLER@??? <aaaa@???> R=aaaa T=t3
locking TESTSUITE/spool/db/retry.lockfile
@@ -192,16 +192,16 @@ 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
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp -qf
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: aaaa@???
@@ -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
+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
+>>>>>>>>>>>>>>>> Exim pid=pppp (router-interpret) terminating with rc=0 >>>>>>>>>>>>>>>>
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for router-interpret: npppp
rda_interpret: subprocess yield=0 error=NULL
set transport t3
aaaa router generated >CALLER@???
@@ -338,4 +338,4 @@ locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: queue_run MAIN
End queue run: pid=pppp -qf
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0379 b/test/stderr/0379
index e789d50..bfcfa32 100644
--- a/test/stderr/0379
+++ b/test/stderr/0379
@@ -141,16 +141,16 @@ local-accept-delivery forked for delivery-local: npppp
LOG: MAIN
=> cccc <aaaa@???> R=bc T=t1
locking TESTSUITE/spool/db/retry.lockfile
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp -qf
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: defer@???
@@ -180,7 +180,7 @@ After routing:
defer@???
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forked for qrun delivery: npppp
+fresh-exec forked for qrun-delivery: npppp
LOG: queue_run MAIN
End queue run: pid=pppp -qf
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0380 b/test/stderr/0380
index 7f05f1e..2e84ee4 100644
--- a/test/stderr/0380
+++ b/test/stderr/0380
@@ -88,5 +88,5 @@ local-accept-delivery forked for delivery-local: npppp
LOG: MAIN
=> bbbb <bbbb@???> R=r3 T=t1
locking TESTSUITE/spool/db/retry.lockfile
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0381 b/test/stderr/0381
index 5ba9146..2dcb7a7 100644
--- a/test/stderr/0381
+++ b/test/stderr/0381
@@ -94,4 +94,4 @@ SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from CALLER closed by QUIT
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0382 b/test/stderr/0382
index f932bdf..44293f1 100644
--- a/test/stderr/0382
+++ b/test/stderr/0382
@@ -43,26 +43,26 @@ LOG: MAIN
** CALLER@???: Unrouteable address
LOG: MAIN
Frozen (delivery error message)
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp -qf
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
LOG: MAIN
cancelled by timeout_frozen_after
LOG: MAIN
Completed
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forked for qrun delivery: npppp
+fresh-exec forked for qrun-delivery: npppp
LOG: queue_run MAIN
End queue run: pid=pppp -qf
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0386 b/test/stderr/0386
index bd53315..c2061ff 100644
--- a/test/stderr/0386
+++ b/test/stderr/0386
@@ -141,7 +141,7 @@ SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from [V4NET.9.8.7] closed by QUIT
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
@@ -380,7 +380,7 @@ LOG: MAIN
end delivery of 10HmaX-0005vi-00
search_tidyup called
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
smtp_setup_msg entered
SMTP<< rset
SMTP>> 250 Reset OK
@@ -578,11 +578,11 @@ LOG: MAIN
end delivery of 10HmaY-0005vi-00
search_tidyup called
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
smtp_setup_msg entered
SMTP<< quit
SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from CALLER closed by QUIT
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0387 b/test/stderr/0387
index 702e025..3ce7d4a 100644
--- a/test/stderr/0387
+++ b/test/stderr/0387
@@ -435,4 +435,4 @@ dropping to exim gid; retaining priv uid
in TESTSUITE/aux-fixed/0387.1
lookup yielded: [*.b.c]
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main: expansion test) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0388 b/test/stderr/0388
index 3289787..64646c6 100644
--- a/test/stderr/0388
+++ b/test/stderr/0388
@@ -297,9 +297,9 @@ LOG: MAIN
Completed
search_tidyup called
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>>
Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
Size of headers = sss
@@ -307,4 +307,4 @@ LOG: MAIN
Completed
search_tidyup called
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0391 b/test/stderr/0391
index a921cbd..5ae0031 100644
--- a/test/stderr/0391
+++ b/test/stderr/0391
@@ -65,4 +65,4 @@ SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from [1.2.3.4] closed by QUIT
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0393 b/test/stderr/0393
index 6fd6a62..d3e3862 100644
--- a/test/stderr/0393
+++ b/test/stderr/0393
@@ -42,7 +42,7 @@ delivery-local forking for tpt-filter-writer
postfork: tpt-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 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (tpt-filter-writer) terminating with rc=0 >>>>>>>>>>>>>>>>
delivery-local forked for tpt-filter-writer: npppp
process pppp writing to transport filter
copying from the filter
@@ -57,8 +57,8 @@ LOG: MAIN
=> userx <userx@???> R=r1 T=t1
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
@@ -101,8 +101,8 @@ LOG: MAIN
=> userx <userx@???> R=r1 T=t1
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
@@ -147,5 +147,5 @@ LOG: MAIN
=> userx <userx@???> R=r1 T=t1
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0396 b/test/stderr/0396
index ec7a14c..6afac4c 100644
--- a/test/stderr/0396
+++ b/test/stderr/0396
@@ -33,4 +33,4 @@ SMTP>> 221 the.local.host.name closing connection
LOG: smtp_connection MAIN
SMTP connection from CALLER closed by QUIT
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0398 b/test/stderr/0398
index 82e188f..4756ab0 100644
--- a/test/stderr/0398
+++ b/test/stderr/0398
@@ -261,4 +261,4 @@ SMTP>> 221 mail.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from CALLER closed by QUIT
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0399 b/test/stderr/0399
index 9a3b132..2137d26 100644
--- a/test/stderr/0399
+++ b/test/stderr/0399
@@ -41,4 +41,4 @@ parse_forward_list:
r3 router declined for x@y
failed to expand "more" in r3 router: unknown variable name "unknown_variable"
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=1 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0402 b/test/stderr/0402
index 0158b4c..4a70c73 100644
--- a/test/stderr/0402
+++ b/test/stderr/0402
@@ -749,6 +749,6 @@ LOG: MAIN
end delivery of 10HmaX-0005vi-00
search_tidyup called
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0403 b/test/stderr/0403
index bb3dba3..126c38f 100644
--- a/test/stderr/0403
+++ b/test/stderr/0403
@@ -216,6 +216,6 @@ LOG: MAIN
end delivery of 10HmaX-0005vi-00
search_tidyup called
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0404 b/test/stderr/0404
index 21c5eac..8185fcb 100644
--- a/test/stderr/0404
+++ b/test/stderr/0404
@@ -210,7 +210,7 @@ data is an Exim filter program
Filter: start of processing
Filter: end of processing
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (rda) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (router-interpret) terminating with rc=0 >>>>>>>>>>>>>>>>
local-accept-delivery forked for router-interpret: npppp
rda_interpret: subprocess yield=0 error=NULL
set transport t1
@@ -18052,9 +18052,9 @@ LOG: MAIN
end delivery of 10HmaY-0005vi-00
search_tidyup called
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (autoreply) terminating with rc=0 >>>>>>>>>>>>>>>>
t1 transport succeeded
search_tidyup called
journalling >sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???, ...:userx@???
@@ -18097,6 +18097,6 @@ LOG: MAIN
end delivery of 10HmaX-0005vi-00
search_tidyup called
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0408 b/test/stderr/0408
index 1317c01..e83fad6 100644
--- a/test/stderr/0408
+++ b/test/stderr/0408
@@ -198,6 +198,6 @@ LOG: MAIN
end delivery of 10HmaX-0005vi-00
search_tidyup called
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0414 b/test/stderr/0414
index 9e7cdd1..3332d5a 100644
--- a/test/stderr/0414
+++ b/test/stderr/0414
@@ -132,4 +132,4 @@ routed by r3 router
envelope to: x@???
transport: t1
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0419 b/test/stderr/0419
index 4e6f5f6..0af69e9 100644
--- a/test/stderr/0419
+++ b/test/stderr/0419
@@ -64,4 +64,4 @@ routed by dnslookup router
transport: smtp
host other1.test.ex [V4NET.12.4.5] MX=4 dnssec=no
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0426 b/test/stderr/0426
index b269ac4..8353cfb 100644
--- a/test/stderr/0426
+++ b/test/stderr/0426
@@ -111,9 +111,9 @@ After routing:
Deferred addresses:
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0432 b/test/stderr/0432
index fc54dfb..0e6a1d9 100644
--- a/test/stderr/0432
+++ b/test/stderr/0432
@@ -132,7 +132,7 @@ SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from [1.2.3.4] closed by QUIT
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
@@ -210,7 +210,7 @@ SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from [1.2.3.4] closed by QUIT
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
diff --git a/test/stderr/0433 b/test/stderr/0433
index 2f7e9b5..8f4b59a 100644
--- a/test/stderr/0433
+++ b/test/stderr/0433
@@ -18,10 +18,10 @@ LOG: MAIN
set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225
daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
-fresh-exec forking for daemon-del-pidfile
+daemon 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 -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
-fresh-exec forked for daemon-del-pidfile: npppp
+daemon forked for daemon-del-pidfile: npppp
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
@@ -43,10 +43,10 @@ LOG: MAIN
set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 port 1226
daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
-fresh-exec forking for daemon-del-pidfile
+daemon 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 -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
-fresh-exec forked for daemon-del-pidfile: npppp
+daemon forked for daemon-del-pidfile: npppp
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
@@ -69,10 +69,10 @@ LOG: MAIN
set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on [127.0.0.1]:1228 port 1225 (IPv4) port 1226 (IPv4)
daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
-fresh-exec forking for daemon-del-pidfile
+daemon 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 -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
-fresh-exec forked for daemon-del-pidfile: npppp
+daemon forked for daemon-del-pidfile: npppp
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
@@ -95,10 +95,10 @@ LOG: MAIN
set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 port 1226 [127.0.0.1]:1228
daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
-fresh-exec forking for daemon-del-pidfile
+daemon 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 -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
-fresh-exec forked for daemon-del-pidfile: npppp
+daemon forked for daemon-del-pidfile: npppp
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
@@ -122,10 +122,10 @@ LOG: MAIN
set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on [127.0.0.1]:1228 port 1227 (IPv4)
daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
-fresh-exec forking for daemon-del-pidfile
+daemon 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 -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
-fresh-exec forked for daemon-del-pidfile: npppp
+daemon forked for daemon-del-pidfile: npppp
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
@@ -149,9 +149,9 @@ LOG: MAIN
set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 port 1226
daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
-fresh-exec forking for daemon-del-pidfile
+daemon 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 -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
-fresh-exec forked for daemon-del-pidfile: npppp
+daemon forked for daemon-del-pidfile: npppp
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0435 b/test/stderr/0435
index ad55c7e..d35eb04 100644
--- a/test/stderr/0435
+++ b/test/stderr/0435
@@ -22,4 +22,4 @@ SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from CALLER closed by QUIT
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0437 b/test/stderr/0437
index 6118f55..ee623d5 100644
--- a/test/stderr/0437
+++ b/test/stderr/0437
@@ -16,8 +16,8 @@ dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp
search_tidyup called
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
search_open: lsearch "TESTSUITE/aux-fixed/0437.ls"
search_find: file="TESTSUITE/aux-fixed/0437.ls"
key="transport" partial=-1 affix=NULL starflags=0
@@ -31,7 +31,7 @@ postfork: qrun delivery
lookup yielded: t1
search_tidyup called
search_tidyup called
-qrun delivery forking for 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"
@@ -45,8 +45,8 @@ postfork: delivery-local
in TESTSUITE/aux-fixed/0437.ls
lookup yielded: file
search_tidyup called
-fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for delivery-local: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for delivery-local: npppp
LOG: MAIN
=> userx <userx@???> R=r1 T=t1
LOG: MAIN
@@ -54,8 +54,8 @@ LOG: MAIN
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
search_tidyup called
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
search_open: lsearch "TESTSUITE/aux-fixed/0437.ls"
search_find: file="TESTSUITE/aux-fixed/0437.ls"
key="transport" partial=-1 affix=NULL starflags=0
@@ -69,7 +69,7 @@ postfork: qrun delivery
lookup yielded: t1
search_tidyup called
search_tidyup called
-qrun delivery forking for 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"
@@ -83,8 +83,8 @@ postfork: delivery-local
in TESTSUITE/aux-fixed/0437.ls
lookup yielded: file
search_tidyup called
-fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for delivery-local: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for delivery-local: npppp
LOG: MAIN
=> userx <userx@???> R=r1 T=t1
LOG: MAIN
@@ -94,4 +94,4 @@ search_tidyup called
LOG: queue_run MAIN
End queue run: pid=pppp
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0438 b/test/stderr/0438
index 2d7f0c3..eb5cef8 100644
--- a/test/stderr/0438
+++ b/test/stderr/0438
@@ -20,10 +20,10 @@ LOG: MAIN
set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225
daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
-fresh-exec forking for daemon-del-pidfile
+daemon 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 -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
-fresh-exec forked for daemon-del-pidfile: npppp
+daemon forked for daemon-del-pidfile: npppp
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
@@ -46,10 +46,10 @@ LOG: MAIN
set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225
daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
-fresh-exec forking for daemon-del-pidfile
+daemon 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 -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.anotherpid -oPX
-fresh-exec forked for daemon-del-pidfile: npppp
+daemon forked for daemon-del-pidfile: npppp
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
@@ -72,9 +72,9 @@ LOG: MAIN
set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225
daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
-fresh-exec forking for daemon-del-pidfile
+daemon 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 -MCd daemon-del-pidfile -oP TESTSUITE/spool/mypidfile -oPX
-fresh-exec forked for daemon-del-pidfile: npppp
+daemon 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 8926729..31d6662 100644
--- a/test/stderr/0450
+++ b/test/stderr/0450
@@ -34,19 +34,19 @@ added to list for 127.0.0.1
Leaving t1 transport
LOG: MAIN
== userx@??? R=r1 T=t1 defer (dd): Connection refused
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
>>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
--------> userx@??? <--------
-qrun delivery forking for transport
+qrun-delivery forking for transport
postfork: transport
t1 transport entered
userx@???
@@ -61,8 +61,8 @@ Connecting to 127.0.0.1 [127.0.0.1]:1226 ... 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:1226: errno=dd more_errno=dd,A flags=2
-fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for transport: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for transport: npppp
all IP addresses skipped or deferred at least one address
updating wait-t1 database
already listed for 127.0.0.1
@@ -72,4 +72,4 @@ LOG: MAIN
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: queue_run MAIN
End queue run: pid=pppp
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0462 b/test/stderr/0462
index 9b821df..7ec8ded 100644
--- a/test/stderr/0462
+++ b/test/stderr/0462
@@ -48,7 +48,7 @@ callout cache: found address record for Ok@localhost
callout cache: address record is positive
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -83,7 +83,7 @@ LOG: MAIN REJECT
H=[V4NET.0.0.2] U=root F=<NOTok@elsewhere> rejected RCPT <nocheckpm@???>: Sender verify failed
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -116,4 +116,4 @@ LOG: MAIN REJECT
H=[V4NET.0.0.2] U=root F=<NOTok2@elsewhere> rejected RCPT <nocheckpm@???>: Sender verify failed
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0463 b/test/stderr/0463
index 60aac79..10fd4da 100644
--- a/test/stderr/0463
+++ b/test/stderr/0463
@@ -102,4 +102,4 @@ routed by all router
transport: smtp
host ten-1.test.ex [V4NET.0.0.1]
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0464 b/test/stderr/0464
index 86e8fe3..d1e6e08 100644
--- a/test/stderr/0464
+++ b/test/stderr/0464
@@ -173,4 +173,4 @@ SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from CALLER closed by QUIT
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0465 b/test/stderr/0465
index c05dc5c..c2c5270 100644
--- a/test/stderr/0465
+++ b/test/stderr/0465
@@ -29,7 +29,7 @@ SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from CALLER closed by QUIT
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
exim: bad -f address "abc@somewhere.": domain is malformed (trailing dot not allowed)
Exim version x.yz ....
changed uid/gid: forcing real = effective
@@ -101,7 +101,7 @@ SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from CALLER closed by QUIT
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
@@ -164,4 +164,4 @@ SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from CALLER closed by QUIT
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0469 b/test/stderr/0469
index eff5a7b..0a07f4c 100644
--- a/test/stderr/0469
+++ b/test/stderr/0469
@@ -38,4 +38,4 @@ host_find_bydns yield = HOST_FIND_FAILED (0); returned hosts:
r1 router declined for x@???
no more routers
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=2 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0471 b/test/stderr/0471
index 6c75643..c0916e8 100644
--- a/test/stderr/0471
+++ b/test/stderr/0471
@@ -25386,4 +25386,4 @@ LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0473 b/test/stderr/0473
index 2714530..d9bdd31 100644
--- a/test/stderr/0473
+++ b/test/stderr/0473
@@ -28,7 +28,7 @@ LOG: MAIN REJECT
U=CALLER F=<x11@???> temporarily rejected RCPT r11@???: Could not complete recipient verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after RCPT TO:<r11@???>
LOG: smtp_connection MAIN
SMTP connection from CALLER closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -51,4 +51,4 @@ LOG: MAIN REJECT
U=CALLER F=<x11@???> temporarily rejected RCPT r11@???: Could not complete recipient verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after initial connection
LOG: smtp_connection MAIN
SMTP connection from CALLER closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0476 b/test/stderr/0476
index b4ebe23..d88b3a8 100644
--- a/test/stderr/0476
+++ b/test/stderr/0476
@@ -6,12 +6,12 @@ set_process_info: pppp running the queue (single queue run)
LOG: queue_run MAIN
Start queue run: pid=pppp
set_process_info: pppp running queue: 10HmaX-0005vi-00-H
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
set_process_info: pppp delivering 10HmaX-0005vi-00 (queue run pid ppppp)
>>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
--------> userx@??? <--------
-qrun delivery forking for transport
+qrun-delivery forking for transport
postfork: transport
set_process_info: pppp delivering 10HmaX-0005vi-00 using t1
t1 transport entered
@@ -54,17 +54,17 @@ H=127.0.0.1 [127.0.0.1] Remote host closed connection in response to RSET
set_process_info: pppp delivering 10HmaX-0005vi-00: just tried 127.0.0.1 [127.0.0.1]:PORT_S for userx@???: result OK
Leaving t1 transport
set_process_info: pppp delivering 10HmaX-0005vi-00 (just run t1 for userx@??? in subprocess)
-fresh-exec forked for qrun delivery: npppp
+fresh-exec forked for qrun-delivery: npppp
set_process_info: pppp running queue: waiting for 10HmaX-0005vi-00 (pppp)
-qrun delivery forked for transport: npppp
+qrun-delivery forked for transport: npppp
set_process_info: pppp delivering 10HmaX-0005vi-00: waiting for a remote delivery subprocess to finish
set_process_info: pppp delivering 10HmaX-0005vi-00
LOG: MAIN
** userx@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@???>: 550 NO
set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00
-qrun delivery forking for bounce-message
+qrun-delivery forking for bounce-message
postfork: bounce-message
-qrun delivery forked for bounce-message: npppp
+qrun-delivery forked for bounce-message: npppp
cannot use sendfile for body: spoolfile not wireformat
writing data block fd=dddd size=sss timeout=0
Exim version x.yz ....
@@ -113,20 +113,20 @@ set_process_info: pppp delivering 10HmaZ-0005vi-00
LOG: MAIN
== CALLER@??? R=r1 T=t1 defer (dd): Connection refused
set_process_info: pppp tidying up after delivering 10HmaZ-0005vi-00
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
Completed
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
set_process_info: pppp running queue: waiting for children of pppp
set_process_info: pppp running queue
set_process_info: pppp running queue: 10HmaY-0005vi-00-H
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
set_process_info: pppp delivering 10HmaY-0005vi-00 (queue run pid ppppp)
>>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
--------> usery@??? <--------
-qrun delivery forking for transport
+qrun-delivery forking for transport
postfork: transport
set_process_info: pppp delivering 10HmaY-0005vi-00 using t1
t1 transport entered
@@ -141,9 +141,9 @@ updating wait-t1 database
added to list for 127.0.0.1
Leaving t1 transport
set_process_info: pppp delivering 10HmaY-0005vi-00 (just run t1 for usery@??? in subprocess)
-fresh-exec forked for qrun delivery: npppp
+fresh-exec forked for qrun-delivery: npppp
set_process_info: pppp running queue: waiting for 10HmaY-0005vi-00 (pppp)
-qrun delivery forked for transport: npppp
+qrun-delivery forked for transport: npppp
set_process_info: pppp delivering 10HmaY-0005vi-00: waiting for a remote delivery subprocess to finish
set_process_info: pppp delivering 10HmaY-0005vi-00
LOG: retry_defer MAIN
@@ -154,4 +154,4 @@ set_process_info: pppp running queue: waiting for children of pppp
set_process_info: pppp running queue
LOG: queue_run MAIN
End queue run: pid=pppp
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0479 b/test/stderr/0479
index d62ca39..648c7ae 100644
--- a/test/stderr/0479
+++ b/test/stderr/0479
@@ -92,4 +92,4 @@ SMTP>> 221 the.local.host.name closing connection
LOG: smtp_connection MAIN
SMTP connection from ([1.2.3.4]) [1.2.3.4] closed by QUIT
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0483 b/test/stderr/0483
index b6b284e..a8a35c8 100644
--- a/test/stderr/0483
+++ b/test/stderr/0483
@@ -27,4 +27,4 @@ LOG: MAIN REJECT
U=CALLER F=<sender@domain1> rejected RCPT <other@domain2>
LOG: smtp_connection MAIN
SMTP connection from CALLER closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0484 b/test/stderr/0484
index 9b10627..cf59998 100644
--- a/test/stderr/0484
+++ b/test/stderr/0484
@@ -130,4 +130,4 @@ sender address = CALLER@???
in TESTSUITE/aux-fixed/0484.aliases
lookup yielded: userx
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main: expansion test) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0487 b/test/stderr/0487
index 5caae6b..3149a11 100644
--- a/test/stderr/0487
+++ b/test/stderr/0487
@@ -202,11 +202,11 @@ LOG: MAIN
end delivery of 10HmaX-0005vi-00
search_tidyup called
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
smtp_setup_msg entered
SMTP<< quit
SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from CALLER closed by QUIT
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0489 b/test/stderr/0489
index 61313be..9a00fed 100644
--- a/test/stderr/0489
+++ b/test/stderr/0489
@@ -29,7 +29,7 @@ Size of headers = sss
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -60,7 +60,7 @@ Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H
Size of headers = sss
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -91,7 +91,7 @@ Renaming spool header file: TESTSUITE/spool//input//10HmaZ-0005vi-00-H
Size of headers = sss
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -122,7 +122,7 @@ Renaming spool header file: TESTSUITE/spool//input//10HmbA-0005vi-00-H
Size of headers = sss
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -153,7 +153,7 @@ Renaming spool header file: TESTSUITE/spool//input//10HmbB-0005vi-00-H
Size of headers = sss
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -184,7 +184,7 @@ Renaming spool header file: TESTSUITE/spool//input//10HmbC-0005vi-00-H
Size of headers = sss
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -215,7 +215,7 @@ Renaming spool header file: TESTSUITE/spool//input//10HmbD-0005vi-00-H
Size of headers = sss
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -246,4 +246,4 @@ Renaming spool header file: TESTSUITE/spool//input//10HmbE-0005vi-00-H
Size of headers = sss
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0499 b/test/stderr/0499
index 5c203fd..653a476 100644
--- a/test/stderr/0499
+++ b/test/stderr/0499
@@ -59,4 +59,4 @@ routed by r1 router
envelope to: ph@???
transport: t1
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0512 b/test/stderr/0512
index b1154f2..240fd35 100644
--- a/test/stderr/0512
+++ b/test/stderr/0512
@@ -4,11 +4,11 @@ admin user
dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp -qf
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
>>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
--------> userx@??? <--------
-qrun delivery forking for transport
+qrun-delivery forking for transport
postfork: transport
t1 transport entered
userx@???
@@ -24,8 +24,8 @@ 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:1224: errno=dd more_errno=dd,A flags=2
temporary delivery error(s) override hosts_max_try (message older than host's retry time)
-fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for transport: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for transport: npppp
getting address for 127.0.0.1
checking status of 127.0.0.1
no message retry record
@@ -67,9 +67,9 @@ LOG: MAIN
== userx@??? R=r1 T=t1 defer (dd): Connection refused
LOG: MAIN
** userx@???: retry timeout exceeded
-qrun delivery forking for bounce-message
+qrun-delivery forking for bounce-message
postfork: bounce-message
-qrun delivery forked for bounce-message: npppp
+qrun-delivery forked for bounce-message: npppp
cannot use sendfile for body: spoolfile not wireformat
writing data block fd=dddd size=sss timeout=0
Exim version x.yz ....
@@ -90,25 +90,25 @@ LOG: MAIN
=> :blackhole: <CALLER@???> R=r0
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
Completed
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: queue_run MAIN
End queue run: pid=pppp -qf
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp -qf
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
>>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
--------> userx@??? <--------
-qrun delivery forking for transport
+qrun-delivery forking for transport
postfork: transport
t1 transport entered
userx@???
@@ -124,8 +124,8 @@ 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:1224: errno=dd more_errno=dd,A flags=2
temporary delivery error(s) override hosts_max_try (message older than host's retry time)
-fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for transport: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for transport: npppp
getting address for 127.0.0.1
checking status of 127.0.0.1
no message retry record
@@ -147,9 +147,9 @@ LOG: MAIN
== userx@??? R=r1 T=t1 defer (dd): Connection refused
LOG: MAIN
** userx@???: retry timeout exceeded
-qrun delivery forking for bounce-message
+qrun-delivery forking for bounce-message
postfork: bounce-message
-qrun delivery forked for bounce-message: npppp
+qrun-delivery forked for bounce-message: npppp
cannot use sendfile for body: spoolfile not wireformat
writing data block fd=dddd size=sss timeout=0
Exim version x.yz ....
@@ -170,11 +170,11 @@ LOG: MAIN
=> :blackhole: <CALLER@???> R=r0
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
Completed
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: queue_run MAIN
End queue run: pid=pppp -qf
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0529 b/test/stderr/0529
index 26a2d15..b8edd82 100644
--- a/test/stderr/0529
+++ b/test/stderr/0529
@@ -51,16 +51,16 @@ Writing retry data for T:TESTSUITE/test-mail/rmbox:x@???
errno=-22 more_errno=dd mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/rmbox)
x@???: no retry items
end of retry processing
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: x@???
@@ -93,7 +93,7 @@ Deferred addresses:
x@???: no retry items
end of retry processing
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forked for qrun delivery: npppp
+fresh-exec forked for qrun-delivery: npppp
LOG: queue_run MAIN
End queue run: pid=pppp
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0543 b/test/stderr/0543
index b136412..43cf03c 100644
--- a/test/stderr/0543
+++ b/test/stderr/0543
@@ -4,8 +4,8 @@ admin user
dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: userx@domain1
@@ -33,12 +33,12 @@ After routing:
userx@domain1
Failed addresses:
Deferred addresses:
-qrun delivery forking for transport
+qrun-delivery forking for transport
postfork: transport
transport forking for fakens-search
postfork: fakens-search
-fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for transport: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for transport: npppp
transport forked for fakens-search: npppp
transport forking for fakens-search
postfork: fakens-search
@@ -50,8 +50,8 @@ LOG: MAIN
LOG: MAIN
Completed
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: usery@domain1
@@ -66,7 +66,7 @@ After routing:
Deferred addresses:
usery@domain1
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forked for qrun delivery: npppp
+fresh-exec forked for qrun-delivery: npppp
LOG: queue_run MAIN
End queue run: pid=pppp
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0544 b/test/stderr/0544
index cdad6f0..fa7e2d7 100644
--- a/test/stderr/0544
+++ b/test/stderr/0544
@@ -169,8 +169,8 @@ LOG: MAIN
╰─────result: yes
├──expanding: ${if or {{ !eq{$h_list-id:$h_list-post:$h_list-subscribe:}{} }{ match{$h_precedence:}{(?i)bulk|list|junk} }{ match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }} {no}{yes}}
╰─────result: yes
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
configuration file is TESTSUITE/test-config
@@ -210,4 +210,4 @@ LOG: smtp_connection MAIN
╰──(tainted)
LOG: smtp_connection MAIN
SMTP connection from CALLER closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0545 b/test/stderr/0545
index 9dfefed..33d2894 100644
--- a/test/stderr/0545
+++ b/test/stderr/0545
@@ -93,7 +93,7 @@ routed by dns router
transport: smtp
host eximtesthost.test.ex [ip4.ip4.ip4.ip4]
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
@@ -155,4 +155,4 @@ routed by dns router
transport: smtp
host eximtesthost.test.ex [ip4.ip4.ip4.ip4]
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0554 b/test/stderr/0554
index cb66e08..7b8afc0 100644
--- a/test/stderr/0554
+++ b/test/stderr/0554
@@ -38,7 +38,7 @@ Writing retry data for R:x@y:<CALLER@???>
first failed=dddd last try=dddd next try=+2 expired=0
errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@y>: 451 Temporary error
end of retry processing
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
@@ -97,4 +97,4 @@ Deferred addresses:
end of retry processing
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0563 b/test/stderr/0563
index 2354943..75b65d9 100644
--- a/test/stderr/0563
+++ b/test/stderr/0563
@@ -38,4 +38,4 @@ routed by router2 router
envelope to: joe-real@???
transport: local_delivery
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0575 b/test/stderr/0575
index 934e8aa..351f3dd 100644
--- a/test/stderr/0575
+++ b/test/stderr/0575
@@ -57,4 +57,4 @@ SMTP>> 221 mail.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from [V4NET.0.0.0] closed by QUIT
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0578 b/test/stderr/0578
index 5e3412f..a2b7c81 100644
--- a/test/stderr/0578
+++ b/test/stderr/0578
@@ -30,7 +30,7 @@ wrote callout cache domain record for localhost:
wrote positive callout cache address record for ok@localhost
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -47,7 +47,7 @@ callout cache: found address record for ok@localhost
callout cache: address record is positive
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -70,7 +70,7 @@ LOG: MAIN REJECT
H=[V4NET.0.0.1] U=root F=<ok@localhost> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -107,7 +107,7 @@ LOG: MAIN REJECT
H=[V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: (recipient): Sender verify failed
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -128,7 +128,7 @@ LOG: MAIN REJECT
H=[V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: (recipient): Sender verify failed
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -164,7 +164,7 @@ LOG: MAIN REJECT
H=[V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@???>: (mail): Sender verify failed
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -184,7 +184,7 @@ LOG: MAIN REJECT
H=[V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@???>: (mail): Sender verify failed
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -228,7 +228,7 @@ LOG: MAIN REJECT
H=[V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@???>: Sender verify failed
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -248,7 +248,7 @@ LOG: MAIN REJECT
H=[V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@???>: Sender verify failed
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -288,7 +288,7 @@ wrote callout cache domain record for otherhost2:
wrote positive callout cache address record for ok@otherhost2
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -306,7 +306,7 @@ callout cache: found address record for ok@otherhost2
callout cache: address record is positive
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -340,7 +340,7 @@ LOG: MAIN
(random)
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -358,7 +358,7 @@ LOG: MAIN
(random)
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -392,7 +392,7 @@ LOG: MAIN
(random)
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -410,7 +410,7 @@ LOG: MAIN
(random)
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -456,7 +456,7 @@ wrote callout cache domain record for otherhost41:
wrote positive callout cache address record for ok@otherhost41
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -475,7 +475,7 @@ callout cache: found address record for ok@otherhost41
callout cache: address record is positive
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -515,7 +515,7 @@ wrote callout cache domain record for otherhost21:
wrote positive callout cache address record for ok@otherhost21
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -549,7 +549,7 @@ wrote callout cache domain record for otherhost21:
wrote positive callout cache address record for ok2@otherhost21
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -588,7 +588,7 @@ wrote callout cache domain record for otherhost31:
wrote positive callout cache address record for ok@otherhost31
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -622,7 +622,7 @@ wrote callout cache domain record for otherhost31:
wrote positive callout cache address record for okok@otherhost31
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -661,7 +661,7 @@ wrote callout cache domain record for otherhost31:
wrote positive callout cache address record for okokok@otherhost31
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -696,7 +696,7 @@ LOG: MAIN REJECT
H=[V4NET.0.0.5] U=root F=<okok@otherhost51> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -736,7 +736,7 @@ wrote callout cache domain record for otherhost52:
wrote positive callout cache address record for okokok@otherhost52
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -772,7 +772,7 @@ LOG: MAIN
<= ok7@otherhost53 H=[V4NET.0.0.7] U=root P=smtp S=sss
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -806,7 +806,7 @@ LOG: MAIN
<= ok7@otherhost53 H=[V4NET.0.0.8] U=root P=smtp S=sss
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -848,7 +848,7 @@ wrote callout cache domain record for otherhost9:
wrote positive callout cache address record for ok@otherhost9
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -894,4 +894,4 @@ wrote callout cache domain record for test.ex:
wrote positive callout cache address record for z@???/<postmaster@???>
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0609 b/test/stderr/0609
index d141e5b..2cef9ec 100644
--- a/test/stderr/0609
+++ b/test/stderr/0609
@@ -17,22 +17,22 @@ ppppp Listening...
ppppp Connection request from 127.0.0.1 port sssss
ppppp LOG: smtp_connection MAIN
ppppp SMTP connection from [127.0.0.1] (TCP/IP connection count = 1)
-ppppp fresh-exec forking for daemon accept
-ppppp postfork: daemon accept
+ppppp daemon forking for daemon-accept
+ppppp postfork: daemon-accept
ppppp Process ppppp is handling incoming connection from [127.0.0.1]
ppppp Process ppppp is ready for new message
ppppp using ACL "delay4_accept"
ppppp processing "accept" (TESTSUITE/test-config 24)
ppppp check delay = 4s
ppppp delay modifier requests 4-second delay
-ppppp fresh-exec forked for daemon accept: npppp
+ppppp daemon forked for daemon-accept: npppp
ppppp 1 SMTP accept process running
ppppp Listening...
ppppp accept: condition test succeeded in ACL "delay4_accept"
ppppp end of ACL "delay4_accept": ACCEPT
ppppp LOG: smtp_connection MAIN
ppppp SMTP connection from [127.0.0.1] closed by QUIT
-ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (conn-setup) terminating with rc=0 >>>>>>>>>>>>>>>>
+ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>>
ppppp child ppppp ended: status=0x0
ppppp normal exit, 0
ppppp 0 SMTP accept processes now running
@@ -40,8 +40,8 @@ ppppp Listening...
ppppp Connection request from 127.0.0.1 port sssss
ppppp LOG: smtp_connection MAIN
ppppp SMTP connection from [127.0.0.1] (TCP/IP connection count = 1)
-ppppp fresh-exec forking for daemon accept
-ppppp postfork: daemon accept
+ppppp daemon forking for daemon-accept
+ppppp postfork: daemon-accept
ppppp Process ppppp is handling incoming connection from [127.0.0.1]
ppppp Process ppppp is ready for new message
ppppp using ACL "delay4_accept"
@@ -53,10 +53,10 @@ ppppp accept: condition test succeeded in ACL "delay4_accept"
ppppp end of ACL "delay4_accept": ACCEPT
ppppp LOG: lost_incoming_connection MAIN
ppppp unexpected disconnection while reading SMTP command from [127.0.0.1] D=qqs
-ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (conn-setup) terminating with rc=1 >>>>>>>>>>>>>>>>
-ppppp fresh-exec forked for daemon accept: npppp
+ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (daemon-accept) terminating with rc=1 >>>>>>>>>>>>>>>>
+ppppp daemon forked for daemon-accept: npppp
ppppp 1 SMTP accept process running
-ppppp fresh-exec forking for daemon-del-pidfile
+ppppp daemon forking for daemon-del-pidfile
ppppp postfork: daemon-del-pidfile
-ppppp fresh-exec forked for daemon-del-pidfile: npppp
+ppppp daemon forked for daemon-del-pidfile: npppp
ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/1006 b/test/stderr/1006
index ccec74c..0cb661d 100644
--- a/test/stderr/1006
+++ b/test/stderr/1006
@@ -45,7 +45,7 @@ DNS lookup of v6.test.ex (A) gave NO_DATA
returning DNS_NODATA
faking res_search(A) response length as 65535
writing neg-cache entry for v6.test.ex-A-xxxx, ttl 3000
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
@@ -81,6 +81,6 @@ DNS lookup of v6.test.ex (A) gave NO_DATA
returning DNS_NODATA
faking res_search(A) response length as 65535
writing neg-cache entry for v6.test.ex-A-xxxx, ttl 3000
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=2 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>
******** SERVER ********
diff --git a/test/stderr/1007 b/test/stderr/1007
index 46aac6f..e0a951c 100644
--- a/test/stderr/1007
+++ b/test/stderr/1007
@@ -19,10 +19,10 @@ LOG: MAIN
set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4)
daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
-fresh-exec forking for daemon-del-pidfile
+daemon 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 -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
-fresh-exec forked for daemon-del-pidfile: npppp
+daemon forked for daemon-del-pidfile: npppp
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
@@ -46,10 +46,10 @@ LOG: MAIN
set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4) port 1226 (IPv6 and IPv4)
daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
-fresh-exec forking for daemon-del-pidfile
+daemon 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 -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
-fresh-exec forked for daemon-del-pidfile: npppp
+daemon forked for daemon-del-pidfile: npppp
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
@@ -74,10 +74,10 @@ LOG: MAIN
set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4) port 1226 (IPv6 and IPv4) [127.0.0.1]:1228
daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
-fresh-exec forking for daemon-del-pidfile
+daemon 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 -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
-fresh-exec forked for daemon-del-pidfile: npppp
+daemon forked for daemon-del-pidfile: npppp
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
@@ -102,10 +102,10 @@ LOG: MAIN
set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4) port 1226 (IPv6 and IPv4) [127.0.0.1]:1228
daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
-fresh-exec forking for daemon-del-pidfile
+daemon 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 -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
-fresh-exec forked for daemon-del-pidfile: npppp
+daemon forked for daemon-del-pidfile: npppp
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
@@ -127,10 +127,10 @@ LOG: MAIN
set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on [ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6]:{1225,1226}
daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
-fresh-exec forking for daemon-del-pidfile
+daemon 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 -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
-fresh-exec forked for daemon-del-pidfile: npppp
+daemon forked for daemon-del-pidfile: npppp
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
@@ -155,10 +155,10 @@ LOG: MAIN
set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1227 (IPv6 and IPv4) [127.0.0.1]:1228
daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
-fresh-exec forking for daemon-del-pidfile
+daemon 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 -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
-fresh-exec forked for daemon-del-pidfile: npppp
+daemon forked for daemon-del-pidfile: npppp
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
@@ -184,10 +184,10 @@ LOG: MAIN
set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on [127.0.0.1]:{1227,1225}
daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
-fresh-exec forking for daemon-del-pidfile
+daemon 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 -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
-fresh-exec forked for daemon-del-pidfile: npppp
+daemon forked for daemon-del-pidfile: npppp
search_tidyup called
>>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
@@ -212,9 +212,9 @@ LOG: MAIN
set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4) port 1226 (IPv4)
daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
Listening...
-fresh-exec forking for daemon-del-pidfile
+daemon 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 -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX
-fresh-exec forked for daemon-del-pidfile: npppp
+daemon 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 a74bade..c257187 100644
--- a/test/stderr/2013
+++ b/test/stderr/2013
@@ -4,37 +4,37 @@ admin user
dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp -qqf
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
-qrun delivery forking for transport
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
+qrun-delivery forking for transport
postfork: transport
-fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for transport: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
-qrun delivery forking for transport
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
+qrun-delivery forking for transport
postfork: transport
-fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for transport: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
-qrun delivery forking for transport
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
+qrun-delivery forking for transport
postfork: transport
-fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for transport: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
-qrun delivery forking for transport
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
+qrun-delivery forking for transport
postfork: transport
Connecting to 127.0.0.1 [127.0.0.1]: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 qrun delivery: npppp
-qrun delivery forked for transport: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for transport: npppp
SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
250-SIZE 52428800
250-8BITMIME
@@ -103,7 +103,7 @@ LOG: MAIN
=> userz@??? 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=10HmbB-0005vi-00"
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -123,52 +123,52 @@ cmd buf flush ddd bytes
cmd buf flush ddd bytes
SMTP(close)>>
continued-transport forked for transport: npppp
->>>>>>>>>>>>>>>> Exim pid=pppp (TLS proxy) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> 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"
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: queue_run MAIN
End queue run: pid=pppp -qqf
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp -qqf
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
-qrun delivery forking for transport
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
+qrun-delivery forking for transport
postfork: transport
-fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for transport: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
-qrun delivery forking for transport
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
+qrun-delivery forking for transport
postfork: transport
-fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for transport: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
-qrun delivery forking for transport
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
+qrun-delivery forking for transport
postfork: transport
-fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for transport: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
-qrun delivery forking for transport
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
+qrun-delivery forking for transport
postfork: transport
Connecting to 127.0.0.1 [127.0.0.1]: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 qrun delivery: npppp
-qrun delivery forked for transport: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for transport: npppp
SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
250-SIZE 52428800
250-8BITMIME
@@ -237,7 +237,7 @@ LOG: MAIN
=> userc@??? 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=10HmbH-0005vi-00"
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -257,52 +257,52 @@ cmd buf flush ddd bytes
cmd buf flush ddd bytes
SMTP(close)>>
continued-transport forked for transport: npppp
->>>>>>>>>>>>>>>> Exim pid=pppp (TLS proxy) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> 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"
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: queue_run MAIN
End queue run: pid=pppp -qqf
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp -qqf
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
-qrun delivery forking for transport
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
+qrun-delivery forking for transport
postfork: transport
-fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for transport: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
-qrun delivery forking for transport
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
+qrun-delivery forking for transport
postfork: transport
-fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for transport: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
-qrun delivery forking for transport
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
+qrun-delivery forking for transport
postfork: transport
-fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for transport: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
-qrun delivery forking for transport
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
+qrun-delivery forking for transport
postfork: transport
Connecting to 127.0.0.1 [127.0.0.1]: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 qrun delivery: npppp
-qrun delivery forked for transport: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for transport: npppp
SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
250-SIZE 52428800
250-8BITMIME
@@ -392,7 +392,7 @@ LOG: MAIN
=> userz@??? 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 DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbN-0005vi-00"
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -426,9 +426,9 @@ 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 DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbO-0005vi-00"
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: queue_run MAIN
End queue run: pid=pppp -qqf
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
******** SERVER ********
diff --git a/test/stderr/2035 b/test/stderr/2035
index a818a45..d1bcefb 100644
--- a/test/stderr/2035
+++ b/test/stderr/2035
@@ -40,7 +40,7 @@ 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 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
local-accept-delivery forking for tls-proxy-interproc
postfork: tls-proxy-interproc
tls-proxy-interproc forking for tls-proxy
@@ -79,12 +79,12 @@ ok=1 send_quit=1 send_rset=0 continue_more=0 yield=0 first_address is NULL
cmd buf flush ddd bytes
SMTP(close)>>
local-accept-delivery forked for transport: npppp
->>>>>>>>>>>>>>>> Exim pid=pppp (TLS proxy) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>>
Leaving t1 transport
LOG: MAIN
=> userb@??? R=client T=t1 H=127.0.0.1 [127.0.0.1]:1225 X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmaY-0005vi-00"
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
******** SERVER ********
diff --git a/test/stderr/2113 b/test/stderr/2113
index d9cbf9f..00f475d 100644
--- a/test/stderr/2113
+++ b/test/stderr/2113
@@ -4,37 +4,37 @@ admin user
dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp -qqf
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
-qrun delivery forking for transport
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
+qrun-delivery forking for transport
postfork: transport
-fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for transport: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
-qrun delivery forking for transport
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
+qrun-delivery forking for transport
postfork: transport
-fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for transport: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
-qrun delivery forking for transport
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
+qrun-delivery forking for transport
postfork: transport
-fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for transport: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
-qrun delivery forking for transport
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
+qrun-delivery forking for transport
postfork: transport
Connecting to 127.0.0.1 [127.0.0.1]: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 qrun delivery: npppp
-qrun delivery forked for transport: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for transport: npppp
SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
250-SIZE 52428800
250-8BITMIME
@@ -103,7 +103,7 @@ LOG: MAIN
=> userz@??? 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=10HmbB-0005vi-00"
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -123,52 +123,52 @@ cmd buf flush ddd bytes
cmd buf flush ddd bytes
SMTP(close)>>
continued-transport forked for transport: npppp
->>>>>>>>>>>>>>>> Exim pid=pppp (TLS proxy) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> 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"
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: queue_run MAIN
End queue run: pid=pppp -qqf
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp -qqf
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
-qrun delivery forking for transport
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
+qrun-delivery forking for transport
postfork: transport
-fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for transport: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
-qrun delivery forking for transport
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
+qrun-delivery forking for transport
postfork: transport
-fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for transport: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
-qrun delivery forking for transport
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
+qrun-delivery forking for transport
postfork: transport
-fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for transport: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
-qrun delivery forking for transport
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
+qrun-delivery forking for transport
postfork: transport
Connecting to 127.0.0.1 [127.0.0.1]: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 qrun delivery: npppp
-qrun delivery forked for transport: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for transport: npppp
SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
250-SIZE 52428800
250-8BITMIME
@@ -237,7 +237,7 @@ LOG: MAIN
=> userc@??? 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=10HmbH-0005vi-00"
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -257,52 +257,52 @@ cmd buf flush ddd bytes
cmd buf flush ddd bytes
SMTP(close)>>
continued-transport forked for transport: npppp
->>>>>>>>>>>>>>>> Exim pid=pppp (TLS proxy) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> 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"
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: queue_run MAIN
End queue run: pid=pppp -qqf
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp -qqf
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
-qrun delivery forking for transport
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
+qrun-delivery forking for transport
postfork: transport
-fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for transport: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
-qrun delivery forking for transport
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
+qrun-delivery forking for transport
postfork: transport
-fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for transport: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
-qrun delivery forking for transport
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
+qrun-delivery forking for transport
postfork: transport
-fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for transport: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for transport: npppp
>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
-qrun delivery forking for transport
+fresh-exec forking for qrun-delivery
+postfork: qrun-delivery
+qrun-delivery forking for transport
postfork: transport
Connecting to 127.0.0.1 [127.0.0.1]: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 qrun delivery: npppp
-qrun delivery forked for transport: npppp
+fresh-exec forked for qrun-delivery: npppp
+qrun-delivery forked for transport: npppp
SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
250-SIZE 52428800
250-8BITMIME
@@ -392,7 +392,7 @@ LOG: MAIN
=> userz@??? 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 DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbN-0005vi-00"
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -426,9 +426,9 @@ 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 DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbO-0005vi-00"
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: queue_run MAIN
End queue run: pid=pppp -qqf
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
******** SERVER ********
diff --git a/test/stderr/2135 b/test/stderr/2135
index a818a45..d1bcefb 100644
--- a/test/stderr/2135
+++ b/test/stderr/2135
@@ -40,7 +40,7 @@ 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 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
local-accept-delivery forking for tls-proxy-interproc
postfork: tls-proxy-interproc
tls-proxy-interproc forking for tls-proxy
@@ -79,12 +79,12 @@ ok=1 send_quit=1 send_rset=0 continue_more=0 yield=0 first_address is NULL
cmd buf flush ddd bytes
SMTP(close)>>
local-accept-delivery forked for transport: npppp
->>>>>>>>>>>>>>>> Exim pid=pppp (TLS proxy) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>>
Leaving t1 transport
LOG: MAIN
=> userb@??? R=client T=t1 H=127.0.0.1 [127.0.0.1]:1225 X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmaY-0005vi-00"
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
******** SERVER ********
diff --git a/test/stderr/2200 b/test/stderr/2200
index a0ea3d1..667c71b 100644
--- a/test/stderr/2200
+++ b/test/stderr/2200
@@ -24,7 +24,7 @@ fresh-exec forked for fakens-search: npppp
cached data used for lookup of a=localhost.test.ex
lookup yielded: 127.0.0.1
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main: expansion test) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
@@ -59,4 +59,4 @@ LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/2201 b/test/stderr/2201
index a21b3e9..405818c 100644
--- a/test/stderr/2201
+++ b/test/stderr/2201
@@ -153,7 +153,7 @@ routed by r2 router
envelope to: unknown@???
transport: local_delivery
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -198,7 +198,7 @@ LOG: MAIN
<= a@??? U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
******** SERVER ********
Exim version x.yz ....
@@ -217,29 +217,29 @@ ppppp exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on
ppppp daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
ppppp Listening...
ppppp Connection request from 127.0.0.1 port sssss
-ppppp fresh-exec forking for daemon accept
-ppppp postfork: daemon accept
+ppppp daemon forking for daemon-accept
+ppppp postfork: daemon-accept
ppppp Process ppppp is handling incoming connection from [127.0.0.1]
ppppp Process ppppp is ready for new message
-ppppp daemon accept forking for fakens-search
+ppppp daemon-accept forking for fakens-search
ppppp postfork: fakens-search
-ppppp fresh-exec forked for daemon accept: npppp
+ppppp daemon forked for daemon-accept: npppp
ppppp 1 SMTP accept process running
ppppp Listening...
-ppppp daemon accept forked for fakens-search: npppp
-ppppp daemon accept forking for fakens-search
+ppppp daemon-accept forked for fakens-search: npppp
+ppppp daemon-accept forking for fakens-search
ppppp postfork: fakens-search
-ppppp daemon accept forked for fakens-search: npppp
+ppppp daemon-accept forked for fakens-search: npppp
ppppp dnslists check: rbl.test.ex/V4NET.11.12.14
ppppp new DNS lookup for 14.12.11.V4NET.rbl.test.ex
-ppppp daemon accept forking for fakens-search
+ppppp daemon-accept forking for fakens-search
ppppp postfork: fakens-search
-ppppp daemon accept forked for fakens-search: npppp
+ppppp daemon-accept forked for fakens-search: npppp
ppppp dnslists: wrote cache entry, ttl=2
ppppp DNS lookup for 14.12.11.V4NET.rbl.test.ex succeeded (yielding 127.0.0.2)
-ppppp daemon accept forking for fakens-search
+ppppp daemon-accept forking for fakens-search
ppppp postfork: fakens-search
-ppppp daemon accept forked for fakens-search: npppp
+ppppp daemon-accept forked for fakens-search: npppp
ppppp => that means V4NET.11.12.14 is listed at rbl.test.ex
ppppp dnslists check: rbl.test.ex/V4NET.11.12.14
ppppp dnslists: using result of previous lookup
@@ -247,26 +247,26 @@ ppppp DNS lookup for 14.12.11.V4NET.rbl.test.ex succeeded (yielding 127.0.0.2)
ppppp => that means V4NET.11.12.14 is listed at rbl.test.ex
ppppp dnslists check: rbl.test.ex/V4NET.11.12.14
ppppp cached data found but past valid time; new DNS lookup for 14.12.11.V4NET.rbl.test.ex
-ppppp daemon accept forking for fakens-search
+ppppp daemon-accept forking for fakens-search
ppppp postfork: fakens-search
-ppppp daemon accept forked for fakens-search: npppp
+ppppp daemon-accept forked for fakens-search: npppp
ppppp dnslists: wrote cache entry, ttl=2
ppppp DNS lookup for 14.12.11.V4NET.rbl.test.ex succeeded (yielding 127.0.0.2)
-ppppp daemon accept forking for fakens-search
+ppppp daemon-accept forking for fakens-search
ppppp postfork: fakens-search
-ppppp daemon accept forked for fakens-search: npppp
+ppppp daemon-accept forked for fakens-search: npppp
ppppp => that means V4NET.11.12.14 is listed at rbl.test.ex
ppppp LOG: MAIN
ppppp <= a@??? H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@???
ppppp Process ppppp is ready for new message
ppppp LOG: smtp_connection MAIN
ppppp SMTP connection from localhost (myhost.test.ex) [127.0.0.1] closed by QUIT
-ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (conn-setup) terminating with rc=0 >>>>>>>>>>>>>>>>
+ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>>
ppppp child ppppp ended: status=0x0
ppppp normal exit, 0
ppppp 0 SMTP accept processes now running
ppppp Listening...
-ppppp fresh-exec forking for daemon-del-pidfile
+ppppp daemon forking for daemon-del-pidfile
ppppp postfork: daemon-del-pidfile
-ppppp fresh-exec forked for daemon-del-pidfile: npppp
+ppppp daemon forked for daemon-del-pidfile: npppp
ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/2202 b/test/stderr/2202
index 35fc2eb..ab32906 100644
--- a/test/stderr/2202
+++ b/test/stderr/2202
@@ -94,4 +94,4 @@ SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from the.local.host.name [ip4.ip4.ip4.ip4] closed by QUIT
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/2600 b/test/stderr/2600
index 94b4949..8fe5708 100644
--- a/test/stderr/2600
+++ b/test/stderr/2600
@@ -104,7 +104,7 @@ dropping to exim gid; retaining priv uid
in TESTSUITE/aux-fixed/sqlitedb
lookup yielded: name=it's id=its
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main: expansion test) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
@@ -199,7 +199,7 @@ SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from [10.0.0.0] closed by QUIT
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
@@ -284,7 +284,7 @@ SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from [10.10.10.10] closed by QUIT
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
@@ -477,9 +477,9 @@ LOG: MAIN
end delivery of 10HmaX-0005vi-00
search_tidyup called
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
@@ -494,4 +494,4 @@ dropping to exim gid; retaining priv uid
in TESTSUITE/aux-fixed/sqlitedb
lookup yielded: Ayen Other
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main: expansion test) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/2610 b/test/stderr/2610
index 6403d28..c217e6f 100644
--- a/test/stderr/2610
+++ b/test/stderr/2610
@@ -210,7 +210,7 @@ search_tidyup called
close MYSQL connection: localhost(TESTSUITE/mysql/sock)/test/root
close MYSQL connection: ip4.ip4.ip4.ip4:1223/test/root
close MYSQL connection: 127.0.0.1:1223/test/root
->>>>>>>>>>>>>>>> Exim pid=pppp (main: expansion test) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
@@ -277,7 +277,7 @@ LOG: smtp_connection MAIN
SMTP connection from [10.0.0.0] closed by QUIT
search_tidyup called
close MYSQL connection: 127.0.0.1:1223/test/root
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
@@ -474,6 +474,6 @@ LOG: MAIN
end delivery of 10HmaX-0005vi-00
search_tidyup called
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/2620 b/test/stderr/2620
index 1894744..5d57abe 100644
--- a/test/stderr/2620
+++ b/test/stderr/2620
@@ -200,7 +200,7 @@ dropping to exim gid; retaining priv uid
search_tidyup called
close PGSQL connection: (TESTSUITE/pgsql/.s.PGSQL.1223)/test/CALLER
close PGSQL connection: localhost:1223/test/CALLER
->>>>>>>>>>>>>>>> Exim pid=pppp (main: expansion test) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
@@ -295,7 +295,7 @@ LOG: smtp_connection MAIN
SMTP connection from [10.0.0.0] closed by QUIT
search_tidyup called
close PGSQL connection: localhost:1223/test/CALLER
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
@@ -492,9 +492,9 @@ LOG: MAIN
end delivery of 10HmaX-0005vi-00
search_tidyup called
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
@@ -511,6 +511,6 @@ dropping to exim gid; retaining priv uid
lookup yielded: Philip Hazel
search_tidyup called
close PGSQL connection: (TESTSUITE/pgsql/.s.PGSQL.1223)/test/CALLER
->>>>>>>>>>>>>>>> Exim pid=pppp (main: expansion test) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
******** SERVER ********
diff --git a/test/stderr/3000 b/test/stderr/3000
index 49b5e51..0996e34 100644
--- a/test/stderr/3000
+++ b/test/stderr/3000
@@ -43,7 +43,7 @@ LOG: MAIN
log from Perl
├──expanding: ${perl{log_write}{log from Perl}}
╰─────result: Wrote log
->>>>>>>>>>>>>>>> Exim pid=pppp (main: expansion test) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: smtp_connection MAIN
SMTP connection from CALLER
LOG: MAIN
diff --git a/test/stderr/3201 b/test/stderr/3201
index 333afbc..31f3469 100644
--- a/test/stderr/3201
+++ b/test/stderr/3201
@@ -39,7 +39,7 @@ SMTP>> 550 Administrative prohibition
LOG: connection_reject MAIN REJECT
H=[10.0.0.1] rejected connection in "connect" ACL
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
@@ -81,4 +81,4 @@ SMTP>> 550 Administrative prohibition
LOG: connection_reject MAIN REJECT
H=[10.0.0.2] rejected connection in "connect" ACL
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/3210 b/test/stderr/3210
index f76f01e..86ad7e3 100644
--- a/test/stderr/3210
+++ b/test/stderr/3210
@@ -32,4 +32,4 @@ test.ex in "+defer_lookup : test.ex"? list match deferred for +defer_lookup
test.ex in "! +local_domains"? list match deferred for ! +local_domains
domains check lookup or other defer
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=1 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/3212 b/test/stderr/3212
index 3de941e..ed2b4ac 100644
--- a/test/stderr/3212
+++ b/test/stderr/3212
@@ -134,4 +134,4 @@ sender address = CALLER@???
in TESTSUITE/aux-fixed/3212.aliases
lookup yielded: userx
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main: expansion test) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/3400 b/test/stderr/3400
index 9088bef..e5ab777 100644
--- a/test/stderr/3400
+++ b/test/stderr/3400
@@ -468,4 +468,4 @@ SMTP>> 221 myhost.test.ex closing connection
LOG: smtp_connection MAIN
SMTP connection from CALLER closed by QUIT
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/4052 b/test/stderr/4052
index 7d93f2e..f4cbfaa 100644
--- a/test/stderr/4052
+++ b/test/stderr/4052
@@ -69,7 +69,7 @@ LOG: MAIN
=> extchange@??? R=client T=smtp H=127.0.0.1 [127.0.0.1] L* C="250 message accepted"
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
******** SERVER ********
diff --git a/test/stderr/4520 b/test/stderr/4520
index b8f467b..852ef4a 100644
--- a/test/stderr/4520
+++ b/test/stderr/4520
@@ -64,8 +64,8 @@ LOG: MAIN
=> d@??? R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbL-0005vi-00"
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
1999-03-02 09:44:33 10HmaX-0005vi-00 failed to expand dkim_timestamps: unknown variable in "${bogus}"
******** SERVER ********
diff --git a/test/stderr/4802 b/test/stderr/4802
index 6ce47f9..f85cd91 100644
--- a/test/stderr/4802
+++ b/test/stderr/4802
@@ -16,7 +16,7 @@ postfork: fakens-search
fresh-exec forked for fakens-search: npppp
DNS lookup of a-aa.test.ex (A) succeeded
DNS lookup of a-aa.test.ex (A/AAAA) requested AD, but got AA
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
@@ -35,4 +35,4 @@ fresh-exec forking for fakens-search
postfork: fakens-search
fresh-exec forked for fakens-search: npppp
DNS lookup of a-sec.test.ex (A) succeeded
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/4803 b/test/stderr/4803
index 95844dd..46a61ff 100644
--- a/test/stderr/4803
+++ b/test/stderr/4803
@@ -18,7 +18,7 @@ DNS lookup of a-aa.test.ex (A) succeeded
DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *))
DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *))
DNS faked the AD bit (got AA and matched with dns_trust_aa (test.ex in *))
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
@@ -39,4 +39,4 @@ fresh-exec forking for fakens-search
postfork: fakens-search
fresh-exec forked for fakens-search: npppp
DNS lookup of a-sec.test.ex (A) succeeded
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/5000 b/test/stderr/5000
index cecc55a..8d5d1de 100644
--- a/test/stderr/5000
+++ b/test/stderr/5000
@@ -53,5 +53,5 @@ maildir_taggedX_appendfile transport returned DEFER for userx@???
added retry item for T:userx@???: errno=-22 more_errno=dd flags=0
LOG: MAIN
== userx@??? R=localuser T=maildir_taggedX_appendfile defer (-22): mailbox is full (MTA-imposed quota exceeded while writing to tmp/MAILDIR.myhost.test.ex)
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/5004 b/test/stderr/5004
index af04187..fc5dcaa 100644
--- a/test/stderr/5004
+++ b/test/stderr/5004
@@ -107,7 +107,7 @@ data is an Exim filter program
Filter: start of processing
Filter: end of processing
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (rda) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (router-interpret) terminating with rc=0 >>>>>>>>>>>>>>>>
local-accept-delivery forked for router-interpret: npppp
rda_interpret: subprocess yield=0 error=NULL
set transport t1
@@ -210,6 +210,6 @@ LOG: MAIN
end delivery of 10HmaX-0005vi-00
search_tidyup called
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/5005 b/test/stderr/5005
index 5a8e846..c6a8dfd 100644
--- a/test/stderr/5005
+++ b/test/stderr/5005
@@ -190,9 +190,9 @@ LOG: MAIN
end delivery of 10HmaX-0005vi-00
search_tidyup called
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
@@ -385,9 +385,9 @@ LOG: MAIN
end delivery of 10HmaY-0005vi-00
search_tidyup called
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
@@ -589,9 +589,9 @@ Size of headers = sss
end delivery of 10HmaZ-0005vi-00
search_tidyup called
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
@@ -788,6 +788,6 @@ Size of headers = sss
end delivery of 10HmbA-0005vi-00
search_tidyup called
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/5006 b/test/stderr/5006
index 7fad8dc..29c492a 100644
--- a/test/stderr/5006
+++ b/test/stderr/5006
@@ -188,6 +188,6 @@ LOG: MAIN
end delivery of 10HmaX-0005vi-00
search_tidyup called
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/5008 b/test/stderr/5008
index 0bcd835..de69eea 100644
--- a/test/stderr/5008
+++ b/test/stderr/5008
@@ -42,8 +42,8 @@ LOG: MAIN
=> userx <userx@???> R=r1 T=t1
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
@@ -89,5 +89,5 @@ LOG: MAIN
=> userx <userx@???> R=r1 T=t1
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/5204 b/test/stderr/5204
index 6bc1229..6f4b0ee 100644
--- a/test/stderr/5204
+++ b/test/stderr/5204
@@ -23,7 +23,7 @@ command wrote: DECLINE cannot route this one (DECLINE)
q router declined for "DECLINE cannot route this one (DECLINE)"@???
"more" is false: skipping remaining routers
no more routers
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=2 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
@@ -45,7 +45,7 @@ postfork: queryprogram-cmd
fresh-exec forked for queryprogram-cmd: npppp
command wrote: FAIL cannot route this one (FAIL)
q router forced address failure
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=2 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
@@ -70,7 +70,7 @@ LOG: PANIC
q router: bad command yield: ERROR cannot route this one (ERROR)
q router: defer for "ERROR cannot route this one (ERROR)"@???
message: bad command yield: ERROR cannot route this one (ERROR)
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=1 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
@@ -93,7 +93,7 @@ fresh-exec forked for queryprogram-cmd: npppp
command wrote: DEFER cannot route this one (DEFER)
q router: defer for "DEFER cannot route this one (DEFER)"@???
message: cannot route this one (DEFER)
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=1 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
@@ -130,7 +130,7 @@ routed by q router
envelope to: "ACCEPT transport = other_smtp hosts=ten-1.test.ex"@???
transport: other_smtp
host ten-1.test.ex [V4NET.0.0.1]
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
@@ -173,7 +173,7 @@ routed by s router
envelope to: PASS@???
transport: smtp
host 127.0.0.1 [127.0.0.1]
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
@@ -196,7 +196,7 @@ fresh-exec forked for queryprogram-cmd: npppp
command wrote: FREEZE cannot route this one (FREEZE)
q router: defer for "FREEZE cannot route this one (FREEZE)"@???
message: cannot route this one (FREEZE)
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=1 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
@@ -254,7 +254,7 @@ domain = test.ex
routed by pm router
envelope to: postmaster@???
transport: null
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
@@ -304,4 +304,4 @@ LOG: MAIN REJECT
H=(some.name) [V4NET.2.3.4] F=<x@y> rejected RCPT <"FAIL cannot route this one (FAIL)"@???>: cannot route this one (FAIL)
LOG: smtp_connection MAIN
SMTP connection from (some.name) [V4NET.2.3.4] closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/5410 b/test/stderr/5410
index b29fee2..db1df1c 100644
--- a/test/stderr/5410
+++ b/test/stderr/5410
@@ -271,7 +271,7 @@ LOG: MAIN
Completed
LOG: smtp_connection MAIN
SMTP connection from CALLER closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
configuration file is TESTSUITE/test-config
@@ -513,7 +513,7 @@ LOG: MAIN
Completed
LOG: smtp_connection MAIN
SMTP connection from CALLER closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
configuration file is TESTSUITE/test-config
@@ -755,6 +755,6 @@ LOG: MAIN
Completed
LOG: smtp_connection MAIN
SMTP connection from CALLER closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
******** SERVER ********
diff --git a/test/stderr/5420 b/test/stderr/5420
index b06eb8d..9504cd3 100644
--- a/test/stderr/5420
+++ b/test/stderr/5420
@@ -272,7 +272,7 @@ LOG: MAIN
Completed
LOG: smtp_connection MAIN
SMTP connection from CALLER closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
configuration file is TESTSUITE/test-config
@@ -514,7 +514,7 @@ LOG: MAIN
Completed
LOG: smtp_connection MAIN
SMTP connection from CALLER closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
configuration file is TESTSUITE/test-config
@@ -756,6 +756,6 @@ LOG: MAIN
Completed
LOG: smtp_connection MAIN
SMTP connection from CALLER closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
******** SERVER ********
diff --git a/test/stdout/0574 b/test/stdout/0574
index b3a320d..d040970 100644
--- a/test/stdout/0574
+++ b/test/stdout/0574
@@ -58,4 +58,4 @@ LOG: smtp_connection MAIN
SMTP connection from (test.ex) [127.0.0.1] closed by QUIT
search_tidyup called
SMTP>>(close on process exit)
->>>>>>>>>>>>>>>> Exim pid=pppp (conn-setup) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>>
