From 4b01271fa595a08e68ba8c58d6404e83623aa9c8 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Fri, 20 Mar 2020 22:48:41 +0000 Subject: [PATCH] debug tidying --- src/src/child.c | 2 +- src/src/daemon.c | 9 ++-- src/src/deliver.c | 8 +--- src/src/exim.c | 3 +- src/src/log.c | 2 +- src/src/queue.c | 4 +- src/src/smtp_in.c | 4 +- src/src/tls.c | 2 +- src/src/transport.c | 10 ++--- src/src/transports/pipe.c | 2 +- src/src/transports/smtp.c | 8 +--- test/scripts/0000-Basic/0081 | 1 + test/stderr/0218 | 32 +++++++------- test/stderr/0283 | 22 +++++----- test/stderr/0332 | 10 ++--- test/stderr/0333 | 10 ++--- test/stderr/0370 | 6 +-- test/stderr/0374 | 22 +++++----- test/stderr/0375 | 22 +++++----- test/stderr/0378 | 6 +-- test/stderr/0382 | 10 ++--- test/stderr/0388 | 12 +++--- test/stderr/0393 | 6 +-- test/stderr/0426 | 10 ++--- test/stderr/0433 | 48 ++++++++++----------- test/stderr/0438 | 24 +++++------ test/stderr/0476 | 10 ++--- test/stderr/0512 | 20 ++++----- test/stderr/0609 | 6 +-- test/stderr/1007 | 64 +++++++++++++-------------- test/stderr/2013 | 84 ++++++++++++++++++------------------ test/stderr/2035 | 14 +++--- test/stderr/2113 | 84 ++++++++++++++++++------------------ test/stderr/2135 | 14 +++--- test/stderr/2201 | 6 +-- 35 files changed, 288 insertions(+), 309 deletions(-) diff --git a/src/src/child.c b/src/src/child.c index ba7e899d2..5e4b978cd 100644 --- a/src/src/child.c +++ b/src/src/child.c @@ -145,7 +145,7 @@ if (acount > 0) argv[n] = NULL; if (exec_type == CEE_RETURN_ARGV) { - if (pcount != NULL) *pcount = n; + if (pcount) *pcount = n; return argv; } diff --git a/src/src/daemon.c b/src/src/daemon.c index 81fb69447..fa74ddb0e 100644 --- a/src/src/daemon.c +++ b/src/src/daemon.c @@ -663,7 +663,7 @@ if (pid == 0) mac_smtp_fflush(); - if ((dpid = exim_fork(US"daemon-accept delivery")) == 0) + if ((dpid = exim_fork(US"daemon-accept-delivery")) == 0) { (void)fclose(smtp_in); (void)fclose(smtp_out); @@ -981,7 +981,7 @@ if (daemon_notifier_fd >= 0) if (f.running_in_test_harness || write_pid) { - if ((pid = exim_fork(US"daemon del pidfile")) == 0) + if ((pid = exim_fork(US"daemon-del-pidfile")) == 0) { if (override_pid_file_path) (void)child_exec_exim(CEE_EXEC_PANIC, FALSE, NULL, FALSE, 3, @@ -2130,11 +2130,8 @@ for (;;) if ( queue_interval > 0 && (local_queue_run_max <= 0 || queue_run_count < local_queue_run_max)) { - if ((pid = exim_fork(US"queue runner")) == 0) + if ((pid = exim_fork(US"queue-runner")) == 0) { - DEBUG(D_any) debug_printf("Starting queue-runner: pid %d\n", - (int)getpid()); - /* Disable debugging if it's required only for the daemon process. We leave the above message, because it ties up with the "child ended" debugging messages. */ diff --git a/src/src/deliver.c b/src/src/deliver.c index 497b3c806..1748c7985 100644 --- a/src/src/deliver.c +++ b/src/src/deliver.c @@ -4646,7 +4646,6 @@ all pipes, so I do not see a reason to use non-blocking IO here search_tidyup(); - DEBUG(D_deliver) debug_printf("forking transport process\n"); if ((pid = exim_fork(US"transport")) == 0) { int fd = pfd[pipe_write]; @@ -4661,10 +4660,7 @@ all pipes, so I do not see a reason to use non-blocking IO here /* Show pids on debug output if parallelism possible */ if (parmax > 1 && (parcount > 0 || addr_remote)) - { DEBUG(D_any|D_v) debug_selector |= D_pid; - DEBUG(D_deliver) debug_printf("Remote delivery process started\n"); - } /* Reset the random number generator, so different processes don't all have the same sequence. In the test harness we want different, but @@ -4977,7 +4973,6 @@ all pipes, so I do not see a reason to use non-blocking IO here (void)close(fd); exit(EXIT_SUCCESS); } - DEBUG(D_deliver) debug_printf("forked transport process (%d)\n", pid); /* Back in the mainline: close the unwanted half of the pipe. */ @@ -8580,7 +8575,7 @@ if (cutthrough.cctx.sock >= 0 && cutthrough.callout_hold_only) where = US"fork"; testharness_pause_ms(150); - if ((pid = exim_fork(US"tls-proxy interproc")) < 0) + if ((pid = exim_fork(US"tls-proxy-interproc")) < 0) goto fail; if (pid == 0) /* child: will fork again to totally disconnect */ @@ -8590,7 +8585,6 @@ if (cutthrough.cctx.sock >= 0 && cutthrough.callout_hold_only) /* does not return */ } - DEBUG(D_transport) debug_printf("proxy-proc inter-pid %d\n", pid); close(pfd[0]); waitpid(pid, NULL, 0); (void) close(channel_fd); /* release the client socket */ diff --git a/src/src/exim.c b/src/src/exim.c index 2ac0720ca..1c0ea6b6e 100644 --- a/src/src/exim.c +++ b/src/src/exim.c @@ -2762,7 +2762,8 @@ for (i = 1; i < argc; i++) /* -MCd: for debug, set a process-purpose string */ - case 'd': if (++i < argc) process_purpose = argv[i]; + case 'd': if (++i < argc) + process_purpose = string_copy_taint(argv[i], TRUE); else badarg = TRUE; break; diff --git a/src/src/log.c b/src/src/log.c index 89c5dc003..2dd85c484 100644 --- a/src/src/log.c +++ b/src/src/log.c @@ -313,7 +313,7 @@ Returns: a file descriptor, or < 0 on failure (errno set) int log_create_as_exim(uschar *name) { -pid_t pid = exim_fork(US"logfile create"); +pid_t pid = exim_fork(US"logfile-create"); int status = 1; int fd = -1; diff --git a/src/src/queue.c b/src/src/queue.c index 211349047..9dbf3e717 100644 --- a/src/src/queue.c +++ b/src/src/queue.c @@ -496,10 +496,8 @@ for (int i = queue_run_in_order ? -1 : 0; } else for (i = 0; qpid[i]; ) i++; - DEBUG(D_queue_run) debug_printf("q2stage forking\n"); - if ((qpid[i] = exim_fork(US"qrun phase one"))) + if ((qpid[i] = exim_fork(US"qrun-phase-one"))) continue; /* parent loops around */ - DEBUG(D_queue_run) debug_printf("q2stage child\n"); } /* Skip this message unless it's within the ID limits */ diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c index b5f44f548..268fd6956 100644 --- a/src/src/smtp_in.c +++ b/src/src/smtp_in.c @@ -5759,7 +5759,7 @@ while (done <= 0) oldsignal = signal(SIGCHLD, SIG_IGN); - if ((pid = exim_fork(US"etrn command")) == 0) + if ((pid = exim_fork(US"etrn-command")) == 0) { smtp_input = FALSE; /* This process is not associated with the */ (void)fclose(smtp_in); /* SMTP call any more. */ @@ -5771,7 +5771,7 @@ while (done <= 0) into another process. */ if ( !smtp_etrn_serialize - || (pid = exim_fork(US"etrn serialised command")) == 0) + || (pid = exim_fork(US"etrn-serialised-command")) == 0) { DEBUG(D_exec) debug_print_argv(argv); exim_nullstd(); /* Ensure std{in,out,err} exist */ diff --git a/src/src/tls.c b/src/src/tls.c index 2f9faa3c7..9732da533 100644 --- a/src/src/tls.c +++ b/src/src/tls.c @@ -441,7 +441,7 @@ else if (!nowarn && !tls_certificate) oldsignal = signal(SIGCHLD, SIG_DFL); fflush(NULL); -if ((pid = exim_fork(US"cipher validate")) < 0) +if ((pid = exim_fork(US"cipher-validate")) < 0) log_write(0, LOG_MAIN|LOG_PANIC_DIE, "fork failed for TLS check"); if (pid == 0) diff --git a/src/src/transport.c b/src/src/transport.c index 6b33a0e68..d2cb8c235 100644 --- a/src/src/transport.c +++ b/src/src/transport.c @@ -1250,7 +1250,7 @@ via a(nother) pipe. While writing to the filter, we do not do the CRLF, smtp dots, or check string processing. */ if (pipe(pfd) != 0) goto TIDY_UP; /* errno set */ -if ((write_pid = exim_fork(US"transport filter writer")) == 0) +if ((write_pid = exim_fork(US"tpt-filter-writer")) == 0) { BOOL rc; (void)close(fd_read); @@ -1958,7 +1958,7 @@ int status; DEBUG(D_transport) debug_printf("transport_pass_socket entered\n"); -if ((pid = exim_fork(US"continued-transport interproc")) == 0) +if ((pid = exim_fork(US"continued-transport-interproc")) == 0) { /* Disconnect entirely from the parent process. If we are running in the test harness, wait for a bit to allow the previous process time to finish, @@ -1966,11 +1966,8 @@ if ((pid = exim_fork(US"continued-transport interproc")) == 0) automatic comparison. */ if ((pid = exim_fork(US"continued-transport")) != 0) - { - DEBUG(D_transport) debug_printf("transport_pass_socket succeeded (final-pid %d)\n", pid); _exit(EXIT_SUCCESS); - } - testharness_pause_ms(1000); /*TTT*/ + testharness_pause_ms(1000); transport_do_pass_socket(transport_name, hostname, hostaddress, id, socket_fd); @@ -1984,7 +1981,6 @@ if (pid > 0) { int rc; while ((rc = wait(&status)) != pid && (rc >= 0 || errno != ECHILD)); - DEBUG(D_transport) debug_printf("transport_pass_socket succeeded (inter-pid %d)\n", pid); return TRUE; } else diff --git a/src/src/transports/pipe.c b/src/src/transports/pipe.c index c1e2b26c7..6a7f150ac 100644 --- a/src/src/transports/pipe.c +++ b/src/src/transports/pipe.c @@ -738,7 +738,7 @@ tctx.u.fd = fd_in; /* Now fork a process to handle the output that comes down the pipe. */ -if ((outpid = exim_fork(US"pipe-transport output")) < 0) +if ((outpid = exim_fork(US"pipe-tpt-output")) < 0) { addr->basic_errno = errno; addr->transport_return = DEFER; diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c index 2216ff853..0bec253c1 100644 --- a/src/src/transports/smtp.c +++ b/src/src/transports/smtp.c @@ -3284,11 +3284,8 @@ int max_fd = MAX(pfd[0], tls_out.active.sock) + 1; int rc, i; close(pfd[1]); -if ((rc = exim_fork(US"tls proxy"))) - { - DEBUG(D_transport) debug_printf("proxy-proc final-pid %d\n", rc); +if ((rc = exim_fork(US"tls-proxy"))) _exit(rc < 0 ? EXIT_FAILURE : EXIT_SUCCESS); - } set_process_info("proxying TLS connection for continued transport"); FD_ZERO(&rfds); @@ -4278,7 +4275,7 @@ propagate it from the initial #ifndef DISABLE_TLS if (tls_out.active.sock >= 0) { - int pid = exim_fork(US"tls proxy interproc"); + int pid = exim_fork(US"tls-proxy-interproc"); if (pid == 0) /* child; fork again to disconnect totally */ { /* does not return */ @@ -4288,7 +4285,6 @@ propagate it from the initial if (pid > 0) /* parent */ { - DEBUG(D_transport) debug_printf("proxy-proc inter-pid %d\n", pid); close(pfd[0]); /* tidy the inter-proc to disconn the proxy proc */ waitpid(pid, NULL, 0); diff --git a/test/scripts/0000-Basic/0081 b/test/scripts/0000-Basic/0081 index a392fd166..05c5e2d40 100644 --- a/test/scripts/0000-Basic/0081 +++ b/test/scripts/0000-Basic/0081 @@ -9,3 +9,4 @@ Subject: testing, testing X-one: This is the fourth text. This is the message body. +**** diff --git a/test/stderr/0218 b/test/stderr/0218 index af919d5cd..3171503f9 100644 --- a/test/stderr/0218 +++ b/test/stderr/0218 @@ -49,14 +49,14 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 351 Send more SMTP>> writing message and terminating "." SMTP<< 250 OK -transport forking for continued-transport interproc -postfork: continued-transport interproc -continued-transport interproc forking for continued-transport +transport forking for continued-transport-interproc +postfork: continued-transport-interproc +continued-transport-interproc forking for continued-transport postfork: continued-transport fresh-exec forked for qrun delivery: npppp qrun delivery forked for transport: npppp -transport forked for continued-transport interproc: npppp -continued-transport interproc forked for continued-transport: npppp +transport forked for continued-transport-interproc: npppp +continued-transport-interproc forked for continued-transport: npppp SMTP(close)>> LOG: MAIN => a@test.ex F= R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 OK" @@ -147,9 +147,9 @@ fresh-exec forked for qrun delivery: npppp qrun delivery forked for transport: npppp LOG: MAIN ** a@test.ex F= R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined MAIL FROM:: 550 NO -qrun delivery forking for bounce message -postfork: bounce message -qrun delivery forked for bounce message: npppp +qrun delivery forking for bounce-message +postfork: bounce-message +qrun delivery forked for bounce-message: npppp Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -236,20 +236,20 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 503 Unexpected DATA SMTP>> RSET SMTP<< 250 OK -transport forking for continued-transport interproc -postfork: continued-transport interproc -continued-transport interproc forking for continued-transport +transport forking for continued-transport-interproc +postfork: continued-transport-interproc +continued-transport-interproc forking for continued-transport postfork: continued-transport fresh-exec forked for qrun delivery: npppp qrun delivery forked for transport: npppp -transport forked for continued-transport interproc: npppp -continued-transport interproc forked for continued-transport: npppp +transport forked for continued-transport-interproc: npppp +continued-transport-interproc forked for continued-transport: npppp SMTP(close)>> LOG: MAIN ** b@test.ex F= R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 550 Unknown -qrun delivery forking for bounce message -postfork: bounce message -qrun delivery forked for bounce message: npppp +qrun delivery forking for bounce-message +postfork: bounce-message +qrun delivery forked for bounce-message: npppp Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user diff --git a/test/stderr/0283 b/test/stderr/0283 index ebf35298a..13cc31bb2 100644 --- a/test/stderr/0283 +++ b/test/stderr/0283 @@ -38,17 +38,17 @@ delivery-local forking for pipe-tpt-cmd postfork: pipe-tpt-cmd local-accept-delivery forked for delivery-local: npppp delivery-local forked for pipe-tpt-cmd: npppp -delivery-local forking for pipe-transport output -postfork: pipe-transport output -delivery-local forked for pipe-transport output: npppp +delivery-local forking for pipe-tpt-output +postfork: pipe-tpt-output +delivery-local forked for pipe-tpt-output: npppp transport error EPIPE ignored LOG: MAIN ** somebody@myhost.test.ex R=rest T=t1: return message generated changed uid/gid: post-delivery tidying uid=EXIM_UID gid=EXIM_GID pid=pppp -local-accept-delivery forking for bounce message -postfork: bounce message -local-accept-delivery forked for bounce message: npppp +local-accept-delivery forking for bounce-message +postfork: bounce-message +local-accept-delivery forked for bounce-message: npppp Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=pppp @@ -65,9 +65,9 @@ seeking password data for user "root": cache not available getpwnam() succeeded uid=uuuu gid=gggg LOG: MAIN <= <> R=10HmaY-0005vi-00 U=EXIMUSER P=local S=sss -bounce message forking for local-accept-delivery +bounce-message forking for local-accept-delivery postfork: local-accept-delivery -bounce message forked for local-accept-delivery: npppp +bounce-message forked for local-accept-delivery: npppp Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=pppp @@ -131,9 +131,9 @@ seeking password data for user "root": cache not available getpwnam() succeeded uid=uuuu gid=gggg LOG: MAIN PANIC User 0 set for t3 transport is on the never_users list -local-accept-delivery forking for logfile create -postfork: logfile create -local-accept-delivery forked for logfile create: npppp +local-accept-delivery forking for logfile-create +postfork: logfile-create +local-accept-delivery forked for logfile-create: npppp LOG: MAIN == never@myhost.test.ex R=never T=t3 defer (-29): User 0 set for t3 transport is on the never_users list changed uid/gid: post-delivery tidying diff --git a/test/stderr/0332 b/test/stderr/0332 index a7036e5b2..0dbc12994 100644 --- a/test/stderr/0332 +++ b/test/stderr/0332 @@ -38,14 +38,14 @@ qrun delivery forking for transport postfork: transport locking TESTSUITE/spool/db/retry.lockfile locking TESTSUITE/spool/db/wait-t1.lockfile -transport forking for continued-transport interproc -postfork: continued-transport interproc -continued-transport interproc forking for continued-transport +transport forking for continued-transport-interproc +postfork: continued-transport-interproc +continued-transport-interproc forking for continued-transport postfork: continued-transport fresh-exec forked for qrun delivery: npppp qrun delivery forked for transport: npppp -transport forked for continued-transport interproc: npppp -continued-transport interproc forked for continued-transport: npppp +transport forked for continued-transport-interproc: npppp +continued-transport-interproc forked for continued-transport: npppp LOG: MAIN => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK" LOG: MAIN diff --git a/test/stderr/0333 b/test/stderr/0333 index 34a9973fc..97c36332a 100644 --- a/test/stderr/0333 +++ b/test/stderr/0333 @@ -34,13 +34,13 @@ fresh-exec forking for transport postfork: transport locking TESTSUITE/spool/db/retry.lockfile locking TESTSUITE/spool/db/wait-t1.lockfile -transport forking for continued-transport interproc -postfork: continued-transport interproc -continued-transport interproc forking for continued-transport +transport forking for continued-transport-interproc +postfork: continued-transport-interproc +continued-transport-interproc forking for continued-transport postfork: continued-transport fresh-exec forked for transport: npppp -transport forked for continued-transport interproc: npppp -continued-transport interproc forked for continued-transport: npppp +transport forked for continued-transport-interproc: npppp +continued-transport-interproc forked for continued-transport: npppp LOG: MAIN => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK" LOG: MAIN diff --git a/test/stderr/0370 b/test/stderr/0370 index 84a20903b..4585cb804 100644 --- a/test/stderr/0370 +++ b/test/stderr/0370 @@ -31,9 +31,9 @@ delivery-local forking for pipe-tpt-cmd postfork: pipe-tpt-cmd local-accept-delivery forked for delivery-local: npppp delivery-local forked for pipe-tpt-cmd: npppp -delivery-local forking for pipe-transport output -postfork: pipe-transport output -delivery-local forked for pipe-transport output: npppp +delivery-local forking for pipe-tpt-output +postfork: pipe-tpt-output +delivery-local forked for pipe-tpt-output: npppp Writing message to pipe writing data block fd=dddd size=sss timeout=3600 writing error EEE: Broken pipe diff --git a/test/stderr/0374 b/test/stderr/0374 index 24fc97d50..c721d8a90 100644 --- a/test/stderr/0374 +++ b/test/stderr/0374 @@ -388,9 +388,9 @@ delivery-local forking for pipe-tpt-cmd postfork: pipe-tpt-cmd local-accept-delivery forked for delivery-local: npppp delivery-local forked for pipe-tpt-cmd: npppp -delivery-local forking for pipe-transport output -postfork: pipe-transport output -delivery-local forked for pipe-transport output: npppp +delivery-local forking for pipe-tpt-output +postfork: pipe-tpt-output +delivery-local forked for pipe-tpt-output: npppp transport error EPIPE ignored LOG: MAIN ** b1@myhost.test.ex R=ut2 T=ut2: Child process of ut2 transport returned 127 (could mean unable to exec or command does not exist) from command: /non/existent/file @@ -401,9 +401,9 @@ delivery-local forking for pipe-tpt-cmd postfork: pipe-tpt-cmd local-accept-delivery forked for delivery-local: npppp delivery-local forked for pipe-tpt-cmd: npppp -delivery-local forking for pipe-transport output -postfork: pipe-transport output -delivery-local forked for pipe-transport output: npppp +delivery-local forking for pipe-tpt-output +postfork: pipe-tpt-output +delivery-local forked for pipe-tpt-output: npppp transport error EPIPE ignored LOG: MAIN == c1@myhost.test.ex R=ut3 T=ut3 defer (0): Child process of ut3 transport returned 127 (could mean unable to exec or command does not exist) from command: /non/existent/file @@ -428,18 +428,18 @@ local-accept-delivery forked for transport: npppp LOG: MAIN ** d3@myhost.test.ex R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 550 hard error locking TESTSUITE/spool/db/retry.lockfile -local-accept-delivery forking for bounce message -postfork: bounce message -local-accept-delivery forked for bounce message: npppp +local-accept-delivery forking for bounce-message +postfork: bounce-message +local-accept-delivery forked for bounce-message: npppp Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user admin user LOG: MAIN <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss -bounce message forking for local-accept-delivery +bounce-message forking for local-accept-delivery postfork: local-accept-delivery -bounce message forked for local-accept-delivery: npppp +bounce-message forked for local-accept-delivery: npppp Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user diff --git a/test/stderr/0375 b/test/stderr/0375 index a60c29bd8..da272aac1 100644 --- a/test/stderr/0375 +++ b/test/stderr/0375 @@ -833,9 +833,9 @@ delivery-local forking for pipe-tpt-cmd postfork: pipe-tpt-cmd local-accept-delivery forked for delivery-local: npppp delivery-local forked for pipe-tpt-cmd: npppp -delivery-local forking for pipe-transport output -postfork: pipe-transport output -delivery-local forked for pipe-transport output: npppp +delivery-local forking for pipe-tpt-output +postfork: pipe-tpt-output +delivery-local forked for pipe-tpt-output: npppp transport error EPIPE ignored LOG: MAIN ** b1@myhost.test.ex P=<> R=ut2 T=ut2: Child process of ut2 transport returned 127 (could mean unable to exec or command does not exist) from command: /non/existent/file @@ -847,9 +847,9 @@ delivery-local forking for pipe-tpt-cmd postfork: pipe-tpt-cmd local-accept-delivery forked for delivery-local: npppp delivery-local forked for pipe-tpt-cmd: npppp -delivery-local forking for pipe-transport output -postfork: pipe-transport output -delivery-local forked for pipe-transport output: npppp +delivery-local forking for pipe-tpt-output +postfork: pipe-tpt-output +delivery-local forked for pipe-tpt-output: npppp transport error EPIPE ignored LOG: MAIN == c1@myhost.test.ex R=ut3 T=ut3 defer (0): Child process of ut3 transport returned 127 (could mean unable to exec or command does not exist) from command: /non/existent/file @@ -912,18 +912,18 @@ locking TESTSUITE/spool/db/retry.lockfile LOG: MAIN f3@myhost.test.ex : error ignored log writing disabled -local-accept-delivery forking for bounce message -postfork: bounce message -local-accept-delivery forked for bounce message: npppp +local-accept-delivery forking for bounce-message +postfork: bounce-message +local-accept-delivery forked for bounce-message: npppp Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user admin user LOG: MAIN <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss -bounce message forking for local-accept-delivery +bounce-message forking for local-accept-delivery postfork: local-accept-delivery -bounce message forked for local-accept-delivery: npppp +bounce-message forked for local-accept-delivery: npppp Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user diff --git a/test/stderr/0378 b/test/stderr/0378 index 3c422c19b..bcd145cda 100644 --- a/test/stderr/0378 +++ b/test/stderr/0378 @@ -179,9 +179,9 @@ delivery-local forking for pipe-tpt-cmd postfork: pipe-tpt-cmd local-accept-delivery forked for delivery-local: npppp delivery-local forked for pipe-tpt-cmd: npppp -delivery-local forking for pipe-transport output -postfork: pipe-transport output -delivery-local forked for pipe-transport output: npppp +delivery-local forking for pipe-tpt-output +postfork: pipe-tpt-output +delivery-local forked for pipe-tpt-output: npppp transport error EPIPE ignored LOG: MAIN => |/bin/sh -c exit R=aaaa T=t2 diff --git a/test/stderr/0382 b/test/stderr/0382 index 8c48c2cc1..f932bdf9e 100644 --- a/test/stderr/0382 +++ b/test/stderr/0382 @@ -18,18 +18,18 @@ running system filter system filter returned 1 LOG: MAIN ** userx@test.ex R=r1: forced fail -local-accept-delivery forking for bounce message -postfork: bounce message -local-accept-delivery forked for bounce message: npppp +local-accept-delivery forking for bounce-message +postfork: bounce-message +local-accept-delivery forked for bounce-message: npppp Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user admin user LOG: MAIN <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss -bounce message forking for local-accept-delivery +bounce-message forking for local-accept-delivery postfork: local-accept-delivery -bounce message forked for local-accept-delivery: npppp +bounce-message forked for local-accept-delivery: npppp Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user diff --git a/test/stderr/0388 b/test/stderr/0388 index 17f60e9b9..328978767 100644 --- a/test/stderr/0388 +++ b/test/stderr/0388 @@ -172,10 +172,10 @@ LOG: MAIN EXIM_DBCLOSE(0xAAAAAAAA) closed hints database and lockfile end of retry processing -fresh-exec forking for bounce message -postfork: bounce message -exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xd7715ced -MCd bounce message -odi -odi -t -oem -oi -f <> -E10HmaX-0005vi-00 -fresh-exec forked for bounce message: npppp +fresh-exec forking for bounce-message +postfork: bounce-message +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xd7715ced -MCd bounce-message -odi -odi -t -oem -oi -f <> -E10HmaX-0005vi-00 +fresh-exec forked for bounce-message: npppp Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=pppp @@ -230,10 +230,10 @@ Size of headers = sss LOG: MAIN <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss search_tidyup called -bounce message forking for local-accept-delivery +bounce-message forking for local-accept-delivery postfork: local-accept-delivery exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xd7715ced -MCd local-accept-delivery -odi -Mc 10HmaY-0005vi-00 -bounce message forked for local-accept-delivery: npppp +bounce-message forked for local-accept-delivery: npppp Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=pppp diff --git a/test/stderr/0393 b/test/stderr/0393 index d9938f923..6fd6a6276 100644 --- a/test/stderr/0393 +++ b/test/stderr/0393 @@ -38,12 +38,12 @@ postfork: transport-filter local-accept-delivery forked for delivery-local: npppp delivery-local forked for transport-filter: npppp process pppp running as transport filter: fd_write=dddd fd_read=dddd -delivery-local forking for transport filter writer -postfork: transport filter writer +delivery-local forking for tpt-filter-writer +postfork: tpt-filter-writer cannot use sendfile for body: spoolfile not wireformat writing data block fd=dddd size=sss timeout=0 >>>>>>>>>>>>>>>> Exim pid=pppp (tpt-filter writer) terminating with rc=0 >>>>>>>>>>>>>>>> -delivery-local forked for transport filter writer: npppp +delivery-local forked for tpt-filter-writer: npppp process pppp writing to transport filter copying from the filter waiting for filter process diff --git a/test/stderr/0426 b/test/stderr/0426 index 6d02a3957..b269ac499 100644 --- a/test/stderr/0426 +++ b/test/stderr/0426 @@ -66,18 +66,18 @@ locking TESTSUITE/spool/db/wait-t1.lockfile local-accept-delivery forked for transport: npppp LOG: MAIN ** x@uppercase.test.ex R=r1 T=t1 H=uppercase.test.ex [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 550 Unknown -local-accept-delivery forking for bounce message -postfork: bounce message -local-accept-delivery forked for bounce message: npppp +local-accept-delivery forking for bounce-message +postfork: bounce-message +local-accept-delivery forked for bounce-message: npppp Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user admin user LOG: MAIN <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss -bounce message forking for local-accept-delivery +bounce-message forking for local-accept-delivery postfork: local-accept-delivery -bounce message forked for local-accept-delivery: npppp +bounce-message forked for local-accept-delivery: npppp Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user diff --git a/test/stderr/0433 b/test/stderr/0433 index 686e992e3..2f7e9b5fd 100644 --- a/test/stderr/0433 +++ b/test/stderr/0433 @@ -18,10 +18,10 @@ LOG: MAIN set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... -fresh-exec forking for daemon del pidfile -pppp postfork: daemon del pidfile -pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon del pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX -fresh-exec forked for daemon del pidfile: npppp +fresh-exec forking for daemon-del-pidfile +pppp postfork: daemon-del-pidfile +pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +fresh-exec forked for daemon-del-pidfile: npppp search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -43,10 +43,10 @@ LOG: MAIN set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 port 1226 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... -fresh-exec forking for daemon del pidfile -pppp postfork: daemon del pidfile -pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon del pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX -fresh-exec forked for daemon del pidfile: npppp +fresh-exec forking for daemon-del-pidfile +pppp postfork: daemon-del-pidfile +pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +fresh-exec forked for daemon-del-pidfile: npppp search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -69,10 +69,10 @@ LOG: MAIN set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on [127.0.0.1]:1228 port 1225 (IPv4) port 1226 (IPv4) daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... -fresh-exec forking for daemon del pidfile -pppp postfork: daemon del pidfile -pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; 127.0.0.1.1228 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon del pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX -fresh-exec forked for daemon del pidfile: npppp +fresh-exec forking for daemon-del-pidfile +pppp postfork: daemon-del-pidfile +pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; 127.0.0.1.1228 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +fresh-exec forked for daemon-del-pidfile: npppp search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -95,10 +95,10 @@ LOG: MAIN set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 port 1226 [127.0.0.1]:1228 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... -fresh-exec forking for daemon del pidfile -pppp postfork: daemon del pidfile -pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; 0.0.0.0; 127.0.0.1.1228 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon del pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX -fresh-exec forked for daemon del pidfile: npppp +fresh-exec forking for daemon-del-pidfile +pppp postfork: daemon-del-pidfile +pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; 0.0.0.0; 127.0.0.1.1228 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +fresh-exec forked for daemon-del-pidfile: npppp search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -122,10 +122,10 @@ LOG: MAIN set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on [127.0.0.1]:1228 port 1227 (IPv4) daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... -fresh-exec forking for daemon del pidfile -pppp postfork: daemon del pidfile -pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; 127.0.0.1.1228 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon del pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX -fresh-exec forked for daemon del pidfile: npppp +fresh-exec forking for daemon-del-pidfile +pppp postfork: daemon-del-pidfile +pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; 127.0.0.1.1228 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +fresh-exec forked for daemon-del-pidfile: npppp search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -149,9 +149,9 @@ LOG: MAIN set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 port 1226 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... -fresh-exec forking for daemon del pidfile -pppp postfork: daemon del pidfile -pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon del pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX -fresh-exec forked for daemon del pidfile: npppp +fresh-exec forking for daemon-del-pidfile +pppp postfork: daemon-del-pidfile +pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +fresh-exec forked for daemon-del-pidfile: npppp search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0438 b/test/stderr/0438 index c9b14d2c2..2d7f0c333 100644 --- a/test/stderr/0438 +++ b/test/stderr/0438 @@ -20,10 +20,10 @@ LOG: MAIN set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... -fresh-exec forking for daemon del pidfile -pppp postfork: daemon del pidfile -pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon del pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX -fresh-exec forked for daemon del pidfile: npppp +fresh-exec forking for daemon-del-pidfile +pppp postfork: daemon-del-pidfile +pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +fresh-exec forked for daemon-del-pidfile: npppp search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -46,10 +46,10 @@ LOG: MAIN set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... -fresh-exec forking for daemon del pidfile -pppp postfork: daemon del pidfile -pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon del pidfile -oP TESTSUITE/spool/exim-daemon.anotherpid -oPX -fresh-exec forked for daemon del pidfile: npppp +fresh-exec forking for daemon-del-pidfile +pppp postfork: daemon-del-pidfile +pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.anotherpid -oPX +fresh-exec forked for daemon-del-pidfile: npppp search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -72,9 +72,9 @@ LOG: MAIN set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... -fresh-exec forking for daemon del pidfile -pppp postfork: daemon del pidfile -pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon del pidfile -oP TESTSUITE/spool/mypidfile -oPX -fresh-exec forked for daemon del pidfile: npppp +fresh-exec forking for daemon-del-pidfile +pppp postfork: daemon-del-pidfile +pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/mypidfile -oPX +fresh-exec forked for daemon-del-pidfile: npppp search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0476 b/test/stderr/0476 index 40a3bc070..b4ebe23cf 100644 --- a/test/stderr/0476 +++ b/test/stderr/0476 @@ -62,9 +62,9 @@ set_process_info: pppp delivering 10HmaX-0005vi-00 LOG: MAIN ** userx@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 550 NO set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 -qrun delivery forking for bounce message -postfork: bounce message -qrun delivery forked for bounce message: npppp +qrun delivery forking for bounce-message +postfork: bounce-message +qrun delivery forked for bounce-message: npppp cannot use sendfile for body: spoolfile not wireformat writing data block fd=dddd size=sss timeout=0 Exim version x.yz .... @@ -74,9 +74,9 @@ admin user set_process_info: pppp accepting a local non-SMTP message from <> LOG: MAIN <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss -bounce message forking for local-accept-delivery +bounce-message forking for local-accept-delivery postfork: local-accept-delivery -bounce message forked for local-accept-delivery: npppp +bounce-message forked for local-accept-delivery: npppp Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user diff --git a/test/stderr/0512 b/test/stderr/0512 index b37d691d2..b1154f218 100644 --- a/test/stderr/0512 +++ b/test/stderr/0512 @@ -67,9 +67,9 @@ LOG: MAIN == userx@myhost.test.ex R=r1 T=t1 defer (dd): Connection refused LOG: MAIN ** userx@myhost.test.ex: retry timeout exceeded -qrun delivery forking for bounce message -postfork: bounce message -qrun delivery forked for bounce message: npppp +qrun delivery forking for bounce-message +postfork: bounce-message +qrun delivery forked for bounce-message: npppp cannot use sendfile for body: spoolfile not wireformat writing data block fd=dddd size=sss timeout=0 Exim version x.yz .... @@ -78,9 +78,9 @@ trusted user admin user LOG: MAIN <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss -bounce message forking for local-accept-delivery +bounce-message forking for local-accept-delivery postfork: local-accept-delivery -bounce message forked for local-accept-delivery: npppp +bounce-message forked for local-accept-delivery: npppp Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -147,9 +147,9 @@ LOG: MAIN == userx@myhost.test.ex R=r1 T=t1 defer (dd): Connection refused LOG: MAIN ** userx@myhost.test.ex: retry timeout exceeded -qrun delivery forking for bounce message -postfork: bounce message -qrun delivery forked for bounce message: npppp +qrun delivery forking for bounce-message +postfork: bounce-message +qrun delivery forked for bounce-message: npppp cannot use sendfile for body: spoolfile not wireformat writing data block fd=dddd size=sss timeout=0 Exim version x.yz .... @@ -158,9 +158,9 @@ trusted user admin user LOG: MAIN <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss -bounce message forking for local-accept-delivery +bounce-message forking for local-accept-delivery postfork: local-accept-delivery -bounce message forked for local-accept-delivery: npppp +bounce-message forked for local-accept-delivery: npppp Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user diff --git a/test/stderr/0609 b/test/stderr/0609 index d74668cd6..d141e5b29 100644 --- a/test/stderr/0609 +++ b/test/stderr/0609 @@ -56,7 +56,7 @@ ppppp unexpected disconnection while reading SMTP command from [127.0.0.1] D=q ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (conn-setup) terminating with rc=1 >>>>>>>>>>>>>>>> ppppp fresh-exec forked for daemon accept: npppp ppppp 1 SMTP accept process running -ppppp fresh-exec forking for daemon del pidfile -ppppp postfork: daemon del pidfile -ppppp fresh-exec forked for daemon del pidfile: npppp +ppppp fresh-exec forking for daemon-del-pidfile +ppppp postfork: daemon-del-pidfile +ppppp fresh-exec forked for daemon-del-pidfile: npppp ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/1007 b/test/stderr/1007 index bef07f757..46aac6f03 100644 --- a/test/stderr/1007 +++ b/test/stderr/1007 @@ -19,10 +19,10 @@ LOG: MAIN set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4) daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... -fresh-exec forking for daemon del pidfile -pppp postfork: daemon del pidfile -pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon del pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX -fresh-exec forked for daemon del pidfile: npppp +fresh-exec forking for daemon-del-pidfile +pppp postfork: daemon-del-pidfile +pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +fresh-exec forked for daemon-del-pidfile: npppp search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -46,10 +46,10 @@ LOG: MAIN set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4) port 1226 (IPv6 and IPv4) daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... -fresh-exec forking for daemon del pidfile -pppp postfork: daemon del pidfile -pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon del pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX -fresh-exec forked for daemon del pidfile: npppp +fresh-exec forking for daemon-del-pidfile +pppp postfork: daemon-del-pidfile +pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +fresh-exec forked for daemon-del-pidfile: npppp search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -74,10 +74,10 @@ LOG: MAIN set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4) port 1226 (IPv6 and IPv4) [127.0.0.1]:1228 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... -fresh-exec forking for daemon del pidfile -pppp postfork: daemon del pidfile -pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; ::0 ; 127.0.0.1.1228 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon del pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX -fresh-exec forked for daemon del pidfile: npppp +fresh-exec forking for daemon-del-pidfile +pppp postfork: daemon-del-pidfile +pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; ::0 ; 127.0.0.1.1228 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +fresh-exec forked for daemon-del-pidfile: npppp search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -102,10 +102,10 @@ LOG: MAIN set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4) port 1226 (IPv6 and IPv4) [127.0.0.1]:1228 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... -fresh-exec forking for daemon del pidfile -pppp postfork: daemon del pidfile -pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; 0.0.0.0; 127.0.0.1.1228 ; ::0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon del pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX -fresh-exec forked for daemon del pidfile: npppp +fresh-exec forking for daemon-del-pidfile +pppp postfork: daemon-del-pidfile +pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; 0.0.0.0; 127.0.0.1.1228 ; ::0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +fresh-exec forked for daemon-del-pidfile: npppp search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -127,10 +127,10 @@ LOG: MAIN set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on [ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6]:{1225,1226} daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... -fresh-exec forking for daemon del pidfile -pppp postfork: daemon del pidfile -pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon del pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX -fresh-exec forked for daemon del pidfile: npppp +fresh-exec forking for daemon-del-pidfile +pppp postfork: daemon-del-pidfile +pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +fresh-exec forked for daemon-del-pidfile: npppp search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -155,10 +155,10 @@ LOG: MAIN set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1227 (IPv6 and IPv4) [127.0.0.1]:1228 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... -fresh-exec forking for daemon del pidfile -pppp postfork: daemon del pidfile -pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; ::0 ; 127.0.0.1.1228 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon del pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX -fresh-exec forked for daemon del pidfile: npppp +fresh-exec forking for daemon-del-pidfile +pppp postfork: daemon-del-pidfile +pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; ::0 ; 127.0.0.1.1228 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +fresh-exec forked for daemon-del-pidfile: npppp search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -184,10 +184,10 @@ LOG: MAIN set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on [127.0.0.1]:{1227,1225} daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... -fresh-exec forking for daemon del pidfile -pppp postfork: daemon del pidfile -pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; ::0 ; 127.0.0.1.1228 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon del pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX -fresh-exec forked for daemon del pidfile: npppp +fresh-exec forking for daemon-del-pidfile +pppp postfork: daemon-del-pidfile +pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE=local_interfaces = <; ::0 ; 127.0.0.1.1228 ; 0.0.0.0 -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +fresh-exec forked for daemon-del-pidfile: npppp search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -212,9 +212,9 @@ LOG: MAIN set_process_info: pppp daemon(x.yz): no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4) port 1226 (IPv4) daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID Listening... -fresh-exec forking for daemon del pidfile -pppp postfork: daemon del pidfile -pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon del pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX -fresh-exec forked for daemon del pidfile: npppp +fresh-exec forking for daemon-del-pidfile +pppp postfork: daemon-del-pidfile +pppp exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DSERVER=server -C TESTSUITE/test-config -d=0xf7795cfd -MCd daemon-del-pidfile -oP TESTSUITE/spool/exim-daemon.pid -oPX +fresh-exec forked for daemon-del-pidfile: npppp search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/2013 b/test/stderr/2013 index d26ff20af..a74badecc 100644 --- a/test/stderr/2013 +++ b/test/stderr/2013 @@ -59,18 +59,18 @@ cmd buf flush ddd bytes SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself SMTP<< 250 OK id=10HmbA-0005vi-00 -transport forking for continued-transport interproc -postfork: continued-transport interproc -continued-transport interproc forking for continued-transport +transport forking for continued-transport-interproc +postfork: continued-transport-interproc +continued-transport-interproc forking for continued-transport postfork: continued-transport -transport forked for continued-transport interproc: npppp -continued-transport interproc forked for continued-transport: npppp -transport forking for tls proxy interproc -postfork: tls proxy interproc -tls proxy interproc forking for tls proxy -postfork: tls proxy -transport forked for tls proxy interproc: npppp -tls proxy interproc forked for tls proxy: npppp +transport forked for continued-transport-interproc: npppp +continued-transport-interproc forked for continued-transport: npppp +transport forking for tls-proxy-interproc +postfork: tls-proxy-interproc +tls-proxy-interproc forking for tls-proxy +postfork: tls-proxy +transport forked for tls-proxy-interproc: npppp +tls-proxy-interproc forked for tls-proxy: npppp LOG: MAIN => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00" LOG: MAIN @@ -91,13 +91,13 @@ cmd buf flush ddd bytes SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself SMTP<< 250 OK id=10HmbB-0005vi-00 -transport forking for continued-transport interproc -postfork: continued-transport interproc -continued-transport interproc forking for continued-transport +transport forking for continued-transport-interproc +postfork: continued-transport-interproc +continued-transport-interproc forking for continued-transport postfork: continued-transport continued-transport forked for transport: npppp -transport forked for continued-transport interproc: npppp -continued-transport interproc forked for continued-transport: npppp +transport forked for continued-transport-interproc: npppp +continued-transport-interproc forked for continued-transport: npppp SMTP(close)>> LOG: MAIN => userz@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbB-0005vi-00" @@ -193,18 +193,18 @@ cmd buf flush ddd bytes SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself SMTP<< 250 OK id=10HmbG-0005vi-00 -transport forking for continued-transport interproc -postfork: continued-transport interproc -continued-transport interproc forking for continued-transport +transport forking for continued-transport-interproc +postfork: continued-transport-interproc +continued-transport-interproc forking for continued-transport postfork: continued-transport -transport forked for continued-transport interproc: npppp -continued-transport interproc forked for continued-transport: npppp -transport forking for tls proxy interproc -postfork: tls proxy interproc -tls proxy interproc forking for tls proxy -postfork: tls proxy -transport forked for tls proxy interproc: npppp -tls proxy interproc forked for tls proxy: npppp +transport forked for continued-transport-interproc: npppp +continued-transport-interproc forked for continued-transport: npppp +transport forking for tls-proxy-interproc +postfork: tls-proxy-interproc +tls-proxy-interproc forking for tls-proxy +postfork: tls-proxy +transport forked for tls-proxy-interproc: npppp +tls-proxy-interproc forked for tls-proxy: npppp LOG: MAIN => usera@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbG-0005vi-00" LOG: MAIN @@ -225,13 +225,13 @@ cmd buf flush ddd bytes SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself SMTP<< 250 OK id=10HmbH-0005vi-00 -transport forking for continued-transport interproc -postfork: continued-transport interproc -continued-transport interproc forking for continued-transport +transport forking for continued-transport-interproc +postfork: continued-transport-interproc +continued-transport-interproc forking for continued-transport postfork: continued-transport continued-transport forked for transport: npppp -transport forked for continued-transport interproc: npppp -continued-transport interproc forked for continued-transport: npppp +transport forked for continued-transport-interproc: npppp +continued-transport-interproc forked for continued-transport: npppp SMTP(close)>> LOG: MAIN => userc@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbH-0005vi-00" @@ -335,12 +335,12 @@ cmd buf flush ddd bytes 250-PIPELINING 250-STARTTLS 250 HELP -transport forking for continued-transport interproc -postfork: continued-transport interproc -continued-transport interproc forking for continued-transport +transport forking for continued-transport-interproc +postfork: continued-transport-interproc +continued-transport-interproc forking for continued-transport postfork: continued-transport -transport forked for continued-transport interproc: npppp -continued-transport interproc forked for continued-transport: npppp +transport forked for continued-transport-interproc: npppp +continued-transport-interproc forked for continued-transport: npppp SMTP(close)>> LOG: MAIN => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbM-0005vi-00" @@ -381,12 +381,12 @@ cmd buf flush ddd bytes 250-PIPELINING 250-STARTTLS 250 HELP -transport forking for continued-transport interproc -postfork: continued-transport interproc -continued-transport interproc forking for continued-transport +transport forking for continued-transport-interproc +postfork: continued-transport-interproc +continued-transport-interproc forking for continued-transport postfork: continued-transport -transport forked for continued-transport interproc: npppp -continued-transport interproc forked for continued-transport: npppp +transport forked for continued-transport-interproc: npppp +continued-transport-interproc forked for continued-transport: npppp SMTP(close)>> LOG: MAIN => userz@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbN-0005vi-00" diff --git a/test/stderr/2035 b/test/stderr/2035 index 4c05eac30..a818a4531 100644 --- a/test/stderr/2035 +++ b/test/stderr/2035 @@ -41,14 +41,12 @@ 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 -proxy-proc final-pid pppp +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 +tls-proxy-interproc forked for tls-proxy: npppp Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user diff --git a/test/stderr/2113 b/test/stderr/2113 index 7f0115f3e..d9cbf9f58 100644 --- a/test/stderr/2113 +++ b/test/stderr/2113 @@ -59,18 +59,18 @@ cmd buf flush ddd bytes SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself SMTP<< 250 OK id=10HmbA-0005vi-00 -transport forking for continued-transport interproc -postfork: continued-transport interproc -continued-transport interproc forking for continued-transport +transport forking for continued-transport-interproc +postfork: continued-transport-interproc +continued-transport-interproc forking for continued-transport postfork: continued-transport -transport forked for continued-transport interproc: npppp -continued-transport interproc forked for continued-transport: npppp -transport forking for tls proxy interproc -postfork: tls proxy interproc -tls proxy interproc forking for tls proxy -postfork: tls proxy -transport forked for tls proxy interproc: npppp -tls proxy interproc forked for tls proxy: npppp +transport forked for continued-transport-interproc: npppp +continued-transport-interproc forked for continued-transport: npppp +transport forking for tls-proxy-interproc +postfork: tls-proxy-interproc +tls-proxy-interproc forking for tls-proxy +postfork: tls-proxy +transport forked for tls-proxy-interproc: npppp +tls-proxy-interproc forked for tls-proxy: npppp LOG: MAIN => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00" LOG: MAIN @@ -91,13 +91,13 @@ cmd buf flush ddd bytes SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself SMTP<< 250 OK id=10HmbB-0005vi-00 -transport forking for continued-transport interproc -postfork: continued-transport interproc -continued-transport interproc forking for continued-transport +transport forking for continued-transport-interproc +postfork: continued-transport-interproc +continued-transport-interproc forking for continued-transport postfork: continued-transport continued-transport forked for transport: npppp -transport forked for continued-transport interproc: npppp -continued-transport interproc forked for continued-transport: npppp +transport forked for continued-transport-interproc: npppp +continued-transport-interproc forked for continued-transport: npppp SMTP(close)>> LOG: MAIN => userz@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbB-0005vi-00" @@ -193,18 +193,18 @@ cmd buf flush ddd bytes SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself SMTP<< 250 OK id=10HmbG-0005vi-00 -transport forking for continued-transport interproc -postfork: continued-transport interproc -continued-transport interproc forking for continued-transport +transport forking for continued-transport-interproc +postfork: continued-transport-interproc +continued-transport-interproc forking for continued-transport postfork: continued-transport -transport forked for continued-transport interproc: npppp -continued-transport interproc forked for continued-transport: npppp -transport forking for tls proxy interproc -postfork: tls proxy interproc -tls proxy interproc forking for tls proxy -postfork: tls proxy -transport forked for tls proxy interproc: npppp -tls proxy interproc forked for tls proxy: npppp +transport forked for continued-transport-interproc: npppp +continued-transport-interproc forked for continued-transport: npppp +transport forking for tls-proxy-interproc +postfork: tls-proxy-interproc +tls-proxy-interproc forking for tls-proxy +postfork: tls-proxy +transport forked for tls-proxy-interproc: npppp +tls-proxy-interproc forked for tls-proxy: npppp LOG: MAIN => usera@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbG-0005vi-00" LOG: MAIN @@ -225,13 +225,13 @@ cmd buf flush ddd bytes SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself SMTP<< 250 OK id=10HmbH-0005vi-00 -transport forking for continued-transport interproc -postfork: continued-transport interproc -continued-transport interproc forking for continued-transport +transport forking for continued-transport-interproc +postfork: continued-transport-interproc +continued-transport-interproc forking for continued-transport postfork: continued-transport continued-transport forked for transport: npppp -transport forked for continued-transport interproc: npppp -continued-transport interproc forked for continued-transport: npppp +transport forked for continued-transport-interproc: npppp +continued-transport-interproc forked for continued-transport: npppp SMTP(close)>> LOG: MAIN => userc@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbH-0005vi-00" @@ -335,12 +335,12 @@ cmd buf flush ddd bytes 250-PIPELINING 250-STARTTLS 250 HELP -transport forking for continued-transport interproc -postfork: continued-transport interproc -continued-transport interproc forking for continued-transport +transport forking for continued-transport-interproc +postfork: continued-transport-interproc +continued-transport-interproc forking for continued-transport postfork: continued-transport -transport forked for continued-transport interproc: npppp -continued-transport interproc forked for continued-transport: npppp +transport forked for continued-transport-interproc: npppp +continued-transport-interproc forked for continued-transport: npppp SMTP(close)>> LOG: MAIN => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbM-0005vi-00" @@ -381,12 +381,12 @@ cmd buf flush ddd bytes 250-PIPELINING 250-STARTTLS 250 HELP -transport forking for continued-transport interproc -postfork: continued-transport interproc -continued-transport interproc forking for continued-transport +transport forking for continued-transport-interproc +postfork: continued-transport-interproc +continued-transport-interproc forking for continued-transport postfork: continued-transport -transport forked for continued-transport interproc: npppp -continued-transport interproc forked for continued-transport: npppp +transport forked for continued-transport-interproc: npppp +continued-transport-interproc forked for continued-transport: npppp SMTP(close)>> LOG: MAIN => userz@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbN-0005vi-00" diff --git a/test/stderr/2135 b/test/stderr/2135 index 4c05eac30..a818a4531 100644 --- a/test/stderr/2135 +++ b/test/stderr/2135 @@ -41,14 +41,12 @@ 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 -proxy-proc final-pid pppp +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 +tls-proxy-interproc forked for tls-proxy: npppp Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user diff --git a/test/stderr/2201 b/test/stderr/2201 index 27851019e..a21b3e9dd 100644 --- a/test/stderr/2201 +++ b/test/stderr/2201 @@ -266,7 +266,7 @@ ppppp child ppppp ended: status=0x0 ppppp normal exit, 0 ppppp 0 SMTP accept processes now running ppppp Listening... -ppppp fresh-exec forking for daemon del pidfile -ppppp postfork: daemon del pidfile -ppppp fresh-exec forked for daemon del pidfile: npppp +ppppp fresh-exec forking for daemon-del-pidfile +ppppp postfork: daemon-del-pidfile +ppppp fresh-exec forked for daemon-del-pidfile: npppp ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>> -- 2.25.1