Gitweb:
https://git.exim.org/exim.git/commitdiff/eb24befc3e9ad0a36ef8f0bc3527a9bc6c923a7b
Commit: eb24befc3e9ad0a36ef8f0bc3527a9bc6c923a7b
Parent: 568092148bf6ade68174fa1ccf34b8c37d9064e9
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Fri Mar 20 14:44:07 2020 +0000
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Sun Mar 22 20:13:21 2020 +0000
child-open debug
---
src/src/child.c | 14 ++--
src/src/dns.c | 5 +-
src/src/expand.c | 3 +-
src/src/functions.h | 12 ++-
src/src/local_scan.h | 3 +-
src/src/routers/queryprogram.c | 6 +-
src/src/transport.c | 6 +-
src/src/transports/lmtp.c | 6 +-
src/src/transports/pipe.c | 3 +-
test/confs/0366 | 4 +-
test/stderr/0002 | 36 ++++-----
test/stderr/0044 | 18 ++---
test/stderr/0078 | 120 ++++++++++++++---------------
test/stderr/0094 | 30 ++++----
test/stderr/0117 | 126 +++++++++++++++----------------
test/stderr/0161 | 168 ++++++++++++++++++++---------------------
test/stderr/0183 | 126 +++++++++++++++----------------
test/stderr/0277 | 24 +++---
test/stderr/0278 | 18 ++---
test/stderr/0283 | 6 +-
test/stderr/0315 | 42 +++++------
test/stderr/0360 | 30 ++++----
test/stderr/0361 | 24 +++---
test/stderr/0364 | 54 ++++++-------
test/stderr/0368 | 102 ++++++++++++-------------
test/stderr/0370 | 6 +-
test/stderr/0374 | 12 +--
test/stderr/0375 | 12 +--
test/stderr/0378 | 6 +-
test/stderr/0381 | 30 ++++----
test/stderr/0386 | 12 +--
test/stderr/0393 | 6 +-
test/stderr/0419 | 30 ++++----
test/stderr/0426 | 18 ++---
test/stderr/0463 | 48 ++++++------
test/stderr/0469 | 12 +--
test/stderr/0499 | 24 +++---
test/stderr/0543 | 12 +--
test/stderr/0545 | 66 ++++++++--------
test/stderr/1006 | 78 +++++++++----------
test/stderr/2135 | 8 +-
test/stderr/2200 | 18 ++---
test/stderr/2201 | 66 ++++++++--------
test/stderr/2202 | 24 +++---
test/stderr/4520 | 6 +-
test/stderr/4802 | 36 ++++-----
test/stderr/4803 | 36 ++++-----
test/stderr/5204 | 66 ++++++++--------
test/stdout/0366 | 2 +-
49 files changed, 817 insertions(+), 803 deletions(-)
diff --git a/src/src/child.c b/src/src/child.c
index 13d177c..3aa6962 100644
--- a/src/src/child.c
+++ b/src/src/child.c
@@ -75,7 +75,7 @@ int n = 0;
int extra = pcount ? *pcount : 0;
uschar **argv;
-argv = store_get((extra + acount + MAX_CLMACROS + 19) * sizeof(char *), FALSE);
+argv = store_get((extra + acount + MAX_CLMACROS + 21) * sizeof(char *), FALSE);
/* In all case, the list starts out with the path, any macros, and a changed
config file. */
@@ -313,6 +313,7 @@ Arguments:
process is placed
wd if not NULL, a path to be handed to chdir() in the new process
make_leader if TRUE, make the new process a process group leader
+ purpose for debug: reason for running the task
Returns: the pid of the created process or -1 if anything has gone wrong
*/
@@ -320,7 +321,7 @@ Returns: the pid of the created process or -1 if anything has gone wrong
pid_t
child_open_uid(const uschar **argv, const uschar **envp, int newumask,
uid_t *newuid, gid_t *newgid, int *infdptr, int *outfdptr, uschar *wd,
- BOOL make_leader)
+ BOOL make_leader, const uschar * purpose)
{
int save_errno;
int inpfd[2], outpfd[2];
@@ -341,7 +342,7 @@ that the child process can be waited for. We sometimes get here with it set
otherwise. Save the old state for resetting on the wait. */
oldsignal = signal(SIGCHLD, SIG_DFL);
-pid = exim_fork(US"child-open");
+pid = exim_fork(purpose);
/* Handle the child process. First, set the required environment. We must do
this before messing with the pipes, in order to be able to write debugging
@@ -454,16 +455,17 @@ Arguments:
outfdptr pointer to int into which the fd of the stdout/stderr of the new
process is placed
make_leader if TRUE, make the new process a process group leader
+ purpose for debug: reason for running the task
Returns: the pid of the created process or -1 if anything has gone wrong
*/
pid_t
-child_open(uschar **argv, uschar **envp, int newumask, int *infdptr,
- int *outfdptr, BOOL make_leader)
+child_open_function(uschar **argv, uschar **envp, int newumask, int *infdptr,
+ int *outfdptr, BOOL make_leader, const uschar * purpose)
{
return child_open_uid(CUSS argv, CUSS envp, newumask, NULL, NULL,
- infdptr, outfdptr, NULL, make_leader);
+ infdptr, outfdptr, NULL, make_leader, purpose);
}
diff --git a/src/src/dns.c b/src/src/dns.c
index 6333d3c..d036162 100644
--- a/src/src/dns.c
+++ b/src/src/dns.c
@@ -60,7 +60,8 @@ if (stat(CS utilname, &statbuf) >= 0)
int infd, outfd, rc;
uschar *argv[5];
- DEBUG(D_dns) debug_printf("DNS lookup of %s (%s) using fakens\n", name, dns_text_type(type));
+ DEBUG(D_dns) debug_printf("DNS lookup of %s (%s) using fakens\n",
+ name, dns_text_type(type));
argv[0] = utilname;
argv[1] = config_main_directory;
@@ -68,7 +69,7 @@ if (stat(CS utilname, &statbuf) >= 0)
argv[3] = dns_text_type(type);
argv[4] = NULL;
- pid = child_open(argv, NULL, 0000, &infd, &outfd, FALSE);
+ pid = child_open(argv, NULL, 0000, &infd, &outfd, FALSE, US"fakens-search");
if (pid < 0)
log_write(0, LOG_MAIN|LOG_PANIC_DIE, "failed to run fakens: %s",
strerror(errno));
diff --git a/src/src/expand.c b/src/src/expand.c
index 4377ea1..fddad31 100644
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -5624,7 +5624,8 @@ while (*s != 0)
/* Create the child process, making it a group leader. */
- if ((pid = child_open(USS argv, NULL, 0077, &fd_in, &fd_out, TRUE)) < 0)
+ if ((pid = child_open(USS argv, NULL, 0077, &fd_in, &fd_out, TRUE,
+ US"expand-run")) < 0)
{
expand_string_message =
string_sprintf("couldn't create child process: %s", strerror(errno));
diff --git a/src/src/functions.h b/src/src/functions.h
index a44e7a8..9e5bba9 100644
--- a/src/src/functions.h
+++ b/src/src/functions.h
@@ -153,8 +153,11 @@ extern uschar **child_exec_exim(int, BOOL, int *, BOOL, int, ...);
extern pid_t child_open_exim_function(int *, const uschar *);
extern pid_t child_open_exim2_function(int *, uschar *, uschar *,
const uschar *);
+extern pid_t child_open_function(uschar **argv, uschar **envp, int newumask,
+ int *infdptr, int *outfdptr, BOOL make_leader,
+ const uschar * purpose);
extern pid_t child_open_uid(const uschar **, const uschar **, int,
- uid_t *, gid_t *, int *, int *, uschar *, BOOL);
+ uid_t *, gid_t *, int *, int *, uschar *, BOOL, const uschar *);
extern BOOL cleanup_environment(void);
extern void cutthrough_data_puts(uschar *, int);
extern void cutthrough_data_put_nl(void);
@@ -1142,6 +1145,13 @@ child_open_exim2(int * fdptr, uschar * sender,
uschar * sender_auth, const uschar * purpose)
{ return child_open_exim2_function(fdptr, sender, sender_auth, purpose); }
+static inline pid_t
+child_open(uschar **argv, uschar **envp, int newumask, int *infdptr,
+ int *outfdptr, BOOL make_leader, const uschar * purpose)
+{ return child_open_function(argv, envp, newumask, infdptr,
+ outfdptr, make_leader, purpose);
+}
+
/******************************************************************************/
#endif /* !MACRO_PREDEF */
diff --git a/src/src/local_scan.h b/src/src/local_scan.h
index bb131d3..b92be56 100644
--- a/src/src/local_scan.h
+++ b/src/src/local_scan.h
@@ -181,7 +181,6 @@ extern BOOL smtp_input; /* TRUE if input is via SMTP */
/* Functions that are documented as visible in local_scan(). */
extern int child_close(pid_t, int);
-extern pid_t child_open(uschar **, uschar **, int, int *, int *, BOOL);
extern void debug_printf(const char *, ...) PRINTF_FUNCTION(1,2);
extern uschar *expand_string(uschar *);
extern void header_add(int, const char *, ...);
@@ -225,12 +224,14 @@ with the original name. */
# define string_copy_taint(s, t) string_copy_taint_function((s), (t))
# define child_open_exim(p) child_open_exim_function((p), US"from local_scan")
# define child_open_exim2(p, s, a) child_open_exim2_function((p), (s), (a), US"from local_scan")
+# define child_open(a,e,u,i,o,l) child_open_function((a),(e),(u),(i),(o),(l),US"from local_scan")
extern uschar * string_copy_function(const uschar *);
extern uschar * string_copyn_function(const uschar *, int n);
extern uschar * string_copy_taint_function(const uschar *, BOOL tainted);
extern pid_t child_open_exim_function(int *, const uschar *);
extern pid_t child_open_exim2_function(int *, uschar *, uschar *, const uschar *);
+extern pid_t child_open_function(uschar **, uschar **, int, int *, int *, BOOL, const uschar *);
#endif
/* End of local_scan.h */
diff --git a/src/src/routers/queryprogram.c b/src/src/routers/queryprogram.c
index 107632f..767dc71 100644
--- a/src/src/routers/queryprogram.c
+++ b/src/src/routers/queryprogram.c
@@ -308,10 +308,8 @@ if (!transport_set_up_command(&argvptr, /* anchor for arg list */
/* Create the child process, making it a group leader. */
-pid = child_open_uid(argvptr, NULL, 0077, puid, pgid, &fd_in, &fd_out,
- current_directory, TRUE);
-
-if (pid < 0)
+if ((pid = child_open_uid(argvptr, NULL, 0077, puid, pgid, &fd_in, &fd_out,
+ current_directory, TRUE, US"queryprogram-cmd")) < 0)
{
addr->message = string_sprintf("%s router couldn't create child process: %s",
rblock->name, strerror(errno));
diff --git a/src/src/transport.c b/src/src/transport.c
index e5a7385..6b33a0e 100644
--- a/src/src/transport.c
+++ b/src/src/transport.c
@@ -1234,10 +1234,10 @@ write_pid = (pid_t)(-1);
{
int bits = fcntl(tctx->u.fd, F_GETFD);
- (void)fcntl(tctx->u.fd, F_SETFD, bits | FD_CLOEXEC);
+ (void) fcntl(tctx->u.fd, F_SETFD, bits | FD_CLOEXEC);
filter_pid = child_open(USS transport_filter_argv, NULL, 077,
- &fd_write, &fd_read, FALSE);
- (void)fcntl(tctx->u.fd, F_SETFD, bits & ~FD_CLOEXEC);
+ &fd_write, &fd_read, FALSE, US"transport-filter");
+ (void) fcntl(tctx->u.fd, F_SETFD, bits & ~FD_CLOEXEC);
}
if (filter_pid < 0) goto TIDY_UP; /* errno set */
diff --git a/src/src/transports/lmtp.c b/src/src/transports/lmtp.c
index 32c5716..517a134 100644
--- a/src/src/transports/lmtp.c
+++ b/src/src/transports/lmtp.c
@@ -500,7 +500,8 @@ if (ob->cmd)
uid/gid and current directory. Request that the new process be a process group
leader, so we can kill it and all its children on an error. */
- if ((pid = child_open(USS argv, NULL, 0, &fd_in, &fd_out, TRUE)) < 0)
+ if ((pid = child_open(USS argv, NULL, 0, &fd_in, &fd_out, TRUE,
+ US"lmtp-tpt-cmd")) < 0)
{
addrlist->message = string_sprintf(
"Failed to create child process for %s transport: %s", tblock->name,
@@ -514,8 +515,7 @@ leader, so we can kill it and all its children on an error. */
else
{
DEBUG(D_transport) debug_printf("using socket %s\n", ob->skt);
- sockname = expand_string(ob->skt);
- if (sockname == NULL)
+ if (!(sockname = expand_string(ob->skt)))
{
addrlist->message = string_sprintf("Expansion of \"%s\" (socket setting "
"for %s transport) failed: %s", ob->skt, tblock->name,
diff --git a/src/src/transports/pipe.c b/src/src/transports/pipe.c
index 83272d8..c1e2b26 100644
--- a/src/src/transports/pipe.c
+++ b/src/src/transports/pipe.c
@@ -725,7 +725,8 @@ reading of the output pipe. */
uid/gid and current directory. Request that the new process be a process group
leader, so we can kill it and all its children on a timeout. */
-if ((pid = child_open(USS argv, envp, ob->umask, &fd_in, &fd_out, TRUE)) < 0)
+if ((pid = child_open(USS argv, envp, ob->umask, &fd_in, &fd_out, TRUE,
+ US"pipe-tpt-cmd")) < 0)
{
addr->transport_return = DEFER;
addr->message = string_sprintf(
diff --git a/test/confs/0366 b/test/confs/0366
index 12e47cd..84ac2e3 100644
--- a/test/confs/0366
+++ b/test/confs/0366
@@ -39,7 +39,7 @@ smtp:
begin retry
-^[^@]+@ten- * F,3s,1s
-* * F,3s,1s
+^[^@]+@ten- * F,4s,1s
+* * F,4s,1s
# End
diff --git a/test/stderr/0002 b/test/stderr/0002
index 665a762..1d0ac43 100644
--- a/test/stderr/0002
+++ b/test/stderr/0002
@@ -255,16 +255,16 @@ dropping to exim gid; retaining priv uid
╰─────result: ----> No lookup yet: No
╭considering: -oMs sender_host_name = $sender_host_name
looking up host name for V4NET.0.0.1
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
IP address lookup yielded "ten-1.test.ex"
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx
checking addresses for ten-1.test.ex
V4NET.0.0.1 OK
@@ -305,18 +305,18 @@ check hosts = <\n partial-lsearch;TESTSUITE/aux-fixed/0002.lsearch \n 1.2.3.4
sender host name required, to match against partial-lsearch;TESTSUITE/aux-fixed/0002.lsearch
looking up host name for V4NET.0.0.1
DNS lookup of 1.0.0.V4NET.in-addr.arpa (PTR) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of 1.0.0.V4NET.in-addr.arpa (PTR) succeeded
IP address lookup yielded "ten-1.test.ex"
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of ten-1.test.ex (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of ten-1.test.ex (A) succeeded
ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx
checking addresses for ten-1.test.ex
diff --git a/test/stderr/0044 b/test/stderr/0044
index d52e76e..483c822 100644
--- a/test/stderr/0044
+++ b/test/stderr/0044
@@ -78,16 +78,16 @@ check dnslists = rbl.test.ex
dnslists check: rbl.test.ex
new DNS lookup for 13.12.11.V4NET.rbl.test.ex
DNS lookup of 13.12.11.V4NET.rbl.test.ex (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of 13.12.11.V4NET.rbl.test.ex (A) succeeded
dnslists: wrote cache entry, ttl=3
DNS lookup for 13.12.11.V4NET.rbl.test.ex succeeded (yielding 127.0.0.2)
DNS lookup of 13.12.11.V4NET.rbl.test.ex (TXT) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of 13.12.11.V4NET.rbl.test.ex (TXT) succeeded
=> that means V4NET.11.12.13 is listed at rbl.test.ex
deny: condition test succeeded in ACL "check_recipient"
@@ -244,9 +244,9 @@ check dnslists = rbl.test.ex
dnslists check: rbl.test.ex
new DNS lookup for 99.99.99.V4NET.rbl.test.ex
DNS lookup of 99.99.99.V4NET.rbl.test.ex (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of 99.99.99.V4NET.rbl.test.ex (A) gave HOST_NOT_FOUND
returning DNS_NOMATCH
faking res_search(A) response length as 65535
diff --git a/test/stderr/0078 b/test/stderr/0078
index 26e6cfc..06dd2bd 100644
--- a/test/stderr/0078
+++ b/test/stderr/0078
@@ -10,27 +10,27 @@ checking domains
calling lookuphost router
lookuphost router called for xx@???
domain = mxt6.test.ex
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
set transport remote_smtp
queued for remote_smtp transport: local_part = xx
domain = mxt6.test.ex
@@ -53,15 +53,15 @@ checking domains
calling lookuphost router
lookuphost router called for myhost.test.ex@???
domain = mxt1.test.ex
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
lowest numbered MX record points to local host: mxt1.test.ex: passed to next router (self = pass)
lookuphost router passed for myhost.test.ex@???
--------> self router <--------
@@ -77,12 +77,12 @@ expanded list of hosts = 'myhost.test.ex' options = 'byname'
set transport remote_smtp
finding IP address for myhost.test.ex
calling host_find_byname
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
queued for remote_smtp transport: local_part = myhost.test.ex
domain = mxt1.test.ex
errors_to=NULL
@@ -104,15 +104,15 @@ checking domains
calling lookuphost router
lookuphost router called for xx@???
domain = mxt1.test.ex
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
lowest numbered MX record points to local host: mxt1.test.ex: passed to next router (self = pass)
lookuphost router passed for xx@???
--------> self router <--------
@@ -128,12 +128,12 @@ expanded list of hosts = 'xx' options = 'byname'
set transport remote_smtp
finding IP address for xx
calling host_find_byname
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
self router passed for xx@???
--------> self2 router <--------
local_part=xx domain=mxt1.test.ex
@@ -148,12 +148,12 @@ expanded list of hosts = 'myhost.test.ex' options = 'byname'
set transport remote_smtp
finding IP address for myhost.test.ex
calling host_find_byname
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
queued for remote_smtp transport: local_part = xx
domain = mxt1.test.ex
errors_to=NULL
@@ -175,9 +175,9 @@ checking domains
calling lookuphost router
lookuphost router called for xx@???
domain = not.exist
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
lookuphost router declined for xx@???
"more" is false: skipping remaining routers
no more routers
diff --git a/test/stderr/0094 b/test/stderr/0094
index abf4258..d8b1955 100644
--- a/test/stderr/0094
+++ b/test/stderr/0094
@@ -80,31 +80,31 @@ LOG: smtp_connection MAIN
host in host_lookup? yes (matched "0.0.0.0/0")
looking up host name for V4NET.99.99.90
DNS lookup of 90.99.99.V4NET.in-addr.arpa (PTR) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of 90.99.99.V4NET.in-addr.arpa (PTR) succeeded
IP address lookup yielded "oneback.test.ex"
alias "host1.masq.test.ex"
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of oneback.test.ex (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of oneback.test.ex (A) succeeded
oneback.test.ex V4NET.99.99.90 mx=-1 sort=xx
checking addresses for oneback.test.ex
Forward DNS security status: unverified
V4NET.99.99.90 OK
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of host1.masq.test.ex (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of host1.masq.test.ex (A) succeeded
host1.masq.test.ex V4NET.90.90.90 mx=-1 sort=xx
checking addresses for host1.masq.test.ex
diff --git a/test/stderr/0117 b/test/stderr/0117
index 7e1735a..5421be3 100644
--- a/test/stderr/0117
+++ b/test/stderr/0117
@@ -8,27 +8,27 @@ local_part=xxx domain=mxt9.test.ex
calling lookuphost router
lookuphost router called for xxx@???
domain = mxt9.test.ex
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
queued for <unset> transport: local_part = xxx
domain = mxt9.test.ex
errors_to=NULL
@@ -50,27 +50,27 @@ local_part=xxx domain=mxt9a.test.ex
calling lookuphost router
lookuphost router called for xxx@???
domain = mxt9a.test.ex
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
queued for <unset> transport: local_part = xxx
domain = mxt9a.test.ex
errors_to=NULL
@@ -92,27 +92,27 @@ local_part=xxx domain=mxt9b.test.ex
calling lookuphost router
lookuphost router called for xxx@???
domain = mxt9b.test.ex
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
queued for <unset> transport: local_part = xxx
domain = mxt9b.test.ex
errors_to=NULL
diff --git a/test/stderr/0161 b/test/stderr/0161
index 5cc392a..e7a79d0 100644
--- a/test/stderr/0161
+++ b/test/stderr/0161
@@ -15,27 +15,27 @@ checking domains
calling lookuphost router
lookuphost router called for xx@???
domain = mxt6.test.ex
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
set transport remote_smtp
queued for remote_smtp transport: local_part = xx
domain = mxt6.test.ex
@@ -63,15 +63,15 @@ checking domains
calling lookuphost router
lookuphost router called for myhost.test.ex@???
domain = mxt1.test.ex
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
lowest numbered MX record points to local host: mxt1.test.ex: passed to next router (self = pass)
lookuphost router passed for myhost.test.ex@???
--------> fail router <--------
@@ -92,12 +92,12 @@ expanded list of hosts = 'myhost.test.ex' options = 'byname'
set transport remote_smtp
finding IP address for myhost.test.ex
calling host_find_byname
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
queued for remote_smtp transport: local_part = myhost.test.ex
domain = mxt1.test.ex
errors_to=NULL
@@ -124,15 +124,15 @@ checking domains
calling lookuphost router
lookuphost router called for xx@???
domain = mxt1.test.ex
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
lowest numbered MX record points to local host: mxt1.test.ex: passed to next router (self = pass)
lookuphost router passed for xx@???
--------> fail router <--------
@@ -153,12 +153,12 @@ expanded list of hosts = 'xx' options = 'byname'
set transport remote_smtp
finding IP address for xx
calling host_find_byname
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
self router passed for xx@???
--------> self2 router <--------
local_part=xx domain=mxt1.test.ex
@@ -173,12 +173,12 @@ expanded list of hosts = 'myhost.test.ex' options = 'byname'
set transport remote_smtp
finding IP address for myhost.test.ex
calling host_find_byname
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
queued for remote_smtp transport: local_part = xx
domain = mxt1.test.ex
errors_to=NULL
@@ -205,9 +205,9 @@ checking domains
calling lookuphost router
lookuphost router called for xx@???
domain = not.exist
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
lookuphost router declined for xx@???
"more" is false: skipping remaining routers
no more routers
@@ -225,15 +225,15 @@ checking local_parts
calling failuphost router
failuphost router called for ff@???
domain = mxt1.test.ex
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+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 >>>>>>>>>>>>>>>>
@@ -254,15 +254,15 @@ checking domains
calling lookuphost router
lookuphost router called for fff@???
domain = mxt1.test.ex
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
lowest numbered MX record points to local host: mxt1.test.ex: passed to next router (self = pass)
lookuphost router passed for fff@???
--------> fail router <--------
@@ -279,11 +279,11 @@ expanded list of hosts = 'fff' options = 'byname'
set transport remote_smtp
finding IP address for fff
calling host_find_byname
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+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 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0183 b/test/stderr/0183
index 0de70e7..6894262 100644
--- a/test/stderr/0183
+++ b/test/stderr/0183
@@ -32,9 +32,9 @@ lookuphost router called for userx@???
domain = test.again.dns
test.again.dns in "*"? yes (matched "*")
DNS lookup of test.again.dns (MX) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of test.again.dns (MX) gave TRY_AGAIN
test.again.dns in dns_again_means_nonexist? no (option unset)
returning DNS_AGAIN
@@ -93,18 +93,18 @@ lookuphost router called for abcd@???
domain = ten-1.test.ex
ten-1.test.ex in "*"? yes (matched "*")
DNS lookup of ten-1.test.ex (MX) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of ten-1.test.ex (MX) gave NO_DATA
returning DNS_NODATA
faking res_search(MX) response length as 65535
writing neg-cache entry for ten-1.test.ex-MX-xxxx, ttl 3000
ten-1.test.ex (MX resp) DNSSEC
DNS lookup of ten-1.test.ex (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of ten-1.test.ex (A) succeeded
fully qualified name = ten-1.test.ex
ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx
@@ -144,9 +144,9 @@ finding IP address for test.again.dns
doing DNS lookup
test.again.dns in "*"? yes (matched "*")
DNS lookup of test.again.dns (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of test.again.dns (A) gave TRY_AGAIN
test.again.dns in dns_again_means_nonexist? no (option unset)
returning DNS_AGAIN
@@ -207,9 +207,9 @@ lookuphost router called for xyz@???
ten-1.test.ex in "*"? yes (matched "*")
DNS lookup of ten-1.test.ex-MX: using cached value DNS_NODATA
DNS lookup of ten-1.test.ex (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of ten-1.test.ex (A) succeeded
fully qualified name = ten-1.test.ex
ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx
@@ -257,9 +257,9 @@ lookuphost router called for userx@???
domain = test.fail.dns
test.fail.dns in "*"? yes (matched "*")
DNS lookup of test.fail.dns (MX) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of test.fail.dns (MX) gave NO_RECOVERY
returning DNS_FAIL
writing neg-cache entry for test.fail.dns-MX-xxxx, ttl -1
@@ -317,18 +317,18 @@ lookuphost router called for abcd@???
domain = ten-1.test.ex
ten-1.test.ex in "*"? yes (matched "*")
DNS lookup of ten-1.test.ex (MX) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of ten-1.test.ex (MX) gave NO_DATA
returning DNS_NODATA
faking res_search(MX) response length as 65535
writing neg-cache entry for ten-1.test.ex-MX-xxxx, ttl 3000
ten-1.test.ex (MX resp) DNSSEC
DNS lookup of ten-1.test.ex (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of ten-1.test.ex (A) succeeded
fully qualified name = ten-1.test.ex
ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx
@@ -368,9 +368,9 @@ finding IP address for test.fail.dns
doing DNS lookup
test.fail.dns in "*"? yes (matched "*")
DNS lookup of test.fail.dns (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of test.fail.dns (A) gave NO_RECOVERY
returning DNS_FAIL
writing neg-cache entry for test.fail.dns-A-xxxx, ttl -1
@@ -430,9 +430,9 @@ lookuphost router called for xyz@???
ten-1.test.ex in "*"? yes (matched "*")
DNS lookup of ten-1.test.ex-MX: using cached value DNS_NODATA
DNS lookup of ten-1.test.ex (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of ten-1.test.ex (A) succeeded
fully qualified name = ten-1.test.ex
ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx
@@ -480,9 +480,9 @@ lookuphost router called for userx@???
domain = nonexist.test.ex
nonexist.test.ex in "*"? yes (matched "*")
DNS lookup of nonexist.test.ex (MX) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of nonexist.test.ex (MX) gave HOST_NOT_FOUND
returning DNS_NOMATCH
faking res_search(MX) response length as 65535
@@ -543,18 +543,18 @@ lookuphost router called for abcd@???
domain = ten-1.test.ex
ten-1.test.ex in "*"? yes (matched "*")
DNS lookup of ten-1.test.ex (MX) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of ten-1.test.ex (MX) gave NO_DATA
returning DNS_NODATA
faking res_search(MX) response length as 65535
writing neg-cache entry for ten-1.test.ex-MX-xxxx, ttl 3000
ten-1.test.ex (MX resp) DNSSEC
DNS lookup of ten-1.test.ex (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of ten-1.test.ex (A) succeeded
fully qualified name = ten-1.test.ex
ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx
@@ -594,9 +594,9 @@ finding IP address for nonexist.test.ex
doing DNS lookup
nonexist.test.ex in "*"? yes (matched "*")
DNS lookup of nonexist.test.ex (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of nonexist.test.ex (A) gave HOST_NOT_FOUND
returning DNS_NOMATCH
faking res_search(A) response length as 65535
@@ -657,9 +657,9 @@ lookuphost router called for xyz@???
ten-1.test.ex in "*"? yes (matched "*")
DNS lookup of ten-1.test.ex-MX: using cached value DNS_NODATA
DNS lookup of ten-1.test.ex (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of ten-1.test.ex (A) succeeded
fully qualified name = ten-1.test.ex
ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx
@@ -697,9 +697,9 @@ srv router called for srv@???
domain = test.again.dns
test.again.dns in "*"? yes (matched "*")
DNS lookup of _smtp._tcp.test.again.dns (SRV) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of _smtp._tcp.test.again.dns (SRV) gave TRY_AGAIN
_smtp._tcp.test.again.dns in dns_again_means_nonexist? no (option unset)
returning DNS_AGAIN
@@ -722,27 +722,27 @@ srv router called for srv@???
domain = test.fail.dns
test.fail.dns in "*"? yes (matched "*")
DNS lookup of _smtp._tcp.test.fail.dns (SRV) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of _smtp._tcp.test.fail.dns (SRV) gave NO_RECOVERY
returning DNS_FAIL
writing neg-cache entry for _smtp._tcp.test.fail.dns-SRV-xxxx, ttl -1
test.fail.dns in "test.fail.dns"? yes (matched "test.fail.dns")
DNS_FAIL treated as DNS_NODATA (domain in srv_fail_domains)
DNS lookup of test.fail.dns (MX) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of test.fail.dns (MX) gave NO_RECOVERY
returning DNS_FAIL
writing neg-cache entry for test.fail.dns-MX-xxxx, ttl -1
test.fail.dns in "test.fail.dns"? yes (matched "test.fail.dns")
DNS_FAIL treated as DNS_NODATA (domain in mx_fail_domains)
DNS lookup of test.fail.dns (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of test.fail.dns (A) gave NO_RECOVERY
returning DNS_FAIL
writing neg-cache entry for test.fail.dns-A-xxxx, ttl -1
@@ -784,9 +784,9 @@ lookuphost router called for userx@???
domain = nonexist.example.com
nonexist.example.com in "*"? yes (matched "*")
DNS lookup of nonexist.example.com (MX) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of nonexist.example.com (MX) gave HOST_NOT_FOUND
returning DNS_NOMATCH
faking res_search(MX) response length as 65535
@@ -831,9 +831,9 @@ delay router called for userd@???
nonexist.example.com in "*"? yes (matched "*")
DNS lookup of nonexist.example.com-MX: cached value DNS_NOMATCH past valid time
DNS lookup of nonexist.example.com (MX) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of nonexist.example.com (MX) gave HOST_NOT_FOUND
returning DNS_NOMATCH
faking res_search(MX) response length as 65535
diff --git a/test/stderr/0277 b/test/stderr/0277
index 48136b6..187d492 100644
--- a/test/stderr/0277
+++ b/test/stderr/0277
@@ -16,9 +16,9 @@ host in "V4NET.2.3.4"? yes (matched "V4NET.2.3.4")
host in host_lookup? yes (matched "+lookup_hosts")
looking up host name for V4NET.2.3.4
DNS lookup of 4.3.2.V4NET.in-addr.arpa (PTR) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of 4.3.2.V4NET.in-addr.arpa (PTR) gave HOST_NOT_FOUND
returning DNS_NOMATCH
DNS: no SOA record found for neg-TTL
@@ -97,9 +97,9 @@ host in "V4NET.6.7.8"? no (end of list)
host in host_lookup? yes (end of list)
looking up host name for V4NET.10.11.12
DNS lookup of 12.11.10.V4NET.in-addr.arpa (PTR) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of 12.11.10.V4NET.in-addr.arpa (PTR) gave HOST_NOT_FOUND
returning DNS_NOMATCH
DNS: no SOA record found for neg-TTL
@@ -145,9 +145,9 @@ host in "V4NET.6.7.8"? no (end of list)
host in host_lookup? yes (end of list)
looking up host name for V4NET.1.1.1
DNS lookup of 1.1.1.V4NET.in-addr.arpa (PTR) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of 1.1.1.V4NET.in-addr.arpa (PTR) gave HOST_NOT_FOUND
returning DNS_NOMATCH
DNS: no SOA record found for neg-TTL
@@ -193,9 +193,9 @@ host in "V4NET.6.7.8"? no (end of list)
host in host_lookup? yes (end of list)
looking up host name for V4NET.2.2.2
DNS lookup of 2.2.2.V4NET.in-addr.arpa (PTR) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of 2.2.2.V4NET.in-addr.arpa (PTR) gave HOST_NOT_FOUND
returning DNS_NOMATCH
DNS: no SOA record found for neg-TTL
diff --git a/test/stderr/0278 b/test/stderr/0278
index af7929f..ddd3970 100644
--- a/test/stderr/0278
+++ b/test/stderr/0278
@@ -296,21 +296,21 @@ r2 router called for unknown@???
domain = test.ex
test.ex in "*"? yes (matched "*")
DNS lookup of test.ex (MX) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of test.ex (MX) gave NO_DATA
returning DNS_NODATA
faking res_search(MX) response length as 65535
writing neg-cache entry for test.ex-MX-xxxx, ttl 3000
test.ex (MX resp) DNSSEC
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of test.ex (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of test.ex (A) gave NO_DATA
returning DNS_NODATA
faking res_search(A) response length as 65535
diff --git a/test/stderr/0283 b/test/stderr/0283
index ff002dc..cc345b1 100644
--- a/test/stderr/0283
+++ b/test/stderr/0283
@@ -34,10 +34,10 @@ fresh-exec forking for delivery (local)
postfork: delivery (local)
changed uid/gid: local delivery to somebody <somebody@???> transport=t1
uid=EXIM_UID gid=EXIM_GID pid=pppp
-delivery (local) forking for child-open
-postfork: child-open
+delivery (local) forking for pipe-tpt-cmd
+postfork: pipe-tpt-cmd
fresh-exec forked for delivery (local): npppp
-delivery (local) forked for child-open: npppp
+delivery (local) forked for pipe-tpt-cmd: npppp
delivery (local) forking for pipe-transport output
postfork: pipe-transport output
delivery (local) forked for pipe-transport output: npppp
diff --git a/test/stderr/0315 b/test/stderr/0315
index 3dcdcf7..8355825 100644
--- a/test/stderr/0315
+++ b/test/stderr/0315
@@ -31,15 +31,15 @@ checking domains
calling r1 router
r1 router called for y@???
domain = ten-1.test.ex
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
set transport t1
queued for t1 transport: local_part = y
domain = ten-1.test.ex
@@ -107,15 +107,15 @@ local_part=y domain=ten-2.test.ex
calling r2 router
r2 router called for y@???
domain = ten-2.test.ex
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
set transport t1
queued for t1 transport: local_part = y
domain = ten-2.test.ex
@@ -136,9 +136,9 @@ local_part=x domain=ten-2.test.ex
calling r2 router
r2 router called for x@???
domain = ten-2.test.ex
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
queued for t1 transport: local_part = x
domain = ten-2.test.ex
errors_to=NULL
diff --git a/test/stderr/0360 b/test/stderr/0360
index 59a5dfb..6bb0486 100644
--- a/test/stderr/0360
+++ b/test/stderr/0360
@@ -106,19 +106,19 @@ checking domains
calling r1 router
r1 router called for unknown@???
domain = recurse.test.ex
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
r1 router widened recurse.test.ex to recurse.test.ex.test.ex
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
domain changed to recurse.test.ex.test.ex
rewriting header lines
re-routed to unknown@???
@@ -139,9 +139,9 @@ checking domains
calling r1 router
r1 router called for unknown@???
domain = recurse.test.ex.test.ex
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
set transport t1
queued for t1 transport: local_part = unknown
domain = recurse.test.ex.test.ex
diff --git a/test/stderr/0361 b/test/stderr/0361
index b760bc5..1003d75 100644
--- a/test/stderr/0361
+++ b/test/stderr/0361
@@ -101,9 +101,9 @@ r1 router called for kilos@???
domain = recurse.test.ex
recurse.test.ex in "*"? yes (matched "*")
DNS lookup of recurse.test.ex (MX) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of recurse.test.ex (MX) gave HOST_NOT_FOUND
returning DNS_NOMATCH
faking res_search(MX) response length as 65535
@@ -111,21 +111,21 @@ faking res_search(MX) response length as 65535
r1 router widened recurse.test.ex to recurse.test.ex.test.ex
recurse.test.ex.test.ex in "*"? yes (matched "*")
DNS lookup of recurse.test.ex.test.ex (MX) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of recurse.test.ex.test.ex (MX) gave NO_DATA
returning DNS_NODATA
faking res_search(MX) response length as 65535
writing neg-cache entry for recurse.test.ex.test.ex-MX-xxxx, ttl 3000
recurse.test.ex.test.ex (MX resp) DNSSEC
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of recurse.test.ex.test.ex (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of recurse.test.ex.test.ex (A) succeeded
fully qualified name = recurse.test.ex.test.ex
recurse.test.ex.test.ex V4NET.99.0.2 mx=-1 sort=xx
diff --git a/test/stderr/0364 b/test/stderr/0364
index b80065f..161975d 100644
--- a/test/stderr/0364
+++ b/test/stderr/0364
@@ -73,9 +73,9 @@ checking domains
calling r2 router
r2 router called for solik@???
domain = otherhost.test.ex
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
r2 router declined for solik@???
--------> r3 router <--------
local_part=solik domain=otherhost.test.ex
@@ -102,9 +102,9 @@ checking domains
calling r2 router
r2 router called for solik@???
domain = otherhost.sub.test.ex
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
r2 router declined for solik@???
--------> r3 router <--------
local_part=solik domain=otherhost.sub.test.ex
@@ -147,15 +147,15 @@ checking domains
calling r2 router
r2 router called for xxx@???
domain = ten-1.test.ex
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
set transport t1
queued for t1 transport: local_part = xxx
domain = ten-1.test.ex
@@ -191,9 +191,9 @@ checking domains
calling r2 router
r2 router called for xxx@???
domain = testsub.test.ex
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
r2 router declined for xxx@???
--------> r3 router <--------
local_part=xxx domain=testsub.test.ex
@@ -220,15 +220,15 @@ checking domains
calling r2 router
r2 router called for xxx@???
domain = testsub.sub.test.ex
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
queued for t1 transport: local_part = xxx
domain = testsub.sub.test.ex
errors_to=NULL
diff --git a/test/stderr/0368 b/test/stderr/0368
index 30e7530..bdb9d6f 100644
--- a/test/stderr/0368
+++ b/test/stderr/0368
@@ -2,54 +2,54 @@ Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
dropping to exim gid; retaining priv uid
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
discarded duplicate host ten-1.test.ex (MX=8)
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
fully qualified name = mxt9.test.ex
host_find_bydns yield = HOST_FOUND (3); returned hosts:
ten-1.test.ex V4NET.0.0.1 MX=5
ten-2.test.ex V4NET.0.0.2 MX=6
ten-3.test.ex V4NET.0.0.3 MX=7
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
duplicate IP address V4NET.0.0.5 (MX=5) removed
duplicate IP address V4NET.0.0.6 (MX=6) removed
fully qualified name = mxt14.test.ex
@@ -58,23 +58,23 @@ host_find_bydns yield = HOST_FOUND (3); returned hosts:
ten-5-6.test.ex V4NET.0.0.6 MX=4
finding IP address for ten-1.test.ex
doing DNS lookup
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
fully qualified name = ten-1.test.ex
ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx
finding IP address for ten-1.test.ex
doing DNS lookup
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
fully qualified name = ten-1.test.ex
ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx
finding IP address for ten-2.test.ex
doing DNS lookup
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+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 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0370 b/test/stderr/0370
index c7f6f36..1219fb0 100644
--- a/test/stderr/0370
+++ b/test/stderr/0370
@@ -27,10 +27,10 @@ changed uid/gid: local delivery to |TESTSUITE/bin/iefbr14 <|TESTSUITE/bin/iefbr1
t1 transport entered
direct command:
argv[0] = 'TESTSUITE/bin/iefbr14'
-delivery (local) forking for child-open
-postfork: child-open
+delivery (local) forking for pipe-tpt-cmd
+postfork: pipe-tpt-cmd
fresh-exec forked for delivery (local): npppp
-delivery (local) forked for child-open: npppp
+delivery (local) forked for pipe-tpt-cmd: npppp
delivery (local) forking for pipe-transport output
postfork: pipe-transport output
delivery (local) forked for pipe-transport output: npppp
diff --git a/test/stderr/0374 b/test/stderr/0374
index 86f260f..80cfeca 100644
--- a/test/stderr/0374
+++ b/test/stderr/0374
@@ -384,10 +384,10 @@ LOG: MAIN
locking TESTSUITE/spool/db/retry.lockfile
fresh-exec forking for delivery (local)
postfork: delivery (local)
-delivery (local) forking for child-open
-postfork: child-open
+delivery (local) forking for pipe-tpt-cmd
+postfork: pipe-tpt-cmd
fresh-exec forked for delivery (local): npppp
-delivery (local) forked for child-open: npppp
+delivery (local) forked for pipe-tpt-cmd: npppp
delivery (local) forking for pipe-transport output
postfork: pipe-transport output
delivery (local) forked for pipe-transport output: npppp
@@ -397,10 +397,10 @@ LOG: MAIN
locking TESTSUITE/spool/db/retry.lockfile
fresh-exec forking for delivery (local)
postfork: delivery (local)
-delivery (local) forking for child-open
-postfork: child-open
+delivery (local) forking for pipe-tpt-cmd
+postfork: pipe-tpt-cmd
fresh-exec forked for delivery (local): npppp
-delivery (local) forked for child-open: npppp
+delivery (local) forked for pipe-tpt-cmd: npppp
delivery (local) forking for pipe-transport output
postfork: pipe-transport output
delivery (local) forked for pipe-transport output: npppp
diff --git a/test/stderr/0375 b/test/stderr/0375
index f12e5cd..c9a0629 100644
--- a/test/stderr/0375
+++ b/test/stderr/0375
@@ -829,10 +829,10 @@ log writing disabled
locking TESTSUITE/spool/db/retry.lockfile
fresh-exec forking for delivery (local)
postfork: delivery (local)
-delivery (local) forking for child-open
-postfork: child-open
+delivery (local) forking for pipe-tpt-cmd
+postfork: pipe-tpt-cmd
fresh-exec forked for delivery (local): npppp
-delivery (local) forked for child-open: npppp
+delivery (local) forked for pipe-tpt-cmd: npppp
delivery (local) forking for pipe-transport output
postfork: pipe-transport output
delivery (local) forked for pipe-transport output: npppp
@@ -843,10 +843,10 @@ log writing disabled
locking TESTSUITE/spool/db/retry.lockfile
fresh-exec forking for delivery (local)
postfork: delivery (local)
-delivery (local) forking for child-open
-postfork: child-open
+delivery (local) forking for pipe-tpt-cmd
+postfork: pipe-tpt-cmd
fresh-exec forked for delivery (local): npppp
-delivery (local) forked for child-open: npppp
+delivery (local) forked for pipe-tpt-cmd: npppp
delivery (local) forking for pipe-transport output
postfork: pipe-transport output
delivery (local) forked for pipe-transport output: npppp
diff --git a/test/stderr/0378 b/test/stderr/0378
index a7b63fd..27632ea 100644
--- a/test/stderr/0378
+++ b/test/stderr/0378
@@ -175,10 +175,10 @@ LOG: MAIN
locking TESTSUITE/spool/db/retry.lockfile
fresh-exec forking for delivery (local)
postfork: delivery (local)
-delivery (local) forking for child-open
-postfork: child-open
+delivery (local) forking for pipe-tpt-cmd
+postfork: pipe-tpt-cmd
fresh-exec forked for delivery (local): npppp
-delivery (local) forked for child-open: npppp
+delivery (local) forked for pipe-tpt-cmd: npppp
delivery (local) forking for pipe-transport output
postfork: pipe-transport output
delivery (local) forked for pipe-transport output: npppp
diff --git a/test/stderr/0381 b/test/stderr/0381
index 90edf4b..5ba9146 100644
--- a/test/stderr/0381
+++ b/test/stderr/0381
@@ -38,31 +38,31 @@ check hosts = *.gov.uk.test.ex
sender host name required, to match against *.gov.uk.test.ex
looking up host name for V4NET.99.99.97
DNS lookup of 97.99.99.V4NET.in-addr.arpa (PTR) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of 97.99.99.V4NET.in-addr.arpa (PTR) succeeded
IP address lookup yielded "x.gov.uk.test.ex"
alias "x.co.uk.test.ex"
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of x.gov.uk.test.ex (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of x.gov.uk.test.ex (A) succeeded
x.gov.uk.test.ex V4NET.99.99.97 mx=-1 sort=xx
checking addresses for x.gov.uk.test.ex
Forward DNS security status: unverified
V4NET.99.99.97 OK
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of x.co.uk.test.ex (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of x.co.uk.test.ex (A) succeeded
x.co.uk.test.ex V4NET.99.99.97 mx=-1 sort=xx
checking addresses for x.co.uk.test.ex
diff --git a/test/stderr/0386 b/test/stderr/0386
index 30dfa43..c8f39d0 100644
--- a/test/stderr/0386
+++ b/test/stderr/0386
@@ -195,16 +195,16 @@ check acl = TESTSUITE/aux-fixed/0386.acl2
dnslists check: rbl.test.ex
new DNS lookup for 13.12.11.V4NET.rbl.test.ex
DNS lookup of 13.12.11.V4NET.rbl.test.ex (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of 13.12.11.V4NET.rbl.test.ex (A) succeeded
dnslists: wrote cache entry, ttl=3
DNS lookup for 13.12.11.V4NET.rbl.test.ex succeeded (yielding 127.0.0.2)
DNS lookup of 13.12.11.V4NET.rbl.test.ex (TXT) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of 13.12.11.V4NET.rbl.test.ex (TXT) succeeded
=> that means V4NET.11.12.13 is listed at rbl.test.ex
warn: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl2"
diff --git a/test/stderr/0393 b/test/stderr/0393
index 19d4c75..b751994 100644
--- a/test/stderr/0393
+++ b/test/stderr/0393
@@ -33,10 +33,10 @@ lock file created
mailbox TESTSUITE/test-mail/userx is locked
writing to file TESTSUITE/test-mail/userx
writing data block fd=dddd size=sss timeout=0
-delivery (local) forking for child-open
-postfork: child-open
+delivery (local) forking for transport-filter
+postfork: transport-filter
fresh-exec forked for delivery (local): npppp
-delivery (local) forked for child-open: npppp
+delivery (local) forked for transport-filter: npppp
process pppp running as transport filter: fd_write=dddd fd_read=dddd
delivery (local) forking for transport filter writer
postfork: transport filter writer
diff --git a/test/stderr/0419 b/test/stderr/0419
index 0631182..4e6f5f6 100644
--- a/test/stderr/0419
+++ b/test/stderr/0419
@@ -24,25 +24,25 @@ dnslookup router called for k@???
domain = mxt13.test.ex
mxt13.test.ex in "*"? yes (matched "*")
DNS lookup of mxt13.test.ex (MX) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of mxt13.test.ex (MX) succeeded
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of other1.test.ex (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of other1.test.ex (A) succeeded
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of other2.test.ex (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of other2.test.ex (A) succeeded
other1.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"? no (matched "!other1.test.ex")
other1.test.ex in hosts_treat_as_local? no (end of list)
diff --git a/test/stderr/0426 b/test/stderr/0426
index ff0caaa..b41aed9 100644
--- a/test/stderr/0426
+++ b/test/stderr/0426
@@ -29,16 +29,16 @@ local_part=x domain=uppercase.test.ex
calling r1 router
r1 router called for x@???
domain = uppercase.test.ex
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
uppercase.test.ex (MX resp) DNSSEC
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
local host found for non-MX address
fully qualified name = UpperCase.test.ex
uppercase.test.ex 127.0.0.1 mx=-1 sort=xx
diff --git a/test/stderr/0463 b/test/stderr/0463
index c7f9186..60aac79 100644
--- a/test/stderr/0463
+++ b/test/stderr/0463
@@ -17,9 +17,9 @@ routing x@ten-1
local_part=x domain=ten-1
checking domains
DNS lookup of ten-1 (MX) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of ten-1 (MX) gave NO_DATA
returning DNS_NODATA
faking res_search(MX) response length as 65535
@@ -31,21 +31,21 @@ all router called for x@ten-1
domain = ten-1
ten-1 in "*"? yes (matched "*")
DNS lookup of ten-1 (MX) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of ten-1 (MX) gave NO_DATA
returning DNS_NODATA
faking res_search(MX) response length as 65535
writing neg-cache entry for ten-1-MX-xxxx, ttl 3000
ten-1 (MX resp) DNSSEC
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of ten-1 (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of ten-1 (A) succeeded
fully qualified name = ten-1.test.ex
ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx
@@ -60,9 +60,9 @@ routing x@???
local_part=x domain=ten-1.test.ex
checking domains
DNS lookup of ten-1.test.ex (MX) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of ten-1.test.ex (MX) gave NO_DATA
returning DNS_NODATA
faking res_search(MX) response length as 65535
@@ -74,21 +74,21 @@ all router called for x@???
domain = ten-1.test.ex
ten-1.test.ex in "*"? yes (matched "*")
DNS lookup of ten-1.test.ex (MX) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of ten-1.test.ex (MX) gave NO_DATA
returning DNS_NODATA
faking res_search(MX) response length as 65535
writing neg-cache entry for ten-1.test.ex-MX-xxxx, ttl 3000
ten-1.test.ex (MX resp) DNSSEC
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of ten-1.test.ex (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of ten-1.test.ex (A) succeeded
fully qualified name = ten-1.test.ex
ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx
diff --git a/test/stderr/0469 b/test/stderr/0469
index 407902d..eff5a7b 100644
--- a/test/stderr/0469
+++ b/test/stderr/0469
@@ -20,14 +20,14 @@ r1 router called for x@???
domain = mxt1c.test.ex
mxt1c.test.ex in "*"? yes (matched "*")
DNS lookup of mxt1c.test.ex (MX) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of mxt1c.test.ex (MX) succeeded
DNS lookup of dontqualify (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of dontqualify (A) gave NO_DATA
returning DNS_NODATA
DNS: no SOA record found for neg-TTL
diff --git a/test/stderr/0499 b/test/stderr/0499
index 26021f3..5c203fd 100644
--- a/test/stderr/0499
+++ b/test/stderr/0499
@@ -17,14 +17,14 @@ routing ph@???
local_part=ph domain=mxt1.test.ex
checking domains
DNS lookup of mxt1.test.ex (MX) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of mxt1.test.ex (MX) succeeded
DNS lookup of eximtesthost.test.ex (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of eximtesthost.test.ex (A) succeeded
local host has lowest MX
host_find_bydns yield = HOST_FOUND_LOCAL (4); returned hosts:
@@ -33,14 +33,14 @@ mxt1.test.ex in "@mx_any"? yes (matched "@mx_any")
mxt1.test.ex in "+anymx"? yes (matched "+anymx")
checking "condition" "${if match_domain{$domain}{+anymx}{yes}}"...
DNS lookup of mxt1.test.ex (MX) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of mxt1.test.ex (MX) succeeded
DNS lookup of eximtesthost.test.ex (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of eximtesthost.test.ex (A) succeeded
local host has lowest MX
host_find_bydns yield = HOST_FOUND_LOCAL (4); returned hosts:
diff --git a/test/stderr/0543 b/test/stderr/0543
index ef18299..b136412 100644
--- a/test/stderr/0543
+++ b/test/stderr/0543
@@ -35,14 +35,14 @@ After routing:
Deferred addresses:
qrun delivery forking for transport
postfork: transport
-transport forking for child-open
-postfork: child-open
+transport forking for fakens-search
+postfork: fakens-search
fresh-exec forked for qrun delivery: npppp
qrun delivery forked for transport: npppp
-transport forked for child-open: npppp
-transport forking for child-open
-postfork: child-open
-transport forked for child-open: npppp
+transport forked for fakens-search: npppp
+transport forking for fakens-search
+postfork: fakens-search
+transport forked for fakens-search: npppp
locking TESTSUITE/spool/db/retry.lockfile
locking TESTSUITE/spool/db/wait-smtp.lockfile
LOG: MAIN
diff --git a/test/stderr/0545 b/test/stderr/0545
index 404e65b..9dfefed 100644
--- a/test/stderr/0545
+++ b/test/stderr/0545
@@ -20,30 +20,30 @@ dns router called for userx@alias-eximtesthost
domain = alias-eximtesthost
alias-eximtesthost in "*"? yes (matched "*")
DNS lookup of alias-eximtesthost (MX) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of alias-eximtesthost (MX) succeeded
CNAME found: change to eximtesthost.test.ex
DNS lookup of eximtesthost.test.ex (MX) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of eximtesthost.test.ex (MX) gave NO_DATA
returning DNS_NODATA
faking res_search(MX) response length as 65535
writing neg-cache entry for eximtesthost.test.ex-MX-xxxx, ttl 3000
alias-eximtesthost (MX resp) DNSSEC
DNS lookup of alias-eximtesthost (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of alias-eximtesthost (A) succeeded
CNAME found: change to eximtesthost.test.ex
DNS lookup of eximtesthost.test.ex (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of eximtesthost.test.ex (A) succeeded
local host found for non-MX address
fully qualified name = alias-eximtesthost.test.ex
@@ -62,22 +62,22 @@ dns router called for userx@???
domain = alias-eximtesthost.test.ex
alias-eximtesthost.test.ex in "*"? yes (matched "*")
DNS lookup of alias-eximtesthost.test.ex (MX) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of alias-eximtesthost.test.ex (MX) succeeded
CNAME found: change to eximtesthost.test.ex
DNS lookup of eximtesthost.test.ex-MX: using cached value DNS_NODATA
DNS lookup of alias-eximtesthost.test.ex (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of alias-eximtesthost.test.ex (A) succeeded
CNAME found: change to eximtesthost.test.ex
DNS lookup of eximtesthost.test.ex (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of eximtesthost.test.ex (A) succeeded
local host found for non-MX address
fully qualified name = alias-eximtesthost.test.ex
@@ -116,30 +116,30 @@ dns router called for userx@???
domain = alias-eximtesthost.test.ex
alias-eximtesthost.test.ex in "*"? yes (matched "*")
DNS lookup of alias-eximtesthost.test.ex (MX) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of alias-eximtesthost.test.ex (MX) succeeded
CNAME found: change to eximtesthost.test.ex
DNS lookup of eximtesthost.test.ex (MX) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of eximtesthost.test.ex (MX) gave NO_DATA
returning DNS_NODATA
faking res_search(MX) response length as 65535
writing neg-cache entry for eximtesthost.test.ex-MX-xxxx, ttl 3000
alias-eximtesthost.test.ex (MX resp) DNSSEC
DNS lookup of alias-eximtesthost.test.ex (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of alias-eximtesthost.test.ex (A) succeeded
CNAME found: change to eximtesthost.test.ex
DNS lookup of eximtesthost.test.ex (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of eximtesthost.test.ex (A) succeeded
local host found for non-MX address
fully qualified name = alias-eximtesthost.test.ex
diff --git a/test/stderr/1006 b/test/stderr/1006
index a38b292..ccec74c 100644
--- a/test/stderr/1006
+++ b/test/stderr/1006
@@ -3,44 +3,44 @@ configuration file is TESTSUITE/test-config
admin user
dropping to exim gid; retaining priv uid
DNS lookup of mx46.test.ex (MX) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of mx46.test.ex (MX) succeeded
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of 46.test.ex (AAAA) succeeded
DNS lookup of 46.test.ex (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of 46.test.ex (A) succeeded
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of 46.test.ex (AAAA) succeeded
DNS lookup of 46.test.ex (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of 46.test.ex (A) succeeded
DNS lookup of v6.test.ex (MX) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of v6.test.ex (MX) gave NO_DATA
returning DNS_NODATA
faking res_search(MX) response length as 65535
writing neg-cache entry for v6.test.ex-MX-xxxx, ttl 3000
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of v6.test.ex (AAAA) succeeded
DNS lookup of v6.test.ex (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of v6.test.ex (A) gave NO_DATA
returning DNS_NODATA
faking res_search(A) response length as 65535
@@ -51,32 +51,32 @@ configuration file is TESTSUITE/test-config
admin user
dropping to exim gid; retaining priv uid
DNS lookup of mx46.test.ex (MX) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of mx46.test.ex (MX) succeeded
DNS lookup of 46.test.ex (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of 46.test.ex (A) succeeded
DNS lookup of 46.test.ex (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of 46.test.ex (A) succeeded
DNS lookup of v6.test.ex (MX) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of v6.test.ex (MX) gave NO_DATA
returning DNS_NODATA
faking res_search(MX) response length as 65535
writing neg-cache entry for v6.test.ex-MX-xxxx, ttl 3000
DNS lookup of v6.test.ex (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of v6.test.ex (A) gave NO_DATA
returning DNS_NODATA
faking res_search(A) response length as 65535
diff --git a/test/stderr/2135 b/test/stderr/2135
index 3438de3..7f4c1b1 100644
--- a/test/stderr/2135
+++ b/test/stderr/2135
@@ -37,14 +37,14 @@ LOG: MAIN
<= CALLER@??? U=CALLER P=local-smtp S=sss
fresh-exec forking for local-accept delivery
postfork: local-accept delivery
-local-accept delivery forking for tls-proxy interproc
-postfork: tls-proxy interproc
-tls-proxy interproc forking for tls proxy
-postfork: tls proxy
fresh-exec forked for local-accept delivery: npppp
LOG: smtp_connection MAIN
SMTP connection from CALLER closed by QUIT
>>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+local-accept delivery forking for tls-proxy interproc
+postfork: tls-proxy interproc
+tls-proxy interproc forking for tls proxy
+postfork: tls proxy
local-accept delivery forked for tls-proxy interproc: npppp
proxy-proc inter-pid pppp
tls-proxy interproc forked for tls proxy: npppp
diff --git a/test/stderr/2200 b/test/stderr/2200
index a1953b2..a0ea3d1 100644
--- a/test/stderr/2200
+++ b/test/stderr/2200
@@ -10,9 +10,9 @@ dropping to exim gid; retaining priv uid
type=dnsdb key="a=localhost.test.ex"
database lookup required for a=localhost.test.ex
dnsdb key: localhost.test.ex
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
lookup yielded: 127.0.0.1
search_open: dnsdb "NULL"
cached open
@@ -38,9 +38,9 @@ search_tidyup called
type=dnsdb key="a=shorthost.test.ex"
database lookup required for a=shorthost.test.ex
dnsdb key: shorthost.test.ex
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
lookup yielded: 127.0.0.1
search_open: dnsdb "NULL"
cached open
@@ -51,9 +51,9 @@ fresh-exec forked for child-open: npppp
type=dnsdb key="a=shorthost.test.ex"
cached data found but past valid time; database lookup required for a=shorthost.test.ex
dnsdb key: shorthost.test.ex
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
lookup yielded: 127.0.0.1
LOG: MAIN
<= CALLER@??? U=CALLER P=local S=sss
diff --git a/test/stderr/2201 b/test/stderr/2201
index f4fa473..2785101 100644
--- a/test/stderr/2201
+++ b/test/stderr/2201
@@ -36,9 +36,9 @@ internal_search_find: file="NULL"
database lookup required for test.ex
dnsdb key: test.ex
DNS lookup of test.ex (TXT) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of test.ex (TXT) succeeded
lookup yielded: A TXT record for test.ex.
test.ex in "dnsdb;test.ex"? yes (matched "dnsdb;test.ex")
@@ -100,9 +100,9 @@ internal_search_find: file="NULL"
database lookup required for unknown
dnsdb key: unknown
DNS lookup of unknown (TXT) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of unknown (TXT) gave HOST_NOT_FOUND
returning DNS_NOMATCH
faking res_search(TXT) response length as 65535
@@ -135,9 +135,9 @@ internal_search_find: file="NULL"
database lookup required for A=myhost.test.ex
dnsdb key: myhost.test.ex
DNS lookup of myhost.test.ex (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of myhost.test.ex (A) succeeded
lookup yielded: V4NET.10.10.10
CALLER@??? in "dnsdb;A=myhost.test.ex"? yes (matched "dnsdb;A=myhost.test.ex")
@@ -168,9 +168,9 @@ internal_search_find: file="NULL"
type=dnsdb key="a=shorthost.test.ex"
database lookup required for a=shorthost.test.ex
dnsdb key: shorthost.test.ex
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
lookup yielded: 127.0.0.1
search_open: dnsdb "NULL"
cached open
@@ -190,9 +190,9 @@ internal_search_find: file="NULL"
type=dnsdb key="a=shorthost.test.ex"
cached data found but past valid time; database lookup required for a=shorthost.test.ex
dnsdb key: shorthost.test.ex
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
lookup yielded: 127.0.0.1
LOG: MAIN
<= a@??? U=CALLER P=local S=sss
@@ -221,25 +221,25 @@ ppppp fresh-exec 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 child-open
-ppppp postfork: child-open
+ppppp daemon accept forking for fakens-search
+ppppp postfork: fakens-search
ppppp fresh-exec forked for daemon accept: npppp
ppppp 1 SMTP accept process running
ppppp Listening...
-ppppp daemon accept forked for child-open: npppp
-ppppp daemon accept forking for child-open
-ppppp postfork: child-open
-ppppp daemon accept forked for child-open: npppp
+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 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 child-open
-ppppp postfork: child-open
-ppppp daemon accept forked for child-open: npppp
+ppppp daemon accept forking for fakens-search
+ppppp postfork: fakens-search
+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 child-open
-ppppp postfork: child-open
-ppppp daemon accept forked for child-open: npppp
+ppppp daemon accept forking for fakens-search
+ppppp postfork: fakens-search
+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,14 +247,14 @@ 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 child-open
-ppppp postfork: child-open
-ppppp daemon accept forked for child-open: npppp
+ppppp daemon accept forking for fakens-search
+ppppp postfork: fakens-search
+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 child-open
-ppppp postfork: child-open
-ppppp daemon accept forked for child-open: npppp
+ppppp daemon accept forking for fakens-search
+ppppp postfork: fakens-search
+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@???
diff --git a/test/stderr/2202 b/test/stderr/2202
index a696f13..35fc2eb 100644
--- a/test/stderr/2202
+++ b/test/stderr/2202
@@ -39,9 +39,9 @@ check hosts = +ignore_unknown : *.$sender_address_domain : $sender_address_domai
database lookup required for >:defer_never,mxh=cioce.test.again.dns
dnsdb key: cioce.test.again.dns
DNS lookup of cioce.test.again.dns (MX) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of cioce.test.again.dns (MX) gave TRY_AGAIN
cioce.test.again.dns in dns_again_means_nonexist? yes (matched "*")
cioce.test.again.dns is in dns_again_means_nonexist: returning DNS_NOMATCH
@@ -51,15 +51,15 @@ DNS: no SOA record found for neg-TTL
sender host name required, to match against *.cioce.test.again.dns
looking up host name for ip4.ip4.ip4.ip4
DNS lookup of ip4-reverse.in-addr.arpa (PTR) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of ip4-reverse.in-addr.arpa (PTR) succeeded
IP address lookup yielded "the.local.host.name"
DNS lookup of the.local.host.name (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of the.local.host.name (A) succeeded
local host found for non-MX address
the.local.host.name ip4.ip4.ip4.ip4 mx=-1 sort=xx
@@ -70,9 +70,9 @@ sender_fullhost = the.local.host.name [ip4.ip4.ip4.ip4]
sender_rcvhost = the.local.host.name ([ip4.ip4.ip4.ip4])
using host_fake_gethostbyname for cioce.test.again.dns (IPv4)
DNS lookup of cioce.test.again.dns (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of cioce.test.again.dns (A) gave TRY_AGAIN
cioce.test.again.dns in dns_again_means_nonexist? yes (matched "*")
cioce.test.again.dns is in dns_again_means_nonexist: returning DNS_NOMATCH
diff --git a/test/stderr/4520 b/test/stderr/4520
index 5ff7f64..440d9f6 100644
--- a/test/stderr/4520
+++ b/test/stderr/4520
@@ -31,9 +31,9 @@ cmd buf flush ddd bytes
SMTP<< 250 Accepted
SMTP<< 354 Enter message, ending with "." on a line by itself
DKIM (checking verify key)>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-transport forking for child-open
-postfork: child-open
-transport forked for child-open: npppp
+transport forking for fakens-search
+postfork: fakens-search
+transport forked for fakens-search: npppp
DKIM >> Parsing public key record >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
sel_bad._domainkey.test.ex.
Raw record: v=DKIM1\;{SP}p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDXRFf+VhT+lCgFhhSkinZKcFNeRzjYdW8vT29Rbb3NadvTFwAd+cVLPFwZL8H5tUD/7JbUPqNTCPxmpgIL+V5T4tEZMorHatvvUM2qfcpQ45IfsZ+YdhbIiAslHCpy4xNxIR3zylgqRUF4+Dtsaqy3a5LhwMiKCLrnzhXk1F1hxwIDAQAB
diff --git a/test/stderr/4802 b/test/stderr/4802
index 85a2b1c..6ce47f9 100644
--- a/test/stderr/4802
+++ b/test/stderr/4802
@@ -3,17 +3,17 @@ configuration file is TESTSUITE/test-config
admin user
dropping to exim gid; retaining priv uid
DNS lookup of mx-sec-a-aa.test.ex (MX) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of mx-sec-a-aa.test.ex (MX) succeeded
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of a-aa.test.ex (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+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 >>>>>>>>>>>>>>>>
@@ -22,17 +22,17 @@ configuration file is TESTSUITE/test-config
admin user
dropping to exim gid; retaining priv uid
DNS lookup of mx-aa-a-sec.test.ex (MX) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of mx-aa-a-sec.test.ex (MX) succeeded
DNS lookup of mx-aa-a-sec.test.ex (MX) requested AD, but got AA
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of a-sec.test.ex (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+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 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/4803 b/test/stderr/4803
index 5636a39..95844dd 100644
--- a/test/stderr/4803
+++ b/test/stderr/4803
@@ -3,17 +3,17 @@ configuration file is TESTSUITE/test-config
admin user
dropping to exim gid; retaining priv uid
DNS lookup of mx-sec-a-aa.test.ex (MX) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of mx-sec-a-aa.test.ex (MX) succeeded
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of a-aa.test.ex (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
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 *))
@@ -24,19 +24,19 @@ configuration file is TESTSUITE/test-config
admin user
dropping to exim gid; retaining priv uid
DNS lookup of mx-aa-a-sec.test.ex (MX) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of mx-aa-a-sec.test.ex (MX) 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 *))
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
DNS lookup of a-sec.test.ex (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+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 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/5204 b/test/stderr/5204
index 187938a..6bc1229 100644
--- a/test/stderr/5204
+++ b/test/stderr/5204
@@ -16,9 +16,9 @@ checking domains
calling q router
q router called for "DECLINE cannot route this one (DECLINE)"@???: domain = some.host
requires uid=EXIM_UID gid=EXIM_GID current_directory=/
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for queryprogram-cmd
+postfork: queryprogram-cmd
+fresh-exec forked for queryprogram-cmd: npppp
command wrote: DECLINE cannot route this one (DECLINE)
q router declined for "DECLINE cannot route this one (DECLINE)"@???
"more" is false: skipping remaining routers
@@ -40,9 +40,9 @@ checking domains
calling q router
q router called for "FAIL cannot route this one (FAIL)"@???: domain = some.host
requires uid=EXIM_UID gid=EXIM_GID current_directory=/
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for queryprogram-cmd
+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 >>>>>>>>>>>>>>>>
@@ -62,9 +62,9 @@ checking domains
calling q router
q router called for "ERROR cannot route this one (ERROR)"@???: domain = some.host
requires uid=EXIM_UID gid=EXIM_GID current_directory=/
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for queryprogram-cmd
+postfork: queryprogram-cmd
+fresh-exec forked for queryprogram-cmd: npppp
command wrote: ERROR cannot route this one (ERROR)
LOG: PANIC
q router: bad command yield: ERROR cannot route this one (ERROR)
@@ -87,9 +87,9 @@ checking domains
calling q router
q router called for "DEFER cannot route this one (DEFER)"@???: domain = some.host
requires uid=EXIM_UID gid=EXIM_GID current_directory=/
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for queryprogram-cmd
+postfork: queryprogram-cmd
+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)
@@ -110,18 +110,18 @@ checking domains
calling q router
q router called for "ACCEPT transport = other_smtp hosts=ten-1.test.ex"@???: domain = some.host
requires uid=EXIM_UID gid=EXIM_GID current_directory=/
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for queryprogram-cmd
+postfork: queryprogram-cmd
+fresh-exec forked for queryprogram-cmd: npppp
command wrote: ACCEPT transport = other_smtp hosts=ten-1.test.ex
finding IP address for ten-1.test.ex
doing DNS lookup
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
+fresh-exec forking for fakens-search
+postfork: fakens-search
+fresh-exec forked for fakens-search: npppp
queued for other_smtp transport: local_part = ACCEPT transport = other_smtp hosts=ten-1.test.ex
domain = some.host
errors_to=NULL
@@ -147,9 +147,9 @@ checking domains
calling q router
q router called for PASS@???: domain = some.host
requires uid=EXIM_UID gid=EXIM_GID current_directory=/
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for queryprogram-cmd
+postfork: queryprogram-cmd
+fresh-exec forked for queryprogram-cmd: npppp
command wrote: PASS
q router passed for PASS@???
--------> s router <--------
@@ -190,9 +190,9 @@ checking domains
calling q router
q router called for "FREEZE cannot route this one (FREEZE)"@???: domain = some.host
requires uid=EXIM_UID gid=EXIM_GID current_directory=/
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for queryprogram-cmd
+postfork: queryprogram-cmd
+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)
@@ -213,9 +213,9 @@ checking domains
calling q router
q router called for "REDIRECT postmaster@???: domain = some.host
requires uid=EXIM_UID gid=EXIM_GID current_directory=/
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for queryprogram-cmd
+postfork: queryprogram-cmd
+fresh-exec forked for queryprogram-cmd: npppp
command wrote: REDIRECT postmaster@???
rda_interpret (string): 'postmaster@???'
expanded: 'postmaster@???'
@@ -292,9 +292,9 @@ q router called for "FAIL cannot route this one (FAIL)"@???: domain = some
requires uid=CALLER_UID gid=CALLER_GID current_directory=/
not running as root: cannot change uid/gid
subprocess will run with uid=EXIM_UID gid=EXIM_GID
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+fresh-exec forking for queryprogram-cmd
+postfork: queryprogram-cmd
+fresh-exec forked for queryprogram-cmd: npppp
command wrote: FAIL cannot route this one (FAIL)
q router forced address failure
----------- end verify ------------
diff --git a/test/stdout/0366 b/test/stdout/0366
index 40ae88f..8fc03ee 100644
--- a/test/stdout/0366
+++ b/test/stdout/0366
@@ -1 +1 @@
-Retry rule: ^[^@]+@ten- * F,3s,1s;
+Retry rule: ^[^@]+@ten- * F,4s,1s;
