DANE: ignore undersized TLSA records

[users/heiko/exim.git] / src / src / transports / pipe.c

diff --git a/src/src/transports/pipe.c b/src/src/transports/pipe.c
index bbba305b09d95d377239c94ad7794a47d2902a71..b94c223342a178f3e98ab3186eab1dd27c22c987 100644 (file)
--- a/src/src/transports/pipe.c
+++ b/src/src/transports/pipe.c
@@ -1,10 +1,8 @@
-/* $Cambridge: exim/src/src/transports/pipe.c,v 1.13 2009/11/05 19:28:10 nm4 Exp $ */
-

 /*************************************************
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 

-/* Copyright (c) University of Cambridge 1995 - 2007 */
+/* Copyright (c) University of Cambridge 1995 - 2018 */

 /* See the file NOTICE for conditions of use and distribution. */
 
 
 /* See the file NOTICE for conditions of use and distribution. */
 
 


@@ -39,8 +37,12 @@ optionlist pipe_transport_options[] = {
       (void *)offsetof(pipe_transport_options_block, environment) },
   { "escape_string",     opt_stringptr,
       (void *)offsetof(pipe_transport_options_block, escape_string) },
       (void *)offsetof(pipe_transport_options_block, environment) },
   { "escape_string",     opt_stringptr,
       (void *)offsetof(pipe_transport_options_block, escape_string) },

+  { "force_command",         opt_bool,
+      (void *)offsetof(pipe_transport_options_block, force_command) },

   { "freeze_exec_fail",  opt_bool,
       (void *)offsetof(pipe_transport_options_block, freeze_exec_fail) },
   { "freeze_exec_fail",  opt_bool,
       (void *)offsetof(pipe_transport_options_block, freeze_exec_fail) },

+  { "freeze_signal",     opt_bool,
+      (void *)offsetof(pipe_transport_options_block, freeze_signal) },

   { "ignore_status",     opt_bool,
       (void *)offsetof(pipe_transport_options_block, ignore_status) },
   { "log_defer_output",  opt_bool | opt_public,
   { "ignore_status",     opt_bool,
       (void *)offsetof(pipe_transport_options_block, ignore_status) },
   { "log_defer_output",  opt_bool | opt_public,


@@ -57,6 +59,8 @@ optionlist pipe_transport_options[] = {
       (void *)offsetof(pipe_transport_options_block, message_suffix) },
   { "path",              opt_stringptr,
       (void *)offsetof(pipe_transport_options_block, path) },
       (void *)offsetof(pipe_transport_options_block, message_suffix) },
   { "path",              opt_stringptr,
       (void *)offsetof(pipe_transport_options_block, path) },

+  { "permit_coredump",   opt_bool,
+      (void *)offsetof(pipe_transport_options_block, permit_coredump) },

   { "pipe_as_creator",   opt_bool | opt_public,
       (void *)offsetof(transport_instance, deliver_as_creator) },
   { "restrict_to_path",  opt_bool,
   { "pipe_as_creator",   opt_bool | opt_public,
       (void *)offsetof(transport_instance, deliver_as_creator) },
   { "restrict_to_path",  opt_bool,


@@ -91,6 +95,17 @@ address can appear in the tables drtables.c. */
 int pipe_transport_options_count =
   sizeof(pipe_transport_options)/sizeof(optionlist);
 
 int pipe_transport_options_count =
   sizeof(pipe_transport_options)/sizeof(optionlist);
 

+
+#ifdef MACRO_PREDEF
+
+/* Dummy values */
+pipe_transport_options_block pipe_transport_option_defaults = {0};
+void pipe_transport_init(transport_instance *tblock) {}
+BOOL pipe_transport_entry(transport_instance *tblock, address_item *addr) {return FALSE;}
+
+#else   /*!MACRO_PREDEF*/
+
+

 /* Default private options block for the pipe transport. */
 
 pipe_transport_options_block pipe_transport_option_defaults = {
 /* Default private options block for the pipe transport. */
 
 pipe_transport_options_block pipe_transport_option_defaults = {


@@ -108,8 +123,11 @@ pipe_transport_options_block pipe_transport_option_defaults = {
   20480,          /* max_output */
   60*60,          /* timeout */
   0,              /* options */
   20480,          /* max_output */
   60*60,          /* timeout */
   0,              /* options */

+  FALSE,          /* force_command */

   FALSE,          /* freeze_exec_fail */
   FALSE,          /* freeze_exec_fail */

+  FALSE,          /* freeze_signal */

   FALSE,          /* ignore_status */
   FALSE,          /* ignore_status */

+  FALSE,          /* permit_coredump */

   FALSE,          /* restrict_to_path */
   FALSE,          /* timeout_defer */
   FALSE,          /* use_shell */
   FALSE,          /* restrict_to_path */
   FALSE,          /* timeout_defer */
   FALSE,          /* use_shell */


@@ -127,7 +145,7 @@ pipe_transport_options_block pipe_transport_option_defaults = {
 /* Called for each delivery in the privileged state, just before the uid/gid
 are changed and the main entry point is called. In a system that supports the
 login_cap facilities, this function is used to set the class resource limits
 /* Called for each delivery in the privileged state, just before the uid/gid
 are changed and the main entry point is called. In a system that supports the
 login_cap facilities, this function is used to set the class resource limits

-for the user.
+for the user.  It may also re-enable coredumps.

 
 Arguments:
   tblock     points to the transport instance
 
 Arguments:
   tblock     points to the transport instance


@@ -170,6 +188,24 @@ if (ob->use_classresources)
   }
 #endif
 
   }
 #endif
 

+#ifdef RLIMIT_CORE
+if (ob->permit_coredump)
+  {
+  struct rlimit rl;
+  rl.rlim_cur = RLIM_INFINITY;
+  rl.rlim_max = RLIM_INFINITY;
+  if (setrlimit(RLIMIT_CORE, &rl) < 0)
+    {
+#ifdef SETRLIMIT_NOT_SUPPORTED
+    if (errno != ENOSYS && errno != ENOTSUP)
+#endif
+      log_write(0, LOG_MAIN,
+          "delivery setrlimit(RLIMIT_CORE, RLIM_INFINITY) failed: %s",
+          strerror(errno));
+    }
+  }
+#endif
+

 return OK;
 }
 
 return OK;
 }
 


@@ -301,22 +337,20 @@ Returns:             TRUE if all went well; otherwise an error will be
 */
 
 static BOOL
 */
 
 static BOOL

-set_up_direct_command(uschar ***argvptr, uschar *cmd, BOOL expand_arguments,
-  int expand_fail, address_item *addr, uschar *tname,
+set_up_direct_command(const uschar ***argvptr, uschar *cmd,
+  BOOL expand_arguments, int expand_fail, address_item *addr, uschar *tname,

   pipe_transport_options_block *ob)
 {
 BOOL permitted = FALSE;
   pipe_transport_options_block *ob)
 {
 BOOL permitted = FALSE;

-uschar **argv;
-uschar buffer[64];
+const uschar **argv;

 
 /* Set up "transport <name>" to be put in any error messages, and then
 call the common function for creating an argument list and expanding
 the items if necessary. If it fails, this function fails (error information
 is in the addresses). */
 
 
 /* Set up "transport <name>" to be put in any error messages, and then
 call the common function for creating an argument list and expanding
 the items if necessary. If it fails, this function fails (error information
 is in the addresses). */
 

-sprintf(CS buffer, "%.50s transport", tname);

 if (!transport_set_up_command(argvptr, cmd, expand_arguments, expand_fail,
 if (!transport_set_up_command(argvptr, cmd, expand_arguments, expand_fail,

-      addr, buffer, NULL))
+      addr, string_sprintf("%.50s transport", tname), NULL))

   return FALSE;
 
 /* Point to the set-up arguments. */
   return FALSE;
 
 /* Point to the set-up arguments. */


@@ -325,14 +359,13 @@ argv = *argvptr;
 
 /* If allow_commands is set, see if the command is in the permitted list. */
 
 
 /* If allow_commands is set, see if the command is in the permitted list. */
 

-if (ob->allow_commands != NULL)
+if (ob->allow_commands)

   {
   int sep = 0;
   {
   int sep = 0;

-  uschar *s, *p;
-  uschar buffer[256];
+  const uschar *s;
+  uschar *p;

 
 

-  s = expand_string(ob->allow_commands);
-  if (s == NULL)
+  if (!(s = expand_string(ob->allow_commands)))

     {
     addr->transport_return = DEFER;
     addr->message = string_sprintf("failed to expand string \"%s\" "
     {
     addr->transport_return = DEFER;
     addr->message = string_sprintf("failed to expand string \"%s\" "


@@ -340,10 +373,8 @@ if (ob->allow_commands != NULL)
     return FALSE;
     }
 
     return FALSE;
     }
 

-  while ((p = string_nextinlist(&s, &sep, buffer, sizeof(buffer))) != NULL)
-    {
+  while ((p = string_nextinlist(&s, &sep, NULL, 0)))

     if (Ustrcmp(p, argv[0]) == 0) { permitted = TRUE; break; }
     if (Ustrcmp(p, argv[0]) == 0) { permitted = TRUE; break; }

-    }

   }
 
 /* If permitted is TRUE it means the command was found in the allowed list, and
   }
 
 /* If permitted is TRUE it means the command was found in the allowed list, and


@@ -366,7 +397,7 @@ if (!permitted)
       }
     }
 
       }
     }
 

-  else if (ob->allow_commands != NULL)
+  else if (ob->allow_commands)

     {
     addr->transport_return = FAIL;
     addr->message = string_sprintf("\"%s\" command not permitted by %s "
     {
     addr->transport_return = FAIL;
     addr->message = string_sprintf("\"%s\" command not permitted by %s "


@@ -382,10 +413,9 @@ if (argv[0][0] != '/')
   {
   int sep = 0;
   uschar *p;
   {
   int sep = 0;
   uschar *p;

-  uschar *listptr = ob->path;
-  uschar buffer[1024];
+  const uschar *listptr = expand_string(ob->path);

 
 

-  while ((p = string_nextinlist(&listptr, &sep, buffer, sizeof(buffer))) != NULL)
+  while ((p = string_nextinlist(&listptr, &sep, NULL, 0)))

     {
     struct stat statbuf;
     sprintf(CS big_buffer, "%.256s/%.256s", p, argv[0]);
     {
     struct stat statbuf;
     sprintf(CS big_buffer, "%.256s/%.256s", p, argv[0]);


@@ -395,7 +425,7 @@ if (argv[0][0] != '/')
       break;
       }
     }
       break;
       }
     }

-  if (p == NULL)
+  if (!p)

     {
     addr->transport_return = FAIL;
     addr->message = string_sprintf("\"%s\" command not found for %s transport",
     {
     addr->transport_return = FAIL;
     addr->message = string_sprintf("\"%s\" command not found for %s transport",


@@ -428,10 +458,10 @@ Returns:             TRUE if all went well; otherwise an error will be
 */
 
 static BOOL
 */
 
 static BOOL

-set_up_shell_command(uschar ***argvptr, uschar *cmd, BOOL expand_arguments,
-  int expand_fail, address_item *addr, uschar *tname)
+set_up_shell_command(const uschar ***argvptr, uschar *cmd,
+  BOOL expand_arguments, int expand_fail, address_item *addr, uschar *tname)

 {
 {

-uschar **argv;
+const uschar **argv;

 
 *argvptr = argv = store_get((4)*sizeof(uschar *));
 
 
 *argvptr = argv = store_get((4)*sizeof(uschar *));
 


@@ -441,13 +471,18 @@ argv[1] = US"-c";
 /* We have to take special action to handle the special "variable" called
 $pipe_addresses, which is not recognized by the normal expansion function. */
 
 /* We have to take special action to handle the special "variable" called
 $pipe_addresses, which is not recognized by the normal expansion function. */
 

-DEBUG(D_transport)
-  debug_printf("shell pipe command before expansion:\n  %s\n", cmd);
-

 if (expand_arguments)
   {
 if (expand_arguments)
   {

-  uschar *s = cmd;
-  uschar *p = Ustrstr(cmd, "pipe_addresses");
+  uschar * p = Ustrstr(cmd, "pipe_addresses");
+  gstring * g = NULL;
+
+  DEBUG(D_transport)
+    debug_printf("shell pipe command before expansion:\n  %s\n", cmd);
+
+  /* Allow $recipients in the expansion iff it comes from a system filter */
+
+  f.enable_dollar_recipients = addr && addr->parent &&
+    Ustrcmp(addr->parent->address, "system-filter") == 0;

 
   if (p != NULL && (
          (p > cmd && p[-1] == '$') ||
 
   if (p != NULL && (
          (p > cmd && p[-1] == '$') ||


@@ -455,36 +490,30 @@ if (expand_arguments)
     {
     address_item *ad;
     uschar *q = p + 14;
     {
     address_item *ad;
     uschar *q = p + 14;

-    int size = Ustrlen(cmd) + 64;
-    int offset;

 
     if (p[-1] == '{') { q++; p--; }
 
 
     if (p[-1] == '{') { q++; p--; }
 

-    s = store_get(size);
-    offset = p - cmd - 1;
-    Ustrncpy(s, cmd, offset);
+    g = string_get(Ustrlen(cmd) + 64);
+    g = string_catn(g, cmd, p - cmd - 1);

 
 

-    for (ad = addr; ad != NULL; ad = ad->next)
+    for (ad = addr; ad; ad = ad->next)

       {
       {

-      if (ad != addr) string_cat(s, &size, &offset, US" ", 1);
-      string_cat(s, &size, &offset, ad->address, Ustrlen(ad->address));
+      /*XXX string_append_listele() ? */
+      if (ad != addr) g = string_catn(g, US" ", 1);
+      g = string_cat(g, ad->address);

       }
 
       }
 

-    string_cat(s, &size, &offset, q, Ustrlen(q));
-    s[offset] = 0;
+    g = string_cat(g, q);
+    argv[2] = (cmd = string_from_gstring(g)) ? expand_string(cmd) : NULL;

     }
     }

+  else
+    argv[2] = expand_string(cmd);

 
 

-  /* Allow $recipients in the expansion iff it comes from a system filter */
-
-  enable_dollar_recipients = addr != NULL &&
-    addr->parent != NULL &&
-    Ustrcmp(addr->parent->address, "system-filter") == 0;
-  argv[2] = expand_string(s);
-  enable_dollar_recipients = FALSE;
+  f.enable_dollar_recipients = FALSE;

 
 

-  if (argv[2] == NULL)
+  if (!argv[2])

     {
     {

-    addr->transport_return = search_find_defer? DEFER : expand_fail;
+    addr->transport_return = f.search_find_defer ? DEFER : expand_fail;

     addr->message = string_sprintf("Expansion of command \"%s\" "
       "in %s transport failed: %s",
       cmd, tname, expand_string_message);
     addr->message = string_sprintf("Expansion of command \"%s\" "
       "in %s transport failed: %s",
       cmd, tname, expand_string_message);


@@ -494,9 +523,14 @@ if (expand_arguments)
   DEBUG(D_transport)
     debug_printf("shell pipe command after expansion:\n  %s\n", argv[2]);
   }
   DEBUG(D_transport)
     debug_printf("shell pipe command after expansion:\n  %s\n", argv[2]);
   }

-else argv[2] = cmd;
+else
+  {
+  DEBUG(D_transport)
+    debug_printf("shell pipe command (no expansion):\n  %s\n", cmd);
+  argv[2] = cmd;
+  }

 
 

-argv[3] = (uschar *)0;
+argv[3] = US 0;

 return TRUE;
 }
 
 return TRUE;
 }
 


@@ -526,11 +560,18 @@ pipe_transport_options_block *ob =
 int timeout = ob->timeout;
 BOOL written_ok = FALSE;
 BOOL expand_arguments;
 int timeout = ob->timeout;
 BOOL written_ok = FALSE;
 BOOL expand_arguments;

-uschar **argv;
+const uschar **argv;

 uschar *envp[50];
 uschar *envp[50];

-uschar *envlist = ob->environment;
+const uschar *envlist = ob->environment;

 uschar *cmd, *ss;
 uschar *cmd, *ss;

-uschar *eol = (ob->use_crlf)? US"\r\n" : US"\n";
+uschar *eol = ob->use_crlf ? US"\r\n" : US"\n";
+transport_ctx tctx = {
+  .tblock = tblock,
+  .addr = addr,
+  .check_string = ob->check_string,
+  .escape_string = ob->escape_string,
+  ob->options | topt_not_socket /* set at initialization time */
+};

 
 DEBUG(D_transport) debug_printf("%s transport entered\n", tblock->name);
 
 
 DEBUG(D_transport) debug_printf("%s transport entered\n", tblock->name);
 


@@ -547,10 +588,21 @@ options. */
 
 if (testflag(addr, af_pfr) && addr->local_part[0] == '|')
   {
 
 if (testflag(addr, af_pfr) && addr->local_part[0] == '|')
   {

-  cmd = addr->local_part + 1;
-  while (isspace(*cmd)) cmd++;
-  expand_arguments = testflag(addr, af_expand_pipe);
-  expand_fail = FAIL;
+  if (ob->force_command)
+    {
+    /* Enables expansion of $address_pipe into separate arguments */
+    setflag(addr, af_force_command);
+    cmd = ob->cmd;
+    expand_arguments = TRUE;
+    expand_fail = PANIC;
+    }
+  else
+    {
+    cmd = addr->local_part + 1;
+    while (isspace(*cmd)) cmd++;
+    expand_arguments = testflag(addr, af_expand_pipe);
+    expand_fail = FAIL;
+    }

   }
 else
   {
   }
 else
   {


@@ -559,9 +611,12 @@ else
   expand_fail = PANIC;
   }
 
   expand_fail = PANIC;
   }
 

-/* If no command has been supplied, we are in trouble. */
+/* If no command has been supplied, we are in trouble.
+ * We also check for an empty string since it may be
+ * coming from addr->local_part[0] == '|'
+ */

 
 

-if (cmd == NULL)
+if (cmd == NULL || *cmd == '\0')

   {
   addr->transport_return = DEFER;
   addr->message = string_sprintf("no command specified for %s transport",
   {
   addr->transport_return = DEFER;
   addr->message = string_sprintf("no command specified for %s transport",


@@ -573,7 +628,7 @@ if (cmd == NULL)
 and numerical the variables in existence. These are passed in
 addr->pipe_expandn for use here. */
 
 and numerical the variables in existence. These are passed in
 addr->pipe_expandn for use here. */
 

-if (expand_arguments && addr->pipe_expandn != NULL)
+if (expand_arguments && addr->pipe_expandn)

   {
   uschar **ss = addr->pipe_expandn;
   expand_nmax = -1;
   {
   uschar **ss = addr->pipe_expandn;
   expand_nmax = -1;


@@ -613,7 +668,7 @@ envp[envcount++] = string_sprintf("LOCAL_PART_SUFFIX=%#s",
 envp[envcount++] = string_sprintf("DOMAIN=%s", deliver_domain);
 envp[envcount++] = string_sprintf("HOME=%#s", deliver_home);
 envp[envcount++] = string_sprintf("MESSAGE_ID=%s", message_id);
 envp[envcount++] = string_sprintf("DOMAIN=%s", deliver_domain);
 envp[envcount++] = string_sprintf("HOME=%#s", deliver_home);
 envp[envcount++] = string_sprintf("MESSAGE_ID=%s", message_id);

-envp[envcount++] = string_sprintf("PATH=%s", ob->path);
+envp[envcount++] = string_sprintf("PATH=%s", expand_string(ob->path));

 envp[envcount++] = string_sprintf("RECIPIENT=%#s%#s%#s@%#s",
   deliver_localpart_prefix, deliver_localpart, deliver_localpart_suffix,
   deliver_domain);
 envp[envcount++] = string_sprintf("RECIPIENT=%#s%#s%#s@%#s",
   deliver_localpart_prefix, deliver_localpart, deliver_localpart_suffix,
   deliver_domain);


@@ -624,15 +679,15 @@ envp[envcount++] = US"SHELL=/bin/sh";
 if (addr->host_list != NULL)
   envp[envcount++] = string_sprintf("HOST=%s", addr->host_list->name);
 
 if (addr->host_list != NULL)
   envp[envcount++] = string_sprintf("HOST=%s", addr->host_list->name);
 

-if (timestamps_utc) envp[envcount++] = US"TZ=UTC";
+if (f.timestamps_utc) envp[envcount++] = US"TZ=UTC";

 else if (timezone_string != NULL && timezone_string[0] != 0)
   envp[envcount++] = string_sprintf("TZ=%s", timezone_string);
 
 /* Add any requested items */
 
 else if (timezone_string != NULL && timezone_string[0] != 0)
   envp[envcount++] = string_sprintf("TZ=%s", timezone_string);
 
 /* Add any requested items */
 

-if (envlist != NULL)
+if (envlist)

   {
   {

-  envlist = expand_string(envlist);
+  envlist = expand_cstring(envlist);

   if (envlist == NULL)
     {
     addr->transport_return = DEFER;
   if (envlist == NULL)
     {
     addr->transport_return = DEFER;


@@ -643,10 +698,9 @@ if (envlist != NULL)
     }
   }
 
     }
   }
 

-while ((ss = string_nextinlist(&envlist, &envsep, big_buffer, big_buffer_size))
-       != NULL)
+while ((ss = string_nextinlist(&envlist, &envsep, big_buffer, big_buffer_size)))

    {
    {

-   if (envcount > sizeof(envp)/sizeof(uschar *) - 2)
+   if (envcount > nelem(envp) - 2)

      {
      addr->transport_return = DEFER;
      addr->message = string_sprintf("too many environment settings for "
      {
      addr->transport_return = DEFER;
      addr->message = string_sprintf("too many environment settings for "


@@ -660,7 +714,7 @@ envp[envcount] = NULL;
 
 /* If the -N option is set, can't do any more. */
 
 
 /* If the -N option is set, can't do any more. */
 

-if (dont_deliver)
+if (f.dont_deliver)

   {
   DEBUG(D_transport)
     debug_printf("*** delivery by %s transport bypassed by -N option",
   {
   DEBUG(D_transport)
     debug_printf("*** delivery by %s transport bypassed by -N option",


@@ -690,7 +744,7 @@ reading of the output pipe. */
 uid/gid and current directory. Request that the new process be a process group
 leader, so we can kill it and all its children on a timeout. */
 
 uid/gid and current directory. Request that the new process be a process group
 leader, so we can kill it and all its children on a timeout. */
 

-if ((pid = child_open(argv, envp, ob->umask, &fd_in, &fd_out, TRUE)) < 0)
+if ((pid = child_open(USS argv, envp, ob->umask, &fd_in, &fd_out, TRUE)) < 0)

   {
   addr->transport_return = DEFER;
   addr->message = string_sprintf(
   {
   addr->transport_return = DEFER;
   addr->message = string_sprintf(


@@ -698,6 +752,7 @@ if ((pid = child_open(argv, envp, ob->umask, &fd_in, &fd_out, TRUE)) < 0)
       strerror(errno));
   return FALSE;
   }
       strerror(errno));
   return FALSE;
   }

+tctx.u.fd = fd_in;

 
 /* Now fork a process to handle the output that comes down the pipe. */
 
 
 /* Now fork a process to handle the output that comes down the pipe. */
 


@@ -727,14 +782,19 @@ if (outpid == 0)
   while ((rc = read(fd_out, big_buffer, big_buffer_size)) > 0)
     {
     if (addr->return_file >= 0)
   while ((rc = read(fd_out, big_buffer, big_buffer_size)) > 0)
     {
     if (addr->return_file >= 0)

-      write(addr->return_file, big_buffer, rc);
+      if(write(addr->return_file, big_buffer, rc) != rc)
+        DEBUG(D_transport) debug_printf("Problem writing to return_file\n");

     count += rc;
     if (count > ob->max_output)
       {
     count += rc;
     if (count > ob->max_output)
       {

-      uschar *message = US"\n\n*** Too much output - remainder discarded ***\n";

       DEBUG(D_transport) debug_printf("Too much output from pipe - killed\n");
       if (addr->return_file >= 0)
       DEBUG(D_transport) debug_printf("Too much output from pipe - killed\n");
       if (addr->return_file >= 0)

-        write(addr->return_file, message, Ustrlen(message));
+       {
+        uschar *message = US"\n\n*** Too much output - remainder discarded ***\n";
+        rc = Ustrlen(message);
+        if(write(addr->return_file, message, rc) != rc)
+          DEBUG(D_transport) debug_printf("Problem writing to return_file\n");
+       }

       killpg(pid, SIGKILL);
       break;
       }
       killpg(pid, SIGKILL);
       break;
       }


@@ -754,7 +814,7 @@ bit here to let the sub-process get going, but it may still not complete. So we
 ignore all writing errors. (When in the test harness, we do do a short sleep so
 any debugging output is likely to be in the same order.) */
 
 ignore all writing errors. (When in the test harness, we do do a short sleep so
 any debugging output is likely to be in the same order.) */
 

-if (running_in_test_harness) millisleep(500);
+if (f.running_in_test_harness) millisleep(500);

 
 DEBUG(D_transport) debug_printf("Writing message to pipe\n");
 
 
 DEBUG(D_transport) debug_printf("Writing message to pipe\n");
 


@@ -777,13 +837,13 @@ if (ob->message_prefix != NULL)
   uschar *prefix = expand_string(ob->message_prefix);
   if (prefix == NULL)
     {
   uschar *prefix = expand_string(ob->message_prefix);
   if (prefix == NULL)
     {

-    addr->transport_return = search_find_defer? DEFER : PANIC;
+    addr->transport_return = f.search_find_defer? DEFER : PANIC;

     addr->message = string_sprintf("Expansion of \"%s\" (prefix for %s "
       "transport) failed: %s", ob->message_prefix, tblock->name,
       expand_string_message);
     return FALSE;
     }
     addr->message = string_sprintf("Expansion of \"%s\" (prefix for %s "
       "transport) failed: %s", ob->message_prefix, tblock->name,
       expand_string_message);
     return FALSE;
     }

-  if (!transport_write_block(fd_in, prefix, Ustrlen(prefix)))
+  if (!transport_write_block(&tctx, prefix, Ustrlen(prefix), FALSE))

     goto END_WRITE;
   }
 
     goto END_WRITE;
   }
 


@@ -799,39 +859,35 @@ if (ob->use_bsmtp)
   if (!transport_write_string(fd_in, "MAIL FROM:<%s>%s", return_path, eol))
     goto END_WRITE;
 
   if (!transport_write_string(fd_in, "MAIL FROM:<%s>%s", return_path, eol))
     goto END_WRITE;
 

-  for (a = addr; a != NULL; a = a->next)
-    {
+  for (a = addr; a; a = a->next)

     if (!transport_write_string(fd_in,
         "RCPT TO:<%s>%s",
         transport_rcpt_address(a, tblock->rcpt_include_affixes),
         eol))
       goto END_WRITE;
     if (!transport_write_string(fd_in,
         "RCPT TO:<%s>%s",
         transport_rcpt_address(a, tblock->rcpt_include_affixes),
         eol))
       goto END_WRITE;

-    }

 
   if (!transport_write_string(fd_in, "DATA%s", eol)) goto END_WRITE;
   }
 
 
   if (!transport_write_string(fd_in, "DATA%s", eol)) goto END_WRITE;
   }
 

-/* Now the actual message - the options were set at initialization time */
+/* Now the actual message */

 
 

-if (!transport_write_message(addr, fd_in, ob->options, 0, tblock->add_headers,
-  tblock->remove_headers, ob->check_string, ob->escape_string,
-  tblock->rewrite_rules, tblock->rewrite_existflags))
+if (!transport_write_message(&tctx, 0))

     goto END_WRITE;
 
 /* Now any configured suffix */
 
     goto END_WRITE;
 
 /* Now any configured suffix */
 

-if (ob->message_suffix != NULL)
+if (ob->message_suffix)

   {
   uschar *suffix = expand_string(ob->message_suffix);
   {
   uschar *suffix = expand_string(ob->message_suffix);

-  if (suffix == NULL)
+  if (!suffix)

     {
     {

-    addr->transport_return = search_find_defer? DEFER : PANIC;
+    addr->transport_return = f.search_find_defer? DEFER : PANIC;

     addr->message = string_sprintf("Expansion of \"%s\" (suffix for %s "
       "transport) failed: %s", ob->message_suffix, tblock->name,
       expand_string_message);
     return FALSE;
     }
     addr->message = string_sprintf("Expansion of \"%s\" (suffix for %s "
       "transport) failed: %s", ob->message_suffix, tblock->name,
       expand_string_message);
     return FALSE;
     }

-  if (!transport_write_block(fd_in, suffix, Ustrlen(suffix)))
+  if (!transport_write_block(&tctx, suffix, Ustrlen(suffix), FALSE))

     goto END_WRITE;
   }
 
     goto END_WRITE;
   }
 


@@ -864,7 +920,7 @@ if (!written_ok)
   if (errno == ETIMEDOUT)
     {
     addr->message = string_sprintf("%stimeout while writing to pipe",
   if (errno == ETIMEDOUT)
     {
     addr->message = string_sprintf("%stimeout while writing to pipe",

-      transport_filter_timed_out? "transport filter " : "");
+      f.transport_filter_timed_out ? "transport filter " : "");

     addr->transport_return = ob->timeout_defer? DEFER : FAIL;
     timeout = 1;
     }
     addr->transport_return = ob->timeout_defer? DEFER : FAIL;
     timeout = 1;
     }


@@ -930,7 +986,7 @@ if ((rc = child_close(pid, timeout)) != 0)
   This prevents the transport_filter timeout message from getting overwritten
   by the exit error which is not the cause of the problem. */
 
   This prevents the transport_filter timeout message from getting overwritten
   by the exit error which is not the cause of the problem. */
 

-  else if (transport_filter_timed_out)
+  else if (f.transport_filter_timed_out)

     {
     killpg(pid, SIGKILL);
     kill(outpid, SIGKILL);
     {
     killpg(pid, SIGKILL);
     kill(outpid, SIGKILL);


@@ -939,11 +995,20 @@ if ((rc = child_close(pid, timeout)) != 0)
   /* Either the process completed, but yielded a non-zero (necessarily
   positive) status, or the process was terminated by a signal (rc will contain
   the negation of the signal number). Treat killing by signal as failure unless
   /* Either the process completed, but yielded a non-zero (necessarily
   positive) status, or the process was terminated by a signal (rc will contain
   the negation of the signal number). Treat killing by signal as failure unless

-  status is being ignored. */
+  status is being ignored. By default, the message is bounced back, unless
+  freeze_signal is set, in which case it is frozen instead. */

 
   else if (rc < 0)
     {
 
   else if (rc < 0)
     {

-    if (!ob->ignore_status)
+    if (ob->freeze_signal)
+      {
+      addr->transport_return = DEFER;
+      addr->special_action = SPECIAL_FREEZE;
+      addr->message = string_sprintf("Child process of %s transport (running "
+        "command \"%s\") was terminated by signal %d (%s)%s", tblock->name, cmd,
+        -rc, os_strsignal(-rc), tmsg);
+      }
+    else if (!ob->ignore_status)

       {
       addr->transport_return = FAIL;
       addr->message = string_sprintf("Child process of %s transport (running "
       {
       addr->transport_return = FAIL;
       addr->message = string_sprintf("Child process of %s transport (running "


@@ -973,7 +1038,7 @@ if ((rc = child_close(pid, timeout)) != 0)
   the command that was given is a non-existent path). By default this is
   treated as just another failure, but if freeze_exec_fail is set, the reaction
   is to freeze the message rather than bounce the address. Exim used to signal
   the command that was given is a non-existent path). By default this is
   treated as just another failure, but if freeze_exec_fail is set, the reaction
   is to freeze the message rather than bounce the address. Exim used to signal

-  this failure with EX_UNAVAILABLE, which is definined in many systems as
+  this failure with EX_UNAVAILABLE, which is defined in many systems as

 
       #define EX_UNAVAILABLE  69
 
 
       #define EX_UNAVAILABLE  69
 


@@ -1009,9 +1074,10 @@ if ((rc = child_close(pid, timeout)) != 0)
     else if (!ob->ignore_status)
       {
       uschar *ss;
     else if (!ob->ignore_status)
       {
       uschar *ss;

-      int size, ptr, i;
+      gstring * g;
+      int i;

 
 

-      /* If temp_errors is "*" all codes are temporary. Initializion checks
+      /* If temp_errors is "*" all codes are temporary. Initialization checks

       that it's either "*" or a list of numbers. If not "*", scan the list of
       temporary failure codes; if any match, the result is DEFER. */
 
       that it's either "*" or a list of numbers. If not "*", scan the list of
       temporary failure codes; if any match, the result is DEFER. */
 


@@ -1020,16 +1086,13 @@ if ((rc = child_close(pid, timeout)) != 0)
 
       else
         {
 
       else
         {

-        uschar *s = ob->temp_errors;
+        const uschar *s = ob->temp_errors;

         uschar *p;
         uschar *p;

-        uschar buffer[64];

         int sep = 0;
 
         addr->transport_return = FAIL;
         int sep = 0;
 
         addr->transport_return = FAIL;

-        while ((p = string_nextinlist(&s,&sep,buffer,sizeof(buffer))) != NULL)
-          {
+        while ((p = string_nextinlist(&s,&sep,NULL,0)))

           if (rc == Uatoi(p)) { addr->transport_return = DEFER; break; }
           if (rc == Uatoi(p)) { addr->transport_return = DEFER; break; }

-          }

         }
 
       /* Ensure the message contains the expanded command and arguments. This
         }
 
       /* Ensure the message contains the expanded command and arguments. This


@@ -1037,9 +1100,7 @@ if ((rc = child_close(pid, timeout)) != 0)
 
       addr->message = string_sprintf("Child process of %s transport returned "
         "%d", tblock->name, rc);
 
       addr->message = string_sprintf("Child process of %s transport returned "
         "%d", tblock->name, rc);

-
-      ptr = Ustrlen(addr->message);
-      size = ptr + 1;
+      g = string_cat(NULL, addr->message);

 
       /* If the return code is > 128, it often means that a shell command
       was terminated by a signal. */
 
       /* If the return code is > 128, it often means that a shell command
       was terminated by a signal. */


@@ -1051,38 +1112,34 @@ if ((rc = child_close(pid, timeout)) != 0)
 
       if (*ss != 0)
         {
 
       if (*ss != 0)
         {

-        addr->message = string_cat(addr->message, &size, &ptr, US" ", 1);
-        addr->message = string_cat(addr->message, &size, &ptr,
-          ss, Ustrlen(ss));
+        g = string_catn(g, US" ", 1);
+        g = string_cat (g, ss);

         }
 
       /* Now add the command and arguments */
 
         }
 
       /* Now add the command and arguments */
 

-      addr->message = string_cat(addr->message, &size, &ptr,
-        US" from command:", 14);
+      g = string_catn(g, US" from command:", 14);

 
       for (i = 0; i < sizeof(argv)/sizeof(int *) && argv[i] != NULL; i++)
         {
         BOOL quote = FALSE;
 
       for (i = 0; i < sizeof(argv)/sizeof(int *) && argv[i] != NULL; i++)
         {
         BOOL quote = FALSE;

-        addr->message = string_cat(addr->message, &size, &ptr, US" ", 1);
+        g = string_catn(g, US" ", 1);

         if (Ustrpbrk(argv[i], " \t") != NULL)
           {
           quote = TRUE;
         if (Ustrpbrk(argv[i], " \t") != NULL)
           {
           quote = TRUE;

-          addr->message = string_cat(addr->message, &size, &ptr, US"\"", 1);
+          g = string_catn(g, US"\"", 1);

           }
           }

-        addr->message = string_cat(addr->message, &size, &ptr, argv[i],
-          Ustrlen(argv[i]));
+        g = string_cat(g, argv[i]);

         if (quote)
         if (quote)

-          addr->message = string_cat(addr->message, &size, &ptr, US"\"", 1);
+          g = string_catn(g, US"\"", 1);

         }
 
       /* Add previous filter timeout message, if present. */
 
         }
 
       /* Add previous filter timeout message, if present. */
 

-      if (*tmsg != 0)
-        addr->message = string_cat(addr->message, &size, &ptr, tmsg,
-          Ustrlen(tmsg));
+      if (*tmsg)
+        g = string_cat(g, tmsg);

 
 

-      addr->message[ptr] = 0;  /* Ensure concatenated string terminated */
+      addr->message = string_from_gstring(g);

       }
     }
   }
       }
     }
   }


@@ -1105,4 +1162,5 @@ if (addr->transport_return != OK)
 return FALSE;
 }
 
 return FALSE;
 }
 

+#endif /*!MACRO_PREDEF*/

 /* End of transport/pipe.c */
 /* End of transport/pipe.c */