Make batch delivery work for files and pipes set up by redirection.

[exim.git] / src / src / structs.h

diff --git a/src/src/structs.h b/src/src/structs.h
index 3ffe0cecf1714b2b5c6200eaa80e28f9f283e166..c0fa960d3fccfda9f2b38fa96b0b3b5be5aa7ea2 100644 (file)
--- a/src/src/structs.h
+++ b/src/src/structs.h
@@ -1,10 +1,10 @@
-/* $Cambridge: exim/src/src/structs.h,v 1.2 2004/12/16 15:11:47 tom Exp $ */
+/* $Cambridge: exim/src/src/structs.h,v 1.10 2006/02/21 16:24:19 ph10 Exp $ */

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

-/* Copyright (c) University of Cambridge 1995 - 2004 */
+/* Copyright (c) University of Cambridge 1995 - 2006 */

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


@@ -138,6 +138,8 @@ typedef struct transport_instance {
     struct transport_instance *,
     struct address_item *,
     struct transport_feedback *,  /* For passing back config data */
     struct transport_instance *,
     struct address_item *,
     struct transport_feedback *,  /* For passing back config data */

+    uid_t,                        /* The uid that will be used */
+    gid_t,                        /* The gid that will be used */

     uschar **);                   /* For an error message */
                                   /**************************************/
   int     batch_max;              /* )                                  */
     uschar **);                   /* For an error message */
                                   /**************************************/
   int     batch_max;              /* )                                  */


@@ -223,7 +225,7 @@ typedef struct router_instance {
   uschar *address_data;           /* Arbitrary data */
 #ifdef EXPERIMENTAL_BRIGHTMAIL
   uschar *bmi_rule;               /* Brightmail AntiSpam rule checking */
   uschar *address_data;           /* Arbitrary data */
 #ifdef EXPERIMENTAL_BRIGHTMAIL
   uschar *bmi_rule;               /* Brightmail AntiSpam rule checking */

-#endif  
+#endif

   uschar *cannot_route_message;   /* Used when routing fails */
   uschar *condition;              /* General condition */
   uschar *current_directory;      /* For use during delivery */
   uschar *cannot_route_message;   /* Used when routing fails */
   uschar *condition;              /* General condition */
   uschar *current_directory;      /* For use during delivery */


@@ -307,7 +309,7 @@ typedef struct router_info {
     router_instance *,
     struct address_item *,
     struct passwd *,
     router_instance *,
     struct address_item *,
     struct passwd *,

-    BOOL,
+    int,

     struct address_item **,
     struct address_item **,
     struct address_item **,
     struct address_item **,
     struct address_item **,
     struct address_item **,


@@ -469,6 +471,10 @@ typedef struct address_item_propagated {
   uschar *errors_address;         /* where to send errors (NULL => sender) */
   header_line *extra_headers;     /* additional headers */
   uschar *remove_headers;         /* list of those to remove */
   uschar *errors_address;         /* where to send errors (NULL => sender) */
   header_line *extra_headers;     /* additional headers */
   uschar *remove_headers;         /* list of those to remove */

+
+  #ifdef EXPERIMENTAL_SRS
+  uschar *srs_sender;             /* Change return path when delivering */
+  #endif

 } address_item_propagated;
 
 /* Bits for the flags field below */
 } address_item_propagated;
 
 /* Bits for the flags field below */


@@ -498,6 +504,8 @@ typedef struct address_item_propagated {
 #define af_verify_callout      0x00400000 /* for cached sender verify: callout was specified */
 #define af_include_affixes     0x00800000 /* delivered with affixes in RCPT */
 #define af_cert_verified       0x01000000 /* delivered with verified TLS cert */
 #define af_verify_callout      0x00400000 /* for cached sender verify: callout was specified */
 #define af_include_affixes     0x00800000 /* delivered with affixes in RCPT */
 #define af_cert_verified       0x01000000 /* delivered with verified TLS cert */

+#define af_pass_message        0x02000000 /* pass message in bounces */
+#define af_bad_reply           0x04000000 /* filter could not generate autoreply */

 
 /* These flags must be propagated when a child is created */
 
 
 /* These flags must be propagated when a child is created */