Merge branch 'master' into 4.next

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

diff --git a/src/src/transports/pipe.c b/src/src/transports/pipe.c
index e3d01974a8d7c30fa9ff44c045874dc26324abd2..be02560611b7a5bdef4c3fbfc55e6dcf3da048d1 100644 (file)
--- a/src/src/transports/pipe.c
+++ b/src/src/transports/pipe.c
@@ -95,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 = {


@@ -332,16 +343,14 @@ set_up_direct_command(const uschar ***argvptr, uschar *cmd,
 {
 BOOL permitted = FALSE;
 const uschar **argv;
 {
 BOOL permitted = FALSE;
 const uschar **argv;

-uschar buffer[64];

 
 /* 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. */


@@ -350,12 +359,11 @@ 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;
   const uschar *s;
   uschar *p;
   {
   int sep = 0;
   const uschar *s;
   uschar *p;

-  uschar buffer[256];

 
   if (!(s = expand_string(ob->allow_commands)))
     {
 
   if (!(s = expand_string(ob->allow_commands)))
     {


@@ -365,7 +373,7 @@ if (ob->allow_commands != NULL)
     return FALSE;
     }
 
     return FALSE;
     }
 

-  while ((p = string_nextinlist(&s, &sep, buffer, sizeof(buffer))))
+  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; }
   }
 


@@ -389,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 "


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

-  const 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]);


@@ -418,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",


@@ -520,7 +527,7 @@ if (expand_arguments)
   }
 else argv[2] = cmd;
 
   }
 else argv[2] = cmd;
 

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

 return TRUE;
 }
 
 return TRUE;
 }
 


@@ -554,8 +561,9 @@ const uschar **argv;
 uschar *envp[50];
 const uschar *envlist = ob->environment;
 uschar *cmd, *ss;
 uschar *envp[50];
 const uschar *envlist = ob->environment;
 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 = {
 transport_ctx tctx = {

+  {0},

   tblock,
   addr,
   ob->check_string,
   tblock,
   addr,
   ob->check_string,


@@ -580,7 +588,7 @@ if (testflag(addr, af_pfr) && addr->local_part[0] == '|')
   {
   if (ob->force_command)
     {
   {
   if (ob->force_command)
     {

-    /* Enables expansion of $address_pipe into seperate arguments */
+    /* Enables expansion of $address_pipe into separate arguments */

     setflag(addr, af_force_command);
     cmd = ob->cmd;
     expand_arguments = TRUE;
     setflag(addr, af_force_command);
     cmd = ob->cmd;
     expand_arguments = TRUE;


@@ -618,7 +626,7 @@ if (cmd == NULL || *cmd == '\0')
 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;


@@ -658,7 +666,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);


@@ -688,10 +696,9 @@ if (envlist)
     }
   }
 
     }
   }
 

-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 "


@@ -743,6 +750,7 @@ if ((pid = child_open(USS 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. */
 


@@ -833,7 +841,7 @@ if (ob->message_prefix != NULL)
       expand_string_message);
     return FALSE;
     }
       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;
   }
 


@@ -861,15 +869,15 @@ if (ob->use_bsmtp)
 
 /* Now the actual message */
 
 
 /* Now the actual message */
 

-if (!transport_write_message(fd_in, &tctx, 0))
+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->message = string_sprintf("Expansion of \"%s\" (suffix for %s "
     {
     addr->transport_return = search_find_defer? DEFER : PANIC;
     addr->message = string_sprintf("Expansion of \"%s\" (suffix for %s "


@@ -877,7 +885,7 @@ if (ob->message_suffix != NULL)
       expand_string_message);
     return FALSE;
     }
       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;
   }
 


@@ -1028,7 +1036,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
 


@@ -1066,7 +1074,7 @@ if ((rc = child_close(pid, timeout)) != 0)
       uschar *ss;
       int size, ptr, i;
 
       uschar *ss;
       int size, ptr, 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. */
 


@@ -1077,11 +1085,10 @@ if ((rc = child_close(pid, timeout)) != 0)
         {
         const uschar *s = ob->temp_errors;
         uschar *p;
         {
         const uschar *s = ob->temp_errors;
         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))))
+        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; }
         }
 


@@ -1155,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 */