Docs: more PCRE2

[exim.git] / src / src / deliver.c

diff --git a/src/src/deliver.c b/src/src/deliver.c
index c4160a50c380a635e7ecb2ad0770851304da1a1e..8aad811c61679a7a2a75e8ded709af5c1bd21ae8 100644 (file)
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -3,6 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */

+/* Copyright (c) The Exim Maintainers 2020 - 2021 */

 /* See the file NOTICE for conditions of use and distribution. */
 
 /* The main code for delivering a message. */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* The main code for delivering a message. */


@@ -73,6 +74,7 @@ static BOOL update_spool;
 static BOOL remove_journal;
 static int  parcount = 0;
 static pardata *parlist = NULL;
 static BOOL remove_journal;
 static int  parcount = 0;
 static pardata *parlist = NULL;

+static struct pollfd *parpoll;

 static int  return_count;
 static uschar *frozen_info = US"";
 static uschar *used_return_path = NULL;
 static int  return_count;
 static uschar *frozen_info = US"";
 static uschar *used_return_path = NULL;


@@ -220,7 +222,9 @@ if (!addr->next)
 
   deliver_localpart = addr->local_part;
   deliver_localpart_prefix = addr->prefix;
 
   deliver_localpart = addr->local_part;
   deliver_localpart_prefix = addr->prefix;

+  deliver_localpart_prefix_v = addr->prefix_v;

   deliver_localpart_suffix = addr->suffix;
   deliver_localpart_suffix = addr->suffix;

+  deliver_localpart_suffix_v = addr->suffix_v;

 
   for (addr_orig = addr; addr_orig->parent; addr_orig = addr_orig->parent) ;
   deliver_domain_orig = addr_orig->domain;
 
   for (addr_orig = addr; addr_orig->parent; addr_orig = addr_orig->parent) ;
   deliver_domain_orig = addr_orig->domain;


@@ -260,7 +264,9 @@ if (!addr->next)
       else if (deliver_localpart[0] == '|') address_pipe = addr->local_part;
       deliver_localpart = addr->parent->local_part;
       deliver_localpart_prefix = addr->parent->prefix;
       else if (deliver_localpart[0] == '|') address_pipe = addr->local_part;
       deliver_localpart = addr->parent->local_part;
       deliver_localpart_prefix = addr->parent->prefix;

+      deliver_localpart_prefix_v = addr->parent->prefix_v;

       deliver_localpart_suffix = addr->parent->suffix;
       deliver_localpart_suffix = addr->parent->suffix;

+      deliver_localpart_suffix_v = addr->parent->suffix_v;

       }
     }
 
       }
     }
 


@@ -329,7 +335,7 @@ static int
 open_msglog_file(uschar *filename, int mode, uschar **error)
 {
 if (Ustrstr(filename, US"/../"))
 open_msglog_file(uschar *filename, int mode, uschar **error)
 {
 if (Ustrstr(filename, US"/../"))

-  log_write(0, LOG_MAIN|LOG_PANIC,
+  log_write(0, LOG_MAIN|LOG_PANIC_DIE,

     "Attempt to open msglog file path with upward-traversal: '%s'\n", filename);
 
 for (int i = 2; i > 0; i--)
     "Attempt to open msglog file path with upward-traversal: '%s'\n", filename);
 
 for (int i = 2; i > 0; i--)


@@ -455,6 +461,9 @@ TRUE if the lists refer to the same hosts in the same order, except that
 This enables Exim to use a single SMTP transaction for sending to two entirely
 different domains that happen to end up pointing at the same hosts.
 
 This enables Exim to use a single SMTP transaction for sending to two entirely
 different domains that happen to end up pointing at the same hosts.
 

+We do not try to batch up different A-record host names that refer to the
+same IP.
+

 Arguments:
   one       points to the first host list
   two       points to the second host list
 Arguments:
   one       points to the first host list
   two       points to the second host list


@@ -513,8 +522,12 @@ while (one && two)
   else if (one->port != two->port)
     return FALSE;
 
   else if (one->port != two->port)
     return FALSE;
 

-  /* Hosts matched */
+#ifdef SUPPORT_DANE
+  /* DNSSEC equality */
+  if (one->dnssec != two->dnssec) return FALSE;
+#endif

 
 

+  /* Hosts matched */

   one = one->next;
   two = two->next;
   }
   one = one->next;
   two = two->next;
   }


@@ -784,6 +797,9 @@ g = string_append(g, 3, US" [", h->address, US"]");
 if (LOGGING(outgoing_port))
   g = string_fmt_append(g, ":%d", h->port);
 
 if (LOGGING(outgoing_port))
   g = string_fmt_append(g, ":%d", h->port);
 

+if (continue_sequence > 1)             /*XXX this is wrong for a dropped proxyconn.  Would have to pass back from transport */
+  g = string_catn(g, US"*", 1);
+

 #ifdef SUPPORT_SOCKS
 if (LOGGING(proxy) && proxy_local_address)
   {
 #ifdef SUPPORT_SOCKS
 if (LOGGING(proxy) && proxy_local_address)
   {


@@ -812,7 +828,7 @@ d_tlslog(gstring * g, address_item * addr)
 if (LOGGING(tls_cipher) && addr->cipher)
   {
   g = string_append(g, 2, US" X=", addr->cipher);
 if (LOGGING(tls_cipher) && addr->cipher)
   {
   g = string_append(g, 2, US" X=", addr->cipher);

-#ifdef EXPERIMENTAL_TLS_RESUME
+#ifndef DISABLE_TLS_RESUME

   if (LOGGING(tls_resumption) && testflag(addr, af_tls_resume))
     g = string_catn(g, US"*", 1);
 #endif
   if (LOGGING(tls_resumption) && testflag(addr, af_tls_resume))
     g = string_catn(g, US"*", 1);
 #endif


@@ -1144,7 +1160,7 @@ if (LOGGING(sender_on_delivery) || msg)
 if (*queue_name)
   g = string_append(g, 2, US" Q=", queue_name);
 
 if (*queue_name)
   g = string_append(g, 2, US" Q=", queue_name);
 

-#ifdef EXPERIMENTAL_SRS
+#ifdef EXPERIMENTAL_SRS_ALT

 if(addr->prop.srs_sender)
   g = string_append(g, 3, US" SRS=<", addr->prop.srs_sender, US">");
 #endif
 if(addr->prop.srs_sender)
   g = string_append(g, 3, US" SRS=<", addr->prop.srs_sender, US">");
 #endif


@@ -1187,8 +1203,6 @@ else
   if (addr->host_used)
     {
     g = d_hostlog(g, addr);
   if (addr->host_used)
     {
     g = d_hostlog(g, addr);

-    if (continue_sequence > 1)
-      g = string_catn(g, US"*", 1);

 
 #ifndef DISABLE_EVENT
     deliver_host_address = addr->host_used->address;
 
 #ifndef DISABLE_EVENT
     deliver_host_address = addr->host_used->address;


@@ -1260,8 +1274,8 @@ if (  LOGGING(smtp_confirmation)
 /* Time on queue and actual time taken to deliver */
 
 if (LOGGING(queue_time))
 /* Time on queue and actual time taken to deliver */
 
 if (LOGGING(queue_time))

-  g = string_append(g, 2, US" QT=",
-    string_timesince(&received_time));
+  g = string_append(g, 2, US" QT=", string_timesince(
+    LOGGING(queue_time_exclusive) ? &received_time_complete : &received_time));

 
 if (LOGGING(deliver_time))
   g = string_append(g, 2, US" DT=", string_timediff(&addr->delivery_time));
 
 if (LOGGING(deliver_time))
   g = string_append(g, 2, US" DT=", string_timediff(&addr->delivery_time));


@@ -1317,20 +1331,10 @@ else if (driver_kind)
 g = string_fmt_append(g, " defer (%d)", addr->basic_errno);
 
 if (addr->basic_errno > 0)
 g = string_fmt_append(g, " defer (%d)", addr->basic_errno);
 
 if (addr->basic_errno > 0)

-  g = string_append(g, 2, US": ",
-    US strerror(addr->basic_errno));
+  g = string_append(g, 2, US": ", US strerror(addr->basic_errno));

 
 if (addr->host_used)
 
 if (addr->host_used)

-  {
-  g = string_append(g, 5,
-                   US" H=", addr->host_used->name,
-                   US" [",  addr->host_used->address, US"]");
-  if (LOGGING(outgoing_port))
-    {
-    int port = addr->host_used->port;
-    g = string_fmt_append(g, ":%d", port == PORT_NONE ? 25 : port);
-    }
-  }
+  g = d_hostlog(g, addr);

 
 if (LOGGING(deliver_time))
   g = string_append(g, 2, US" DT=", string_timediff(&addr->delivery_time));
 
 if (LOGGING(deliver_time))
   g = string_append(g, 2, US" DT=", string_timediff(&addr->delivery_time));


@@ -1581,6 +1585,12 @@ if (addr->return_file >= 0 && addr->return_filename)
   (void)close(addr->return_file);
   }
 
   (void)close(addr->return_file);
   }
 

+/* Check if the transport notifed continue-conn status explicitly, and
+update our knowlege. */
+
+if (testflag(addr, af_new_conn))       continue_sequence = 1;
+else if (testflag(addr, af_cont_conn)) continue_sequence++;
+

 /* The success case happens only after delivery by a transport. */
 
 if (result == OK)
 /* The success case happens only after delivery by a transport. */
 
 if (result == OK)


@@ -2088,9 +2098,9 @@ return FALSE;
 
 /* Each local delivery is performed in a separate process which sets its
 uid and gid as specified. This is a safer way than simply changing and
 
 /* Each local delivery is performed in a separate process which sets its
 uid and gid as specified. This is a safer way than simply changing and

-restoring using seteuid(); there is a body of opinion that seteuid() cannot be
-used safely. From release 4, Exim no longer makes any use of it. Besides, not
-all systems have seteuid().
+restoring using seteuid(); there is a body of opinion that seteuid()
+cannot be used safely. From release 4, Exim no longer makes any use of
+it for delivery. Besides, not all systems have seteuid().

 
 If the uid/gid are specified in the transport_instance, they are used; the
 transport initialization must ensure that either both or neither are set.
 
 If the uid/gid are specified in the transport_instance, they are used; the
 transport initialization must ensure that either both or neither are set.


@@ -2120,7 +2130,7 @@ Arguments:
 Returns:     nothing
 */
 
 Returns:     nothing
 */
 

-static void
+void

 deliver_local(address_item *addr, BOOL shadowing)
 {
 BOOL use_initgroups;
 deliver_local(address_item *addr, BOOL shadowing)
 {
 BOOL use_initgroups;


@@ -2138,7 +2148,7 @@ has its own return path setting, expand it and replace the existing value. */
 
 if(addr->prop.errors_address)
   return_path = addr->prop.errors_address;
 
 if(addr->prop.errors_address)
   return_path = addr->prop.errors_address;

-#ifdef EXPERIMENTAL_SRS
+#ifdef EXPERIMENTAL_SRS_ALT

 else if (addr->prop.srs_sender)
   return_path = addr->prop.srs_sender;
 #endif
 else if (addr->prop.srs_sender)
   return_path = addr->prop.srs_sender;
 #endif


@@ -2147,18 +2157,16 @@ else
 
 if (tp->return_path)
   {
 
 if (tp->return_path)
   {

-  uschar *new_return_path = expand_string(tp->return_path);
-  if (!new_return_path)
-    {
-    if (!f.expand_string_forcedfail)
-      {
-      common_error(TRUE, addr, ERRNO_EXPANDFAIL,
-        US"Failed to expand return path \"%s\" in %s transport: %s",
-        tp->return_path, tp->name, expand_string_message);
-      return;
-      }
+  uschar * new_return_path = expand_string(tp->return_path);
+  if (new_return_path)
+    return_path = new_return_path;
+  else if (!f.expand_string_forcedfail)
+    {
+    common_error(TRUE, addr, ERRNO_EXPANDFAIL,
+      US"Failed to expand return path \"%s\" in %s transport: %s",
+      tp->return_path, tp->name, expand_string_message);
+    return;

     }
     }

-  else return_path = new_return_path;

   }
 
 /* For local deliveries, one at a time, the value used for logging can just be
   }
 
 /* For local deliveries, one at a time, the value used for logging can just be


@@ -2264,7 +2272,7 @@ a clean slate and doesn't interfere with the parent process. */
 
 search_tidyup();
 
 
 search_tidyup();
 

-if ((pid = fork()) == 0)
+if ((pid = exim_fork(US"delivery-local")) == 0)

   {
   BOOL replicate = TRUE;
 
   {
   BOOL replicate = TRUE;
 


@@ -2611,7 +2619,7 @@ if (addr->special_action == SPECIAL_WARN && addr->transport->warn_message)
       "message for %s transport): %s", addr->transport->warn_message,
       addr->transport->name, expand_string_message);
 
       "message for %s transport): %s", addr->transport->warn_message,
       addr->transport->name, expand_string_message);
 

-  else if ((pid = child_open_exim(&fd)) > 0)
+  else if ((pid = child_open_exim(&fd, US"tpt-warning-message")) > 0)

     {
     FILE *f = fdopen(fd, "wb");
     if (errors_reply_to && !contains_header(US"Reply-To", warn_message))
     {
     FILE *f = fdopen(fd, "wb");
     if (errors_reply_to && !contains_header(US"Reply-To", warn_message))


@@ -2881,10 +2889,8 @@ while (addr_local)
   deliveries (e.g. to pipes) can take a substantial time. */
 
   if (!(dbm_file = dbfn_open(US"retry", O_RDONLY, &dbblock, FALSE, TRUE)))
   deliveries (e.g. to pipes) can take a substantial time. */
 
   if (!(dbm_file = dbfn_open(US"retry", O_RDONLY, &dbblock, FALSE, TRUE)))

-    {

     DEBUG(D_deliver|D_retry|D_hints_lookup)
       debug_printf("no retry data available\n");
     DEBUG(D_deliver|D_retry|D_hints_lookup)
       debug_printf("no retry data available\n");

-    }

 
   addr2 = addr;
   addr3 = NULL;
 
   addr2 = addr;
   addr3 = NULL;


@@ -3188,6 +3194,7 @@ const uschar *listptr = remote_sort_domains;
 uschar *pattern;
 uschar patbuf[256];
 
 uschar *pattern;
 uschar patbuf[256];
 

+/*XXX The list is used before expansion. Not sure how that ties up with the docs */

 while (  *aptr
       && (pattern = string_nextinlist(&listptr, &sep, patbuf, sizeof(patbuf)))
       )
 while (  *aptr
       && (pattern = string_nextinlist(&listptr, &sep, patbuf, sizeof(patbuf)))
       )


@@ -3300,7 +3307,7 @@ BOOL done = p->done;
 
 /* Loop through all items, reading from the pipe when necessary. The pipe
 used to be non-blocking. But I do not see a reason for using non-blocking I/O
 
 /* Loop through all items, reading from the pipe when necessary. The pipe
 used to be non-blocking. But I do not see a reason for using non-blocking I/O

-here, as the preceding select() tells us, if data is available for reading.
+here, as the preceding poll() tells us, if data is available for reading.

 
 A read() on a "selected" handle should never block, but(!) it may return
 less data then we expected. (The buffer size we pass to read() shouldn't be
 
 A read() on a "selected" handle should never block, but(!) it may return
 less data then we expected. (The buffer size we pass to read() shouldn't be


@@ -3573,7 +3580,13 @@ while (!done)
 
       switch (*subid)
        {
 
       switch (*subid)
        {

-  #ifdef SUPPORT_SOCKS
+       case 3:         /* explicit notification of continued-connection (non)use;
+                       overrides caller's knowlege. */
+         if (*ptr & BIT(1))      setflag(addr, af_new_conn);
+         else if (*ptr & BIT(2)) setflag(addr, af_cont_conn);
+         break;
+
+#ifdef SUPPORT_SOCKS

        case '2':       /* proxy information; must arrive before A0 and applies to that addr XXX oops*/
          proxy_session = TRUE; /*XXX should this be cleared somewhere? */
          if (*ptr == 0)
        case '2':       /* proxy information; must arrive before A0 and applies to that addr XXX oops*/
          proxy_session = TRUE; /*XXX should this be cleared somewhere? */
          if (*ptr == 0)


@@ -3586,9 +3599,9 @@ while (!done)
            ptr += sizeof(proxy_local_port);
            }
          break;
            ptr += sizeof(proxy_local_port);
            }
          break;

-  #endif
+#endif

 
 

-  #ifdef EXPERIMENTAL_DSN_INFO
+#ifdef EXPERIMENTAL_DSN_INFO

        case '1':       /* must arrive before A0, and applies to that addr */
                        /* Two strings: smtp_greeting and helo_response */
          addr->smtp_greeting = string_copy(ptr);
        case '1':       /* must arrive before A0, and applies to that addr */
                        /* Two strings: smtp_greeting and helo_response */
          addr->smtp_greeting = string_copy(ptr);


@@ -3596,7 +3609,7 @@ while (!done)
          addr->helo_response = string_copy(ptr);
          while(*ptr++);
          break;
          addr->helo_response = string_copy(ptr);
          while(*ptr++);
          break;

-  #endif
+#endif

 
        case '0':
          DEBUG(D_deliver) debug_printf("A0 %s tret %d\n", addr->address, *ptr);
 
        case '0':
          DEBUG(D_deliver) debug_printf("A0 %s tret %d\n", addr->address, *ptr);


@@ -3828,7 +3841,7 @@ static address_item *
 par_wait(void)
 {
 int poffset, status;
 par_wait(void)
 {
 int poffset, status;

-address_item *addr, *addrlist;
+address_item * addr, * addrlist;

 pid_t pid;
 
 set_process_info("delivering %s: waiting for a remote delivery subprocess "
 pid_t pid;
 
 set_process_info("delivering %s: waiting for a remote delivery subprocess "


@@ -3838,18 +3851,18 @@ set_process_info("delivering %s: waiting for a remote delivery subprocess "
 existence - in which case give an error return. We cannot proceed just by
 waiting for a completion, because a subprocess may have filled up its pipe, and
 be waiting for it to be emptied. Therefore, if no processes have finished, we
 existence - in which case give an error return. We cannot proceed just by
 waiting for a completion, because a subprocess may have filled up its pipe, and
 be waiting for it to be emptied. Therefore, if no processes have finished, we

-wait for one of the pipes to acquire some data by calling select(), with a
+wait for one of the pipes to acquire some data by calling poll(), with a

 timeout just in case.
 
 The simple approach is just to iterate after reading data from a ready pipe.
 This leads to non-ideal behaviour when the subprocess has written its final Z
 item, closed the pipe, and is in the process of exiting (the common case). A
 timeout just in case.
 
 The simple approach is just to iterate after reading data from a ready pipe.
 This leads to non-ideal behaviour when the subprocess has written its final Z
 item, closed the pipe, and is in the process of exiting (the common case). A

-call to waitpid() yields nothing completed, but select() shows the pipe ready -
+call to waitpid() yields nothing completed, but poll() shows the pipe ready -

 reading it yields EOF, so you end up with busy-waiting until the subprocess has
 actually finished.
 
 To avoid this, if all the data that is needed has been read from a subprocess
 reading it yields EOF, so you end up with busy-waiting until the subprocess has
 actually finished.
 
 To avoid this, if all the data that is needed has been read from a subprocess

-after select(), an explicit wait() for it is done. We know that all it is doing
+after poll(), an explicit wait() for it is done. We know that all it is doing

 is writing to the pipe and then exiting, so the wait should not be long.
 
 The non-blocking waitpid() is to some extent just insurance; if we could
 is writing to the pipe and then exiting, so the wait should not be long.
 
 The non-blocking waitpid() is to some extent just insurance; if we could


@@ -3869,9 +3882,7 @@ for (;;)   /* Normally we do not repeat this loop */
   {
   while ((pid = waitpid(-1, &status, WNOHANG)) <= 0)
     {
   {
   while ((pid = waitpid(-1, &status, WNOHANG)) <= 0)
     {

-    struct timeval tv;
-    fd_set select_pipes;
-    int maxpipe, readycount;
+    int readycount;

 
     /* A return value of -1 can mean several things. If errno != ECHILD, it
     either means invalid options (which we discount), or that this process was
 
     /* A return value of -1 can mean several things. If errno != ECHILD, it
     either means invalid options (which we discount), or that this process was


@@ -3895,7 +3906,7 @@ for (;;)   /* Normally we do not repeat this loop */
     subprocesses are still in existence. If kill() gives an OK return, we know
     it must be for one of our processes - it can't be for a re-use of the pid,
     because if our process had finished, waitpid() would have found it. If any
     subprocesses are still in existence. If kill() gives an OK return, we know
     it must be for one of our processes - it can't be for a re-use of the pid,
     because if our process had finished, waitpid() would have found it. If any

-    of our subprocesses are in existence, we proceed to use select() as if
+    of our subprocesses are in existence, we proceed to use poll() as if

     waitpid() had returned zero. I think this is safe. */
 
     if (pid < 0)
     waitpid() had returned zero. I think this is safe. */
 
     if (pid < 0)


@@ -3919,7 +3930,7 @@ for (;;)   /* Normally we do not repeat this loop */
       if (poffset >= remote_max_parallel)
         {
         DEBUG(D_deliver) debug_printf("*** no delivery children found\n");
       if (poffset >= remote_max_parallel)
         {
         DEBUG(D_deliver) debug_printf("*** no delivery children found\n");

-        return NULL;   /* This is the error return */
+       return NULL;    /* This is the error return */

         }
       }
 
         }
       }
 


@@ -3928,28 +3939,23 @@ for (;;)   /* Normally we do not repeat this loop */
     subprocess, but there are no completed subprocesses. See if any pipes are
     ready with any data for reading. */
 
     subprocess, but there are no completed subprocesses. See if any pipes are
     ready with any data for reading. */
 

-    DEBUG(D_deliver) debug_printf("selecting on subprocess pipes\n");
+    DEBUG(D_deliver) debug_printf("polling subprocess pipes\n");

 
 

-    maxpipe = 0;
-    FD_ZERO(&select_pipes);

     for (poffset = 0; poffset < remote_max_parallel; poffset++)
       if (parlist[poffset].pid != 0)
     for (poffset = 0; poffset < remote_max_parallel; poffset++)
       if (parlist[poffset].pid != 0)

-        {
-        int fd = parlist[poffset].fd;
-        FD_SET(fd, &select_pipes);
-        if (fd > maxpipe) maxpipe = fd;
-        }
+       {
+       parpoll[poffset].fd = parlist[poffset].fd;
+       parpoll[poffset].events = POLLIN;
+       }
+      else
+       parpoll[poffset].fd = -1;

 
     /* Stick in a 60-second timeout, just in case. */
 
 
     /* Stick in a 60-second timeout, just in case. */
 

-    tv.tv_sec = 60;
-    tv.tv_usec = 0;
-
-    readycount = select(maxpipe + 1, (SELECT_ARG2_TYPE *)&select_pipes,
-         NULL, NULL, &tv);
+    readycount = poll(parpoll, remote_max_parallel, 60 * 1000);

 
     /* Scan through the pipes and read any that are ready; use the count
 
     /* Scan through the pipes and read any that are ready; use the count

-    returned by select() to stop when there are no more. Select() can return
+    returned by poll() to stop when there are no more. Select() can return

     with no processes (e.g. if interrupted). This shouldn't matter.
 
     If par_read_pipe() returns TRUE, it means that either the terminating Z was
     with no processes (e.g. if interrupted). This shouldn't matter.
 
     If par_read_pipe() returns TRUE, it means that either the terminating Z was


@@ -3966,7 +3972,7 @@ for (;;)   /* Normally we do not repeat this loop */
          poffset++)
       {
       if (  (pid = parlist[poffset].pid) != 0
          poffset++)
       {
       if (  (pid = parlist[poffset].pid) != 0

-         && FD_ISSET(parlist[poffset].fd, &select_pipes)
+        && parpoll[poffset].revents

         )
         {
         readycount--;
         )
         {
         readycount--;


@@ -4004,7 +4010,7 @@ for (;;)   /* Normally we do not repeat this loop */
     "transport process list", pid);
   }  /* End of the "for" loop */
 
     "transport process list", pid);
   }  /* End of the "for" loop */
 

-/* Come here when all the data was completely read after a select(), and
+/* Come here when all the data was completely read after a poll(), and

 the process in pid has been wait()ed for. */
 
 PROCESS_DONE:
 the process in pid has been wait()ed for. */
 
 PROCESS_DONE:


@@ -4039,7 +4045,7 @@ if ((status & 0xffff) != 0)
     "%s %d",
     addrlist->transport->driver_name,
     status,
     "%s %d",
     addrlist->transport->driver_name,
     status,

-    (msb == 0)? "terminated by signal" : "exit code",
+    msb == 0 ? "terminated by signal" : "exit code",

     code);
 
   if (msb != 0 || (code != SIGTERM && code != SIGKILL && code != SIGQUIT))
     code);
 
   if (msb != 0 || (code != SIGTERM && code != SIGKILL && code != SIGQUIT))


@@ -4057,7 +4063,8 @@ if ((status & 0xffff) != 0)
 /* Else complete reading the pipe to get the result of the delivery, if all
 the data has not yet been obtained. */
 
 /* Else complete reading the pipe to get the result of the delivery, if all
 the data has not yet been obtained. */
 

-else if (!parlist[poffset].done) (void)par_read_pipe(poffset, TRUE);
+else if (!parlist[poffset].done)
+  (void) par_read_pipe(poffset, TRUE);

 
 /* Put the data count and return path into globals, mark the data slot unused,
 decrement the count of subprocesses, and return the address chain. */
 
 /* Put the data count and return path into globals, mark the data slot unused,
 decrement the count of subprocesses, and return the address chain. */


@@ -4206,6 +4213,7 @@ if (!parlist)
   parlist = store_get(remote_max_parallel * sizeof(pardata), FALSE);
   for (poffset = 0; poffset < remote_max_parallel; poffset++)
     parlist[poffset].pid = 0;
   parlist = store_get(remote_max_parallel * sizeof(pardata), FALSE);
   for (poffset = 0; poffset < remote_max_parallel; poffset++)
     parlist[poffset].pid = 0;

+  parpoll = store_get(remote_max_parallel * sizeof(struct pollfd), FALSE);

   }
 
 /* Now loop for each remote delivery */
   }
 
 /* Now loop for each remote delivery */


@@ -4267,6 +4275,10 @@ for (int delivery_count = 0; addr_remote; delivery_count++)
       }
     }
 
       }
     }
 

+/*XXX need to defeat this when DANE is used - but we don't know that yet.
+So look out for the place it gets used.
+*/
+

   /* Get the flag which specifies whether the transport can handle different
   domains that nevertheless resolve to the same set of hosts. If it needs
   expanding, get variables set: $address_data, $domain_data, $localpart_data,
   /* Get the flag which specifies whether the transport can handle different
   domains that nevertheless resolve to the same set of hosts. If it needs
   expanding, get variables set: $address_data, $domain_data, $localpart_data,


@@ -4345,6 +4357,11 @@ for (int delivery_count = 0; addr_remote; delivery_count++)
   /************************************************************************/
 
 
   /************************************************************************/
 
 

+/*XXX don't know yet if DANE will be used.  So tpt will have to
+check at the point if gets next addr from list, and skip/defer any
+nonmatch domains
+*/
+

   /* Pick off all addresses which have the same transport, errors address,
   destination, and extra headers. In some cases they point to the same host
   list, but we also need to check for identical host lists generated from
   /* Pick off all addresses which have the same transport, errors address,
   destination, and extra headers. In some cases they point to the same host
   list, but we also need to check for identical host lists generated from


@@ -4424,7 +4441,7 @@ for (int delivery_count = 0; addr_remote; delivery_count++)
 
   if(addr->prop.errors_address)
     return_path = addr->prop.errors_address;
 
   if(addr->prop.errors_address)
     return_path = addr->prop.errors_address;

-#ifdef EXPERIMENTAL_SRS
+#ifdef EXPERIMENTAL_SRS_ALT

   else if(addr->prop.srs_sender)
     return_path = addr->prop.srs_sender;
 #endif
   else if(addr->prop.srs_sender)
     return_path = addr->prop.srs_sender;
 #endif


@@ -4491,6 +4508,7 @@ for (int delivery_count = 0; addr_remote; delivery_count++)
   if (continue_transport)
     {
     BOOL ok = Ustrcmp(continue_transport, tp->name) == 0;
   if (continue_transport)
     {
     BOOL ok = Ustrcmp(continue_transport, tp->name) == 0;

+/*XXX do we need to check for a DANEd conn vs. a change of domain? */

 
     /* If the transport is about to override the host list do not check
     it here but take the cost of running the transport process to discover
 
     /* If the transport is about to override the host list do not check
     it here but take the cost of running the transport process to discover


@@ -4591,7 +4609,7 @@ for (int delivery_count = 0; addr_remote; delivery_count++)
     that it can use either of them, though it prefers O_NONBLOCK, which
     distinguishes between EOF and no-more-data. */
 
     that it can use either of them, though it prefers O_NONBLOCK, which
     distinguishes between EOF and no-more-data. */
 

-/* The data appears in a timely manner and we already did a select on
+/* The data appears in a timely manner and we already did a poll on

 all pipes, so I do not see a reason to use non-blocking IO here
 
 #ifdef O_NONBLOCK
 all pipes, so I do not see a reason to use non-blocking IO here
 
 #ifdef O_NONBLOCK


@@ -4642,7 +4660,7 @@ all pipes, so I do not see a reason to use non-blocking IO here
 
   search_tidyup();
 
 
   search_tidyup();
 

-  if ((pid = fork()) == 0)
+  if ((pid = exim_fork(US"transport")) == 0)

     {
     int fd = pfd[pipe_write];
     host_item *h;
     {
     int fd = pfd[pipe_write];
     host_item *h;


@@ -4656,10 +4674,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))
     /* 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_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
 
     /* Reset the random number generator, so different processes don't all
     have the same sequence. In the test harness we want different, but


@@ -4771,7 +4786,7 @@ all pipes, so I do not see a reason to use non-blocking IO here
 #ifdef SUPPORT_DANE
       if (tls_out.dane_verified)        setflag(addr, af_dane_verified);
 #endif
 #ifdef SUPPORT_DANE
       if (tls_out.dane_verified)        setflag(addr, af_dane_verified);
 #endif

-# ifdef EXPERIMENTAL_TLS_RESUME
+# ifndef DISABLE_TLS_RESUME

       if (tls_out.resumption & RESUME_USED) setflag(addr, af_tls_resume);
 # endif
 
       if (tls_out.resumption & RESUME_USED) setflag(addr, af_tls_resume);
 # endif
 


@@ -4880,6 +4895,14 @@ all pipes, so I do not see a reason to use non-blocking IO here
         rmt_dlv_checked_write(fd, 'R', '0', big_buffer, ptr - big_buffer);
         }
 
         rmt_dlv_checked_write(fd, 'R', '0', big_buffer, ptr - big_buffer);
         }
 

+      if (testflag(addr, af_new_conn) || testflag(addr, af_cont_conn))
+       {
+       DEBUG(D_deliver) debug_printf("%scontinued-connection\n",
+         testflag(addr, af_new_conn) ? "non-" : "");
+       big_buffer[0] = testflag(addr, af_new_conn) ? BIT(1) : BIT(2);
+        rmt_dlv_checked_write(fd, 'A', '3', big_buffer, 1);
+       }
+

 #ifdef SUPPORT_SOCKS
       if (LOGGING(proxy) && proxy_session)
        {
 #ifdef SUPPORT_SOCKS
       if (LOGGING(proxy) && proxy_session)
        {


@@ -5378,7 +5401,8 @@ Returns:       nothing
 static void
 print_dsn_diagnostic_code(const address_item *addr, FILE *f)
 {
 static void
 print_dsn_diagnostic_code(const address_item *addr, FILE *f)
 {

-uschar *s = testflag(addr, af_pass_message) ? addr->message : NULL;
+uschar * s = testflag(addr, af_pass_message) ? addr->message : NULL;
+unsigned cnt;

 
 /* af_pass_message and addr->message set ? print remote host answer */
 if (s)
 
 /* af_pass_message and addr->message set ? print remote host answer */
 if (s)


@@ -5390,19 +5414,32 @@ if (s)
   if (!(s = Ustrstr(addr->message, ": ")))
     return;                            /* not found, bail out */
   s += 2;  /* skip ": " */
   if (!(s = Ustrstr(addr->message, ": ")))
     return;                            /* not found, bail out */
   s += 2;  /* skip ": " */

-  fprintf(f, "Diagnostic-Code: smtp; ");
+  cnt = fprintf(f, "Diagnostic-Code: smtp; ");

   }
 /* no message available. do nothing */
 else return;
 
 while (*s)
   }
 /* no message available. do nothing */
 else return;
 
 while (*s)

+  {
+  if (cnt > 950)       /* RFC line length limit: 998 */
+    {
+    DEBUG(D_deliver) debug_printf("print_dsn_diagnostic_code() truncated line\n");
+    fputs("[truncated]", f);
+    break;
+    }
+

   if (*s == '\\' && s[1] == 'n')
     {
     fputs("\n ", f);    /* as defined in RFC 3461 */
     s += 2;
   if (*s == '\\' && s[1] == 'n')
     {
     fputs("\n ", f);    /* as defined in RFC 3461 */
     s += 2;

+    cnt += 2;

     }
   else
     }
   else

+    {

     fputc(*s++, f);
     fputc(*s++, f);

+    cnt++;
+    }
+  }

 
 fputc('\n', f);
 }
 
 fputc('\n', f);
 }


@@ -5497,6 +5534,29 @@ if (  f.running_in_test_harness && *fudged_queue_times
 return actual_time;
 }
 
 return actual_time;
 }
 

+/************************************************/
+
+static FILE *
+expand_open(const uschar * filename,
+  const uschar * varname, const uschar * reason)
+{
+const uschar * s = expand_cstring(filename);
+FILE * fp = NULL;
+
+if (!s || !*s)
+  log_write(0, LOG_MAIN|LOG_PANIC,
+    "Failed to expand %s: '%s'\n", varname, filename);
+else if (*s != '/')
+  log_write(0, LOG_MAIN|LOG_PANIC, "%s is not absolute after expansion: '%s'\n",
+    varname, s);
+else if (is_tainted2(s, LOG_MAIN|LOG_PANIC, "Tainted %s after expansion: '%s'\n", varname, s))
+  ;
+else if (!(fp = Ufopen(s, "rb")))
+  log_write(0, LOG_MAIN|LOG_PANIC, "Failed to open %s for %s "
+    "message texts: %s", s, reason, strerror(errno));
+return fp;
+}
+

 /*************************************************
 *              Deliver one message               *
 *************************************************/
 /*************************************************
 *              Deliver one message               *
 *************************************************/


@@ -6100,9 +6160,10 @@ else if (system_filter && process_recipients != RECIP_FAIL_TIMEOUT)
           if (!tmp)
             p->message = string_sprintf("failed to expand \"%s\" as a "
               "system filter transport name", tpname);
           if (!tmp)
             p->message = string_sprintf("failed to expand \"%s\" as a "
               "system filter transport name", tpname);

-         if (is_tainted(tmp))
-            p->message = string_sprintf("attempt to used tainted value '%s' for"
-             "transport '%s' as a system filter", tmp, tpname);
+          { uschar *m;
+         if ((m = is_tainted2(tmp, 0, "Tainted values '%s' " "for transport '%s' as a system filter", tmp, tpname)))
+            p->message = m;
+          }

           tpname = tmp;
           }
         else
           tpname = tmp;
           }
         else


@@ -6489,14 +6550,19 @@ while (addr_new)           /* Loop until all addresses dealt with */
 
       /* Treat /dev/null as a special case and abandon the delivery. This
       avoids having to specify a uid on the transport just for this case.
 
       /* Treat /dev/null as a special case and abandon the delivery. This
       avoids having to specify a uid on the transport just for this case.

-      Arrange for the transport name to be logged as "**bypassed**". */
+      Arrange for the transport name to be logged as "**bypassed**".
+      Copy the transport for this fairly unusual case rather than having
+      to make all transports mutable. */

 
       if (Ustrcmp(addr->address, "/dev/null") == 0)
         {
 
       if (Ustrcmp(addr->address, "/dev/null") == 0)
         {

-        uschar *save = addr->transport->name;
-        addr->transport->name = US"**bypassed**";
+       transport_instance * save_t = addr->transport;
+       transport_instance * t = store_get(sizeof(*t), is_tainted(save_t));
+       *t = *save_t;
+       t->name = US"**bypassed**";
+       addr->transport = t;

         (void)post_process_one(addr, OK, LOG_MAIN, EXIM_DTYPE_TRANSPORT, '=');
         (void)post_process_one(addr, OK, LOG_MAIN, EXIM_DTYPE_TRANSPORT, '=');

-        addr->transport->name = save;
+        addr->transport= save_t;

         continue;   /* with the next new address */
         }
 
         continue;   /* with the next new address */
         }
 


@@ -6773,7 +6839,7 @@ while (addr_new)           /* Loop until all addresses dealt with */
       addr_route = addr->next;
 
       deliver_domain = addr->domain;  /* set $domain */
       addr_route = addr->next;
 
       deliver_domain = addr->domain;  /* set $domain */

-      if ((rc = match_isinlist(addr->domain, (const uschar **)&queue_domains, 0,
+      if ((rc = match_isinlist(addr->domain, CUSS &queue_domains, 0,

             &domainlist_anchor, addr->domain_cache, MCL_DOMAIN, TRUE, NULL))
               != OK)
         if (rc == DEFER)
             &domainlist_anchor, addr->domain_cache, MCL_DOMAIN, TRUE, NULL))
               != OK)
         if (rc == DEFER)


@@ -7028,13 +7094,23 @@ if (  mua_wrapper
 
 
 /* If this is a run to continue deliveries to an external channel that is
 
 
 /* If this is a run to continue deliveries to an external channel that is

-already set up, defer any local deliveries. */
+already set up, defer any local deliveries.

 
 

-if (continue_transport)
+jgh 2020/12/20: I don't see why; locals should be quick.
+The defer goes back to version 1.62 in 1997.  A local being still deliverable
+during a continued run might result from something like a defer during the
+original delivery, eg. in a DB lookup.  Unlikely but possible.
+
+To avoid delaying a local when combined with a callout-hold for a remote
+delivery, test continue_sequence rather than continue_transport. */
+
+if (continue_sequence > 1 && addr_local)

   {
   {

+  DEBUG(D_deliver|D_retry|D_route)
+    debug_printf("deferring local deliveries due to continued-transport\n");

   if (addr_defer)
     {
   if (addr_defer)
     {

-    address_item *addr = addr_defer;
+    address_item * addr = addr_defer;

     while (addr->next) addr = addr->next;
     addr->next = addr_local;
     }
     while (addr->next) addr = addr->next;
     addr->next = addr_local;
     }


@@ -7330,7 +7406,7 @@ if (addr_senddsn)
   int fd;
 
   /* create exim process to send message */
   int fd;
 
   /* create exim process to send message */

-  pid = child_open_exim(&fd);
+  pid = child_open_exim(&fd, US"DSN");

 
   DEBUG(D_deliver) debug_printf("DSN: child_open_exim returns: %d\n", pid);
 
 
   DEBUG(D_deliver) debug_printf("DSN: child_open_exim returns: %d\n", pid);
 


@@ -7531,7 +7607,7 @@ while (addr_failed)
 
     /* Make a subprocess to send a message */
 
 
     /* Make a subprocess to send a message */
 

-    if ((pid = child_open_exim(&fd)) < 0)
+    if ((pid = child_open_exim(&fd, US"bounce-message")) < 0)

       log_write(0, LOG_MAIN|LOG_PANIC_DIE, "Process %d (parent %d) failed to "
         "create child process to send failure message: %s", getpid(),
         getppid(), strerror(errno));
       log_write(0, LOG_MAIN|LOG_PANIC_DIE, "Process %d (parent %d) failed to "
         "create child process to send failure message: %s", getpid(),
         getppid(), strerror(errno));


@@ -7617,9 +7693,8 @@ while (addr_failed)
       carry on - default texts will be used. */
 
       if (bounce_message_file)
       carry on - default texts will be used. */
 
       if (bounce_message_file)

-        if (!(emf = Ufopen(bounce_message_file, "rb")))
-          log_write(0, LOG_MAIN|LOG_PANIC, "Failed to open %s for error "
-            "message texts: %s", bounce_message_file, strerror(errno));
+       emf = expand_open(bounce_message_file,
+               US"bounce_message_file", US"error");

 
       /* Quietly copy to configured additional addresses if required. */
 
 
       /* Quietly copy to configured additional addresses if required. */
 


@@ -7808,11 +7883,11 @@ wording. */
            fprintf(fp, "Remote-MTA: X-ip; [%s]%s\n", hu->address, p);
            }
          if ((s = addr->smtp_greeting) && *s)
            fprintf(fp, "Remote-MTA: X-ip; [%s]%s\n", hu->address, p);
            }
          if ((s = addr->smtp_greeting) && *s)

-           fprintf(fp, "X-Remote-MTA-smtp-greeting: X-str; %s\n", s);
+           fprintf(fp, "X-Remote-MTA-smtp-greeting: X-str; %.900s\n", s);

          if ((s = addr->helo_response) && *s)
          if ((s = addr->helo_response) && *s)

-           fprintf(fp, "X-Remote-MTA-helo-response: X-str; %s\n", s);
+           fprintf(fp, "X-Remote-MTA-helo-response: X-str; %.900s\n", s);

          if ((s = addr->message) && *s)
          if ((s = addr->message) && *s)

-           fprintf(fp, "X-Exim-Diagnostic: X-str; %s\n", s);
+           fprintf(fp, "X-Exim-Diagnostic: X-str; %.900s\n", s);

          }
 #endif
          print_dsn_diagnostic_code(addr, fp);
          }
 #endif
          print_dsn_diagnostic_code(addr, fp);


@@ -7912,10 +7987,6 @@ wording. */
       (void)fclose(fp);
       rc = child_close(pid, 0);     /* Waits for child to close, no timeout */
 
       (void)fclose(fp);
       rc = child_close(pid, 0);     /* Waits for child to close, no timeout */
 

-      /* In the test harness, let the child do it's thing first. */
-
-      testharness_pause_ms(500);
-

       /* If the process failed, there was some disaster in setting up the
       error message. Unless the message is very old, ensure that addr_defer
       is non-null, which will have the effect of leaving the message on the
       /* If the process failed, there was some disaster in setting up the
       error message. Unless the message is very old, ensure that addr_defer
       is non-null, which will have the effect of leaving the message on the


@@ -8189,20 +8260,19 @@ else if (addr_defer != (address_item *)(+1))
       {
       header_line *h;
       int fd;
       {
       header_line *h;
       int fd;

-      pid_t pid = child_open_exim(&fd);
+      pid_t pid = child_open_exim(&fd, US"delay-warning-message");

 
       if (pid > 0)
         {
 
       if (pid > 0)
         {

-        uschar *wmf_text;
-        FILE *wmf = NULL;
-        FILE *f = fdopen(fd, "wb");
+        uschar * wmf_text;
+        FILE * wmf = NULL;
+        FILE * f = fdopen(fd, "wb");

        uschar * bound;
        transport_ctx tctx = {{0}};
 
         if (warn_message_file)
        uschar * bound;
        transport_ctx tctx = {{0}};
 
         if (warn_message_file)

-          if (!(wmf = Ufopen(warn_message_file, "rb")))
-            log_write(0, LOG_MAIN|LOG_PANIC, "Failed to open %s for warning "
-              "message texts: %s", warn_message_file, strerror(errno));
+         wmf = expand_open(warn_message_file,
+                 US"warn_message_file", US"warning");

 
         warnmsg_recipients = recipients;
         warnmsg_delay = queue_time < 120*60
 
         warnmsg_recipients = recipients;
         warnmsg_delay = queue_time < 120*60


@@ -8371,7 +8441,7 @@ else if (addr_defer != (address_item *)(+1))
   /* If this was a first delivery attempt, unset the first time flag, and
   ensure that the spool gets updated. */
 
   /* If this was a first delivery attempt, unset the first time flag, and
   ensure that the spool gets updated. */
 

-  if (f.deliver_firsttime)
+  if (f.deliver_firsttime && !f.queue_2stage)

     {
     f.deliver_firsttime = FALSE;
     update_spool = TRUE;
     {
     f.deliver_firsttime = FALSE;
     update_spool = TRUE;


@@ -8504,52 +8574,9 @@ f.tcp_fastopen_ok = TRUE;
 }
 
 
 }
 
 

-uschar *
-deliver_get_sender_address (uschar * id)
-{
-int rc;
-uschar * new_sender_address,
-       * save_sender_address;
-BOOL save_qr = f.queue_running;
-uschar * spoolname;
-
-/* make spool_open_datafile non-noisy on fail */
-
-f.queue_running = TRUE;
-
-/* Side effect: message_subdir is set for the (possibly split) spool directory */
-
-deliver_datafile = spool_open_datafile(id);
-f.queue_running = save_qr;
-if (deliver_datafile < 0)
-  return NULL;
-
-/* Save and restore the global sender_address.  I'm not sure if we should
-not save/restore all the other global variables too, because
-spool_read_header() may change all of them. But OTOH, when this
-deliver_get_sender_address() gets called, the current message is done
-already and nobody needs the globals anymore. (HS12, 2015-08-21) */
-
-spoolname = string_sprintf("%s-H", id);
-save_sender_address = sender_address;
-
-rc = spool_read_header(spoolname, TRUE, TRUE);
-
-new_sender_address = sender_address;
-sender_address = save_sender_address;
-
-if (rc != spool_read_OK)
-  return NULL;
-
-assert(new_sender_address);
-
-(void)close(deliver_datafile);
-deliver_datafile = -1;
-
-return new_sender_address;
-}
-

 
 

+/* Called from a commandline, or from the daemon, to do a delivery.
+We need to regain privs; do this by exec of the exim binary. */

 
 void
 delivery_re_exec(int exec_type)
 
 void
 delivery_re_exec(int exec_type)


@@ -8577,18 +8604,17 @@ if (cutthrough.cctx.sock >= 0 && cutthrough.callout_hold_only)
       goto fail;
 
     where = US"fork";
       goto fail;
 
     where = US"fork";

-    if ((pid = fork()) < 0)
+    testharness_pause_ms(150);
+    if ((pid = exim_fork(US"tls-proxy-interproc")) < 0)

       goto fail;
 
       goto fail;
 

-    else if (pid == 0)         /* child: fork again to totally disconnect */
+    if (pid == 0)      /* child: will fork again to totally disconnect */

       {
       {

-      testharness_pause_ms(100); /* let parent debug out */
-      /* does not return */

       smtp_proxy_tls(cutthrough.cctx.tls_ctx, big_buffer, big_buffer_size,
                      pfd, 5*60);
       smtp_proxy_tls(cutthrough.cctx.tls_ctx, big_buffer, big_buffer_size,
                      pfd, 5*60);

+      /* 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 */
     close(pfd[0]);
     waitpid(pid, NULL, 0);
     (void) close(channel_fd);  /* release the client socket */