debug tidying

diff --git a/src/src/child.c b/src/src/child.c
index ba7e899d2b229993c26f8d0aadd973f24aab9786..5e4b978cd2210155a5d59b9f008743e769e6e0ca 100644 (file)
--- 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 81fb6944738dcf8f8103c412f0b0e102720aab9f..fa74ddb0e9aa3e7824b3787452c9e536c4cbc9fd 100644 (file)
--- 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 497b3c806fe5611d158bb689ea2c6d1d0f346d82..1748c798511ffad9fb929b41cd6091f6efb8ef89 100644 (file)
--- 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 2ac0720cab52056acf5bc82b23d9941ffe6fb0df..1c0ea6b6e2c80106bd3c1192f06f9c917e8cfc19 100644 (file)
--- 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 89c5dc0030b8857e1aed31489eb7c94208d34e65..2dd85c4842a19d94d49ba1ba8db038bfb9fdaa2b 100644 (file)
--- 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 2113490474c791138debed7ddc220cf4d3584a8e..9dbf3e7170a1bb27e3aeda81185b01d619f46f3f 100644 (file)
--- 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 b5f44f5482d4cc3922d1fab25c88eeb859b014ae..268fd69560aa92db0214a9ff89785e96a24e31fc 100644 (file)
--- 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 2f9faa3c74710c294991f9f89ae28bf593529001..9732da533cce2172c32c23ef6345dffd6c4d9cec 100644 (file)
--- 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 6b33a0e6872fed441e27b976b86ce4d0a1c02d65..d2cb8c235b083eecdfc8f62a8462cbd323118d5e 100644 (file)
--- 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 c1e2b26c7ccd8ba8a7d7af934df8c2ef011c28ca..6a7f150ac248847f5ce1a394720a89c391a44f2b 100644 (file)
--- 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 2216ff853302ae5021ffe00bc6fa82ef8c0e2e82..0bec253c14f54bee0716f4cab4a4f12d3e13ec7b 100644 (file)
--- 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 a392fd16601ea5c870d2d5ced98de0d20a4f9fd1..05c5e2d402e6facda23786293b94400e20dc8d96 100644 (file)
--- 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 af919d5cd6d76911420771648ebee04a08b9596c..3171503f9d12ee41e352e46e6292a26ecb575424 100644 (file)
--- 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=<CALLER@test.ex> 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=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined MAIL FROM:<CALLER@test.ex>: 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=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<b@test.ex>: 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 ebf35298ab502d348e0e36286be03583307e91e3..13cc31bb231a6187fd1e9dea07d5400ff31f0d7a 100644 (file)
--- 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 a7036e5b2b59178b65ab9a38fd3946449d16833c..0dbc12994251ec9a6e73102f4e94f5892be2b084 100644 (file)
--- 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 34a9973fcfc9c95f362c70791d7b4abb2aa4ac71..97c36332adf1c20f553022f7a080321f89f788d7 100644 (file)
--- 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 84a20903bf2b7b6e7bb5fcc83a5192ae8ede91ae..4585cb804bc953dfd5a60f0a0aa685867cf7d8c6 100644 (file)
--- 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 24fc97d50612d5d65fdfa72c4081542eaea8905e..c721d8a9023f0b8483fda0216eb9e8f8d0d3fca6 100644 (file)
--- 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:<d3@myhost.test.ex>: 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 a60c29bd87250d264663ebf8f5432c82f58b683d..da272aac11a00063813c83fa186246f5f79a85bb 100644 (file)
--- 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 <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 3c422c19b8d782e5bec9101eb4019ccbbc83d90e..bcd145cda16928e40d07ffd6eb8d8a2a39edb2eb 100644 (file)
--- 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 <aaaa@myhost.test.ex> R=aaaa T=t2

diff --git a/test/stderr/0382 b/test/stderr/0382
index 8c48c2cc197ca392432a62c349f9b92576435584..f932bdf9e42ab27fc42bcfefc568716d2ba504e2 100644 (file)
--- 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 17f60e9b9eb5746e23d985fc5f24aa1455009258..32897876724e126bd53cd8d22500aab3c016ea95 100644 (file)
--- 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 d9938f9232c8ea11069d43c2bb752caae5617977..6fd6a6276084cb1bd60e2f720b6d18de42ef9cf5 100644 (file)
--- 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 6d02a395797a7b0668e212273e6fe5e46bf99a83..b269ac49913e3414a68257b181a5ebf0b50761ba 100644 (file)
--- 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:<x@UpperCase.test.ex>: 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 686e992e37c9b169134b554eb03ad30a6ed47a21..2f7e9b5fdfe8d4b7ad4eb487dce9d7829e43fdac 100644 (file)
--- 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 c9b14d2c2b43e2c8a9f4f7c5b614309e763d13a2..2d7f0c333441634fb8a0a01bad7d091f06dac25b 100644 (file)
--- 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 40a3bc07021d01bb2018be6668c4f7ef716bbf0d..b4ebe23cff0320079ee545c6f89510d5556f6ad0 100644 (file)
--- 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:<userx@test.ex>: 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 b37d691d25fe5607a065cf76e87313f47516211b..b1154f218f5200df89ba06bac8591c927b28f8b5 100644 (file)
--- 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 d74668cd6e2707717b27b797eecad83721476232..d141e5b29a5908146fa236a4cc04ce78b722bde6 100644 (file)
--- 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 bef07f757add993156af2a470940e71a41273c3c..46aac6f03461e764d7ed79977aedb4dc36c72da2 100644 (file)
--- 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 d26ff20af224f7e18f6fcb78adb9876d11c574c8..a74badecc596016a1c8d9d1295227ce5e946c8bf 100644 (file)
--- 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 4c05eac30d39aca260391f15b26cabc6c3c38926..a818a453179f47064a5776cde2a73a4ac9a41a57 100644 (file)
--- 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 7f0115f3ed699399babbd42e33b83f224ec84186..d9cbf9f5875e06fcecacea962f7f786fa81b05d4 100644 (file)
--- 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 4c05eac30d39aca260391f15b26cabc6c3c38926..a818a453179f47064a5776cde2a73a4ac9a41a57 100644 (file)
--- 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 27851019e450790d13fc92b01a34a3ccc12934b5..a21b3e9dd69139711f9ab690673db08887c4d86a 100644 (file)
--- 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 >>>>>>>>>>>>>>>>