Process Auto-submitted: in the triggering message and add it to

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

diff --git a/src/src/rda.c b/src/src/rda.c
index 1c45f7bb3bb0bcffe81ea5c295c24ac0deba7d78..13701dca47b6f141c28330598ff46441725d804c 100644 (file)
--- a/src/src/rda.c
+++ b/src/src/rda.c
@@ -1,10 +1,10 @@
-/* $Cambridge: exim/src/src/rda.c,v 1.10 2005/08/08 13:21:46 ph10 Exp $ */
+/* $Cambridge: exim/src/src/rda.c,v 1.14 2007/01/08 10:50:18 ph10 Exp $ */

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

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

 /* See the file NOTICE for conditions of use and distribution. */
 
 /* This module contains code for extracting addresses from a forwarding list
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* This module contains code for extracting addresses from a forwarding list


@@ -352,7 +352,7 @@ uschar *data;
 
 if (rdata->isfile)
   {
 
 if (rdata->isfile)
   {

-  int yield;
+  int yield = 0;

   data = rda_get_file_contents(rdata, options, error, &yield);
   if (data == NULL) return yield;
   }
   data = rda_get_file_contents(rdata, options, error, &yield);
   if (data == NULL) return yield;
   }


@@ -770,14 +770,6 @@ if (read(fd, filtertype, sizeof(int)) != sizeof(int) ||
     read(fd, &yield, sizeof(int)) != sizeof(int) ||
     !rda_read_string(fd, error)) goto DISASTER;
 
     read(fd, &yield, sizeof(int)) != sizeof(int) ||
     !rda_read_string(fd, error)) goto DISASTER;
 

-/* In the test harness, give the subprocess time to finish off and write
-any debugging output. */
-
-if (running_in_test_harness) millisleep(250);
-
-DEBUG(D_route)
-  debug_printf("rda_interpret: subprocess yield=%d error=%s\n", yield, *error);
-

 /* Read the contents of any syntax error blocks if we have a pointer */
 
 if (eblockp != NULL)
 /* Read the contents of any syntax error blocks if we have a pointer */
 
 if (eblockp != NULL)


@@ -934,6 +926,9 @@ while ((rc = wait(&status)) != pid)
     }
   }
 
     }
   }
 

+DEBUG(D_route)
+  debug_printf("rda_interpret: subprocess yield=%d error=%s\n", yield, *error);
+

 if (had_disaster)
   {
   *error = string_sprintf("internal problem in %s: failure to transfer "
 if (had_disaster)
   {
   *error = string_sprintf("internal problem in %s: failure to transfer "