1. Preserve underlying transport filter timeout message if a pipe

command ends in failure.

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 18113c2f1483543deb7694240325d25497b2594b..e26eac4bb9b5954ed8e2d98c3c6343d98e8d265f 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.134 2005/05/10 10:19:11 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.135 2005/05/10 11:13:09 ph10 Exp $

 
 Change log file for Exim from version 4.21
 -------------------------------------------
 
 Change log file for Exim from version 4.21
 -------------------------------------------


@@ -9,6 +9,11 @@ Exim version 4.52
 
 TF/01 Added support for Client SMTP Authorization. See NewStuff for details.
 
 
 TF/01 Added support for Client SMTP Authorization. See NewStuff for details.
 

+PH/01 When a transport filter timed out in a pipe delivery, and the pipe
+      command itself ended in error, the underlying message about the transport
+      filter timeout was being overwritten with the pipe command error. Now the
+      underlying error message should be appended to the second error message.
+

 
 Exim version 4.51
 -----------------
 
 Exim version 4.51
 -----------------

diff --git a/src/src/transports/pipe.c b/src/src/transports/pipe.c
index 43d0e58959aa286c16eadc91c2bdf2cb0b8ba5be..6fbadfb46aa7c646c2329490b4b9e742a177391b 100644 (file)
--- a/src/src/transports/pipe.c
+++ b/src/src/transports/pipe.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/transports/pipe.c,v 1.5 2005/05/03 14:20:01 ph10 Exp $ */
+/* $Cambridge: exim/src/src/transports/pipe.c,v 1.6 2005/05/10 11:13:09 ph10 Exp $ */

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


@@ -830,6 +830,9 @@ above timed out. */
 
 if ((rc = child_close(pid, timeout)) != 0)
   {
 
 if ((rc = child_close(pid, timeout)) != 0)
   {

+  uschar *tmsg = (addr->message == NULL)? US"" :
+    string_sprintf(" (preceded by %s)", addr->message);
+

   /* The process did not complete in time; kill its process group and fail
   the delivery. It appears to be necessary to kill the output process too, as
   otherwise it hangs on for some time if the actual pipe process is sleeping.
   /* The process did not complete in time; kill its process group and fail
   the delivery. It appears to be necessary to kill the output process too, as
   otherwise it hangs on for some time if the actual pipe process is sleeping.


@@ -841,7 +844,7 @@ if ((rc = child_close(pid, timeout)) != 0)
     killpg(pid, SIGKILL);
     kill(outpid, SIGKILL);
     addr->transport_return = ob->timeout_defer? DEFER : FAIL;
     killpg(pid, SIGKILL);
     kill(outpid, SIGKILL);
     addr->transport_return = ob->timeout_defer? DEFER : FAIL;

-    addr->message = string_sprintf("pipe delivery process timed out");
+    addr->message = string_sprintf("pipe delivery process timed out%s", tmsg);

     }
 
   /* Wait() failed. */
     }
 
   /* Wait() failed. */


@@ -850,7 +853,7 @@ if ((rc = child_close(pid, timeout)) != 0)
     {
     addr->transport_return = PANIC;
     addr->message = string_sprintf("Wait() failed for child process of %s "
     {
     addr->transport_return = PANIC;
     addr->message = string_sprintf("Wait() failed for child process of %s "

-      "transport: %s", tblock->name, strerror(errno));
+      "transport: %s%s", tblock->name, strerror(errno), tmsg);

     }
 
   /* Either the process completed, but yielded a non-zero (necessarily
     }
 
   /* Either the process completed, but yielded a non-zero (necessarily


@@ -864,8 +867,8 @@ if ((rc = child_close(pid, timeout)) != 0)
       {
       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 "

-        "command \"%s\") was terminated by signal %d (%s)", tblock->name, cmd,
-        -rc, os_strsignal(-rc));
+        "command \"%s\") was terminated by signal %d (%s)%s", tblock->name, cmd,
+        -rc, os_strsignal(-rc), tmsg);

       }
     }
 
       }
     }
 


@@ -917,8 +920,8 @@ if ((rc = child_close(pid, timeout)) != 0)
       {
       addr->transport_return = DEFER;
       addr->special_action = SPECIAL_FREEZE;
       {
       addr->transport_return = DEFER;
       addr->special_action = SPECIAL_FREEZE;

-      addr->message = string_sprintf("pipe process failed to exec \"%s\"",
-        cmd);
+      addr->message = string_sprintf("pipe process failed to exec \"%s\"%s",
+        cmd, tmsg);

       }
 
     /* Otherwise take action only if not ignoring status */
       }
 
     /* Otherwise take action only if not ignoring status */


@@ -992,6 +995,13 @@ if ((rc = child_close(pid, timeout)) != 0)
         if (quote)
           addr->message = string_cat(addr->message, &size, &ptr, US"\"", 1);
         }
         if (quote)
           addr->message = string_cat(addr->message, &size, &ptr, US"\"", 1);
         }

+
+      /* Add previous filter timeout message, if present. */
+
+      if (*tmsg != 0)
+        addr->message = string_cat(addr->message, &size, &ptr, tmsg,
+          Ustrlen(tmsg));
+

       addr->message[ptr] = 0;  /* Ensure concatenated string terminated */
       }
     }
       addr->message[ptr] = 0;  /* Ensure concatenated string terminated */
       }
     }