Gitweb:
https://git.exim.org/exim.git/commitdiff/afd5e75ffc8f64f0ebed1df9dce64793011c14a6
Commit: afd5e75ffc8f64f0ebed1df9dce64793011c14a6
Parent: 19ae9a55a69e9ea19916eabe3879b786725de92a
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Thu Mar 12 17:13:47 2020 +0000
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Thu Mar 12 17:13:47 2020 +0000
Debug: _exit() process-termination
---
src/src/daemon.c | 12 ++++++------
src/src/exim.c | 10 +++++++---
src/src/functions.h | 2 +-
src/src/queue.c | 2 +-
src/src/rda.c | 2 +-
src/src/route.c | 4 ++--
src/src/smtp_in.c | 2 +-
src/src/tls.c | 2 +-
src/src/transport.c | 2 +-
test/stderr/0037 | 1 +
test/stderr/0218 | 11 +++++++++++
test/stderr/0332 | 2 ++
test/stderr/0357 | 3 +++
test/stderr/0358 | 1 +
test/stderr/0360 | 1 +
test/stderr/0377 | 2 ++
test/stderr/0378 | 3 +++
test/stderr/0379 | 1 +
test/stderr/0382 | 1 +
test/stderr/0393 | 1 +
test/stderr/0404 | 1 +
test/stderr/0437 | 2 ++
test/stderr/0450 | 1 +
test/stderr/0476 | 2 ++
test/stderr/0512 | 2 ++
test/stderr/0529 | 1 +
test/stderr/0543 | 2 ++
test/stderr/0609 | 2 ++
test/stderr/2013 | 12 ++++++++++++
test/stderr/2113 | 12 ++++++++++++
test/stderr/2201 | 1 +
test/stderr/5004 | 1 +
test/stdout/0574 | 1 +
33 files changed, 88 insertions(+), 17 deletions(-)
diff --git a/src/src/daemon.c b/src/src/daemon.c
index 2813a50..aa36a5d 100644
--- a/src/src/daemon.c
+++ b/src/src/daemon.c
@@ -418,7 +418,7 @@ if (pid == 0)
"please try again later.\r\n", FALSE);
mac_smtp_fflush();
search_tidyup();
- exim_underbar_exit(EXIT_FAILURE);
+ exim_underbar_exit(EXIT_FAILURE, US"conn-accept");
}
}
else if (*nah) smtp_active_hostname = nah;
@@ -505,7 +505,7 @@ if (pid == 0)
{
mac_smtp_fflush();
search_tidyup();
- exim_underbar_exit(EXIT_SUCCESS);
+ exim_underbar_exit(EXIT_SUCCESS, US"conn-smtp");
}
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);
+ exim_underbar_exit(EXIT_SUCCESS, US"conn-receive");
}
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);
+ exim_underbar_exit(rc ? EXIT_FAILURE : EXIT_SUCCESS, US"conn-setup");
}
/* 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);
+ exim_underbar_exit(EXIT_SUCCESS, US"deliver_msg");
}
if (dpid > 0)
@@ -2221,7 +2221,7 @@ for (;;)
else
#endif
queue_run(NULL, NULL, FALSE);
- exim_underbar_exit(EXIT_SUCCESS);
+ exim_underbar_exit(EXIT_SUCCESS, US"queue-runner");
}
if (pid < 0)
diff --git a/src/src/exim.c b/src/src/exim.c
index 9d87c8d..4e4b6bb 100644
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -727,9 +727,13 @@ exit(rc);
void
-exim_underbar_exit(int rc)
+exim_underbar_exit(int rc, const uschar * process)
{
store_exit();
+DEBUG(D_any)
+ debug_printf(">>>>>>>>>>>>>>>> Exim pid=%d %s%s%sterminating with rc=%d "
+ ">>>>>>>>>>>>>>>>\n", (int)getpid(),
+ process ? "(" : "", process, process ? ") " : "", rc);
_exit(rc);
}
@@ -4607,7 +4611,7 @@ if (msg_action_arg > 0 && msg_action != MSG_LOAD)
else if ((pid = fork()) == 0)
{
(void)deliver_message(argv[i], forced_delivery, deliver_give_up);
- exim_underbar_exit(EXIT_SUCCESS);
+ exim_underbar_exit(EXIT_SUCCESS, US"cmdline-delivery");
}
else if (pid < 0)
{
@@ -5710,7 +5714,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);
+ ? EXIT_SUCCESS : EXIT_FAILURE, US"cmdline-delivery");
}
if (pid < 0)
diff --git a/src/src/functions.h b/src/src/functions.h
index 851cedd..042006f 100644
--- a/src/src/functions.h
+++ b/src/src/functions.h
@@ -225,7 +225,7 @@ extern const uschar * exim_errstr(int);
extern void exim_exit(int, const uschar *) NORETURN;
extern void exim_nullstd(void);
extern void exim_setugid(uid_t, gid_t, BOOL, uschar *);
-extern void exim_underbar_exit(int);
+extern void exim_underbar_exit(int, const uschar *);
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/queue.c b/src/src/queue.c
index 1b70c02..0d5b98f 100644
--- a/src/src/queue.c
+++ b/src/src/queue.c
@@ -652,7 +652,7 @@ for (int i = queue_run_in_order ? -1 : 0;
testharness_pause_ms(100);
(void)close(pfd[pipe_read]);
rc = deliver_message(fq->text, force_delivery, FALSE);
- exim_underbar_exit(rc == DELIVER_NOT_ATTEMPTED);
+ exim_underbar_exit(rc == DELIVER_NOT_ATTEMPTED, US"qrun-delivery");
}
if (pid < 0)
log_write(0, LOG_MAIN|LOG_PANIC_DIE, "fork of delivery process from "
diff --git a/src/src/rda.c b/src/src/rda.c
index 574b86c..547a8bf 100644
--- a/src/src/rda.c
+++ b/src/src/rda.c
@@ -768,7 +768,7 @@ if ((pid = fork()) == 0)
out:
(void)close(fd);
search_tidyup();
- exim_underbar_exit(0);
+ exim_underbar_exit(0, US"rda");
bad:
DEBUG(D_rewrite) debug_printf("rda_interpret: failed write to pipe\n");
diff --git a/src/src/route.c b/src/src/route.c
index 8b43613..fd3cb3e 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);
+ exim_underbar_exit(0, US"route-check-access");
DEBUG(D_route) debug_printf("route_check_access() failed\n");
- exim_underbar_exit(1);
+ exim_underbar_exit(1, US"route-check-access");
}
/* In the parent, wait for the child to finish */
diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index 6062e81..66f752d 100644
--- a/src/src/smtp_in.c
+++ b/src/src/smtp_in.c
@@ -5799,7 +5799,7 @@ while (done <= 0)
}
enq_end(etrn_serialize_key);
- exim_underbar_exit(EXIT_SUCCESS);
+ exim_underbar_exit(EXIT_SUCCESS, US"etrn-serialize-interproc");
}
/* 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 f950912..a0cfcbf 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);
+ exim_underbar_exit(0, NULL);
}
do {
diff --git a/src/src/transport.c b/src/src/transport.c
index 90789fd..3eb1c80 100644
--- a/src/src/transport.c
+++ b/src/src/transport.c
@@ -1272,7 +1272,7 @@ if ((write_pid = fork()) == 0)
!= sizeof(struct timeval)
)
rc = FALSE; /* compiler quietening */
- exim_underbar_exit(0);
+ exim_underbar_exit(0, US"tpt-filter");
}
save_errno = errno;
diff --git a/test/stderr/0037 b/test/stderr/0037
index 5136a8f..098227c 100644
--- a/test/stderr/0037
+++ b/test/stderr/0037
@@ -45,6 +45,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 >>>>>>>>>>>>>>>>
rda_interpret: subprocess yield=0 error=NULL
userfilter router generated userx@???
errors_to=NULL transport=NULL
diff --git a/test/stderr/0218 b/test/stderr/0218
index 5f64add..5d7c1d8 100644
--- a/test/stderr/0218
+++ b/test/stderr/0218
@@ -10,9 +10,11 @@ looking in TESTSUITE/spool//input
delivering 10HmaX-0005vi-00 (queue run pid ppppp)
R: client (ACL)
T: send_to_server (ACL)
+>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
delivering 10HmaY-0005vi-00 (queue run pid ppppp)
R: client (ACL)
T: send_to_server (ACL)
+>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
queue running combined directories
looking in TESTSUITE/spool//input
delivering 10HmaX-0005vi-00 (queue run pid ppppp)
@@ -36,6 +38,7 @@ LOG: MAIN
=> a@??? 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 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -74,9 +77,11 @@ looking in TESTSUITE/spool//input
delivering 10HmaZ-0005vi-00 (queue run pid ppppp)
R: client (ACL)
T: send_to_server (ACL)
+>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
delivering 10HmbA-0005vi-00 (queue run pid ppppp)
R: client (ACL)
T: send_to_server (ACL)
+>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
queue running combined directories
looking in TESTSUITE/spool//input
delivering 10HmaZ-0005vi-00 (queue run pid ppppp)
@@ -106,6 +111,7 @@ LOG: MAIN
>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
Completed
+>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
delivering 10HmbA-0005vi-00 (queue run pid ppppp)
R: client (ACL)
T: send_to_server (ACL)
@@ -114,6 +120,7 @@ LOG: MAIN
H=127.0.0.1 [127.0.0.1] Connection refused
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 >>>>>>>>>>>>>>>>
@@ -126,6 +133,7 @@ LOG: queue_run MAIN
delivering 10HmbA-0005vi-00 (queue run pid ppppp)
R: client (ACL)
T: send_to_server (ACL)
+>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
delivering 10HmbB-0005vi-00 (queue run pid ppppp)
R: bounce (ACL)
LOG: MAIN
@@ -134,9 +142,11 @@ LOG: MAIN
CALLER@???: error ignored
LOG: MAIN
Completed
+>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
delivering 10HmbC-0005vi-00 (queue run pid ppppp)
R: client (ACL)
T: send_to_server (ACL)
+>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
delivering 10HmbA-0005vi-00 (queue run pid ppppp)
R: client (ACL)
T: send_to_server (ACL)
@@ -165,6 +175,7 @@ LOG: MAIN
>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
Completed
+>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
diff --git a/test/stderr/0332 b/test/stderr/0332
index 9c6d99c..549a663 100644
--- a/test/stderr/0332
+++ b/test/stderr/0332
@@ -38,6 +38,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 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -95,6 +96,7 @@ After routing:
Failed addresses:
Deferred addresses:
delay@???
+>>>>>>>>>>>>>>>> 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 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0357 b/test/stderr/0357
index 1cce7c7..bfb5bab 100644
--- a/test/stderr/0357
+++ b/test/stderr/0357
@@ -97,6 +97,7 @@ 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 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: queue_run MAIN
End queue run: pid=pppp
>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -153,6 +154,7 @@ Writing retry data for R:userx@???:<CALLER@???>
first failed=dddd last try=dddd next try=+4 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 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: queue_run MAIN
End queue run: pid=pppp
>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -185,6 +187,7 @@ Failed addresses:
Deferred addresses:
userx@???: no retry items
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 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0358 b/test/stderr/0358
index 398633b..fc46762 100644
--- a/test/stderr/0358
+++ b/test/stderr/0358
@@ -143,6 +143,7 @@ Writing retry data for R:userx@???:<CALLER@???>
first failed=dddd last try=dddd next try=+4 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 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: queue_run MAIN
End queue run: pid=pppp
>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0360 b/test/stderr/0360
index de4b4f2..2308b32 100644
--- a/test/stderr/0360
+++ b/test/stderr/0360
@@ -242,6 +242,7 @@ After routing:
Failed addresses:
Deferred addresses:
defer@???
+>>>>>>>>>>>>>>>> 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 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0377 b/test/stderr/0377
index f395ee3..09a1992 100644
--- a/test/stderr/0377
+++ b/test/stderr/0377
@@ -551,6 +551,7 @@ cccc@??? was previously delivered (t1 transport): discarded
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 >>>>>>>>>>>>>>>>
LOG: queue_run MAIN
End queue run: pid=pppp -qf
>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -795,6 +796,7 @@ cccc@??? was previously delivered (t1 transport): discarded
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 >>>>>>>>>>>>>>>>
LOG: queue_run MAIN
End queue run: pid=pppp -qf
>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0378 b/test/stderr/0378
index dec0651..1fa21a3 100644
--- a/test/stderr/0378
+++ b/test/stderr/0378
@@ -44,6 +44,7 @@ text "This is an autoreply"' (tainted)
data is an Exim filter program
Filter: start of processing
Filter: end of processing
+>>>>>>>>>>>>>>>> Exim pid=pppp (rda) terminating with rc=0 >>>>>>>>>>>>>>>>
rda_interpret: subprocess yield=0 error=NULL
set transport t3
aaaa router generated >CALLER@???
@@ -234,6 +235,7 @@ text "This is an autoreply"' (tainted)
data is an Exim filter program
Filter: start of processing
Filter: end of processing
+>>>>>>>>>>>>>>>> Exim pid=pppp (rda) terminating with rc=0 >>>>>>>>>>>>>>>>
rda_interpret: subprocess yield=0 error=NULL
set transport t3
aaaa router generated >CALLER@???
@@ -300,6 +302,7 @@ After routing:
Deferred addresses:
defer_aaaa@???
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 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0379 b/test/stderr/0379
index 7c0f0b9..d4d49f0 100644
--- a/test/stderr/0379
+++ b/test/stderr/0379
@@ -168,6 +168,7 @@ After routing:
Deferred addresses:
defer@???
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 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0382 b/test/stderr/0382
index 24fd7b7..cf2af99 100644
--- a/test/stderr/0382
+++ b/test/stderr/0382
@@ -50,6 +50,7 @@ LOG: MAIN
cancelled by timeout_frozen_after
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 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0393 b/test/stderr/0393
index 81ffa5e..5640078 100644
--- a/test/stderr/0393
+++ b/test/stderr/0393
@@ -31,6 +31,7 @@ writing data block fd=dddd size=sss timeout=0
process pppp running as transport filter: fd_write=dddd fd_read=dddd
cannot use sendfile for body: spoolfile not wireformat
writing data block fd=dddd size=sss timeout=0
+>>>>>>>>>>>>>>>> Exim pid=pppp (tpt-filter) terminating with rc=0 >>>>>>>>>>>>>>>>
process pppp writing to transport filter
copying from the filter
waiting for filter process
diff --git a/test/stderr/0404 b/test/stderr/0404
index 6ec697b..fc48360 100644
--- a/test/stderr/0404
+++ b/test/stderr/0404
@@ -205,6 +205,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 >>>>>>>>>>>>>>>>
rda_interpret: subprocess yield=0 error=NULL
set transport t1
r2 router generated >sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???, ...
diff --git a/test/stderr/0437 b/test/stderr/0437
index 6bbf6b7..ce327a3 100644
--- a/test/stderr/0437
+++ b/test/stderr/0437
@@ -46,6 +46,7 @@ LOG: MAIN
LOG: MAIN
Completed
search_tidyup called
+>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
search_tidyup called
search_open: lsearch "TESTSUITE/aux-fixed/0437.ls"
search_find: file="TESTSUITE/aux-fixed/0437.ls"
@@ -77,6 +78,7 @@ LOG: MAIN
LOG: MAIN
Completed
search_tidyup called
+>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: queue_run MAIN
End queue run: pid=pppp
search_tidyup called
diff --git a/test/stderr/0450 b/test/stderr/0450
index 7edba53..1328002 100644
--- a/test/stderr/0450
+++ b/test/stderr/0450
@@ -57,6 +57,7 @@ already listed for 127.0.0.1
Leaving t1 transport
LOG: MAIN
== userx@??? R=r1 T=t1 defer (dd): Connection refused
+>>>>>>>>>>>>>>>> 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 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0476 b/test/stderr/0476
index 9c6466e..b2b69b3 100644
--- a/test/stderr/0476
+++ b/test/stderr/0476
@@ -102,6 +102,7 @@ set_process_info: pppp tidying up after delivering 10HmaZ-0005vi-00
>>>>>>>>>>>>>>>> Exim pid=pppp (main) 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
@@ -127,6 +128,7 @@ set_process_info: pppp delivering 10HmaY-0005vi-00
LOG: retry_defer MAIN
== usery@??? R=r1 T=t1 defer (-53): retry time not reached for any host for 'test.ex'
set_process_info: pppp tidying up after delivering 10HmaY-0005vi-00
+>>>>>>>>>>>>>>>> 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
LOG: queue_run MAIN
diff --git a/test/stderr/0512 b/test/stderr/0512
index ed39fb9..f0fa5a2 100644
--- a/test/stderr/0512
+++ b/test/stderr/0512
@@ -82,6 +82,7 @@ LOG: MAIN
>>>>>>>>>>>>>>>> Exim pid=pppp (main) 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 >>>>>>>>>>>>>>>>
@@ -149,6 +150,7 @@ LOG: MAIN
>>>>>>>>>>>>>>>> Exim pid=pppp (main) 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 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0529 b/test/stderr/0529
index 63f3bcf..b956254 100644
--- a/test/stderr/0529
+++ b/test/stderr/0529
@@ -84,6 +84,7 @@ Deferred addresses:
TESTSUITE/test-mail/rmbox: no retry items
x@???: no retry items
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 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0543 b/test/stderr/0543
index 9dd563e..c288de9 100644
--- a/test/stderr/0543
+++ b/test/stderr/0543
@@ -37,6 +37,7 @@ LOG: MAIN
=> userx@domain1 R=smarthost T=smtp H=thisloop.test.ex [127.0.0.1] C="250 OK"
LOG: MAIN
Completed
+>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: usery@domain1
@@ -50,6 +51,7 @@ After routing:
Failed addresses:
Deferred addresses:
usery@domain1
+>>>>>>>>>>>>>>>> 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 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0609 b/test/stderr/0609
index fcae263..3fb905b 100644
--- a/test/stderr/0609
+++ b/test/stderr/0609
@@ -29,6 +29,7 @@ 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 child ppppp ended: status=0x0
ppppp normal exit, 0
ppppp 0 SMTP accept processes now running
@@ -49,6 +50,7 @@ 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 child ppppp ended: status=0x100
ppppp normal exit, 1
ppppp 0 SMTP accept processes now running
diff --git a/test/stderr/2013 b/test/stderr/2013
index 32af8a3..77d2774 100644
--- a/test/stderr/2013
+++ b/test/stderr/2013
@@ -4,6 +4,9 @@ admin user
dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp -qqf
+>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
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
@@ -36,6 +39,7 @@ LOG: MAIN
=> userx@??? 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=10HmbA-0005vi-00"
LOG: MAIN
Completed
+>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -86,6 +90,9 @@ admin user
dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp -qqf
+>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
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
@@ -118,6 +125,7 @@ LOG: MAIN
=> usera@??? 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 DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbG-0005vi-00"
LOG: MAIN
Completed
+>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -168,6 +176,9 @@ admin user
dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp -qqf
+>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
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
@@ -209,6 +220,7 @@ LOG: MAIN
=> userx@??? 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=10HmbM-0005vi-00"
LOG: MAIN
Completed
+>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
diff --git a/test/stderr/2113 b/test/stderr/2113
index 77ed3fe..b242d3f 100644
--- a/test/stderr/2113
+++ b/test/stderr/2113
@@ -4,6 +4,9 @@ admin user
dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp -qqf
+>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
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
@@ -36,6 +39,7 @@ LOG: MAIN
=> userx@??? 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=10HmbA-0005vi-00"
LOG: MAIN
Completed
+>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -86,6 +90,9 @@ admin user
dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp -qqf
+>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
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
@@ -118,6 +125,7 @@ LOG: MAIN
=> usera@??? 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 DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbG-0005vi-00"
LOG: MAIN
Completed
+>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
@@ -168,6 +176,9 @@ admin user
dropping to exim gid; retaining priv uid
LOG: queue_run MAIN
Start queue run: pid=pppp -qqf
+>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
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
@@ -209,6 +220,7 @@ LOG: MAIN
=> userx@??? 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=10HmbM-0005vi-00"
LOG: MAIN
Completed
+>>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
diff --git a/test/stderr/2201 b/test/stderr/2201
index 34426ed..5cbdbc0 100644
--- a/test/stderr/2201
+++ b/test/stderr/2201
@@ -225,6 +225,7 @@ ppppp <= a@??? H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp
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 child ppppp ended: status=0x0
ppppp normal exit, 0
ppppp 0 SMTP accept processes now running
diff --git a/test/stderr/5004 b/test/stderr/5004
index c3e489a..c4dc1b0 100644
--- a/test/stderr/5004
+++ b/test/stderr/5004
@@ -102,6 +102,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 >>>>>>>>>>>>>>>>
rda_interpret: subprocess yield=0 error=NULL
set transport t1
r1 router generated TESTSUITE/test-mail
diff --git a/test/stdout/0574 b/test/stdout/0574
index a8cd7cf..b3a320d 100644
--- a/test/stdout/0574
+++ b/test/stdout/0574
@@ -58,3 +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 >>>>>>>>>>>>>>>>
