Transport: fix smtp under combo of mua_wrapper and limited max_rcpt

[user/henk/code/exim.git] / src / src / structs.h

diff --git a/src/src/structs.h b/src/src/structs.h
index 12d714f28f2147f5af73f2b6bdd2a43b2a79bf61..60e7ccd9d79a892548057ca3312c099bb9afe970 100644 (file)
--- a/src/src/structs.h
+++ b/src/src/structs.h
@@ -230,8 +230,7 @@ typedef struct transport_info {
 #define tc_chunk_last  BIT(1)  /* annotate chunk SMTP cmd as LAST */
 
 struct transport_context;
-typedef int (*tpt_chunk_cmd_cb)(int fd, struct transport_context * tctx,
-                               unsigned len, unsigned flags);
+typedef int (*tpt_chunk_cmd_cb)(struct transport_context *, unsigned, unsigned);
 
 /* Structure for information about a delivery-in-progress */
 
@@ -244,17 +243,7 @@ typedef struct transport_context {
 
   /* items below only used with option topt_use_bdat */
   tpt_chunk_cmd_cb       chunk_cb;             /* per-datachunk callback */
-  struct smtp_inblock  * inblock;
-  struct smtp_outblock * outblock;
-  host_item            * host;
-  struct address_item  * first_addr;
-  struct address_item  **sync_addr;
-  BOOL                   pending_MAIL;
-  BOOL                   pending_BDAT;
-  BOOL                   good_RCPT;
-  BOOL                 * completed_address;
-  int                    cmd_count;
-  uschar               * buffer;
+  void                 * smtp_context;
 } transport_ctx;
 
 
@@ -635,7 +624,7 @@ typedef struct address_item {
                                   /* (may need to hold a timestamp) */
 
   short int basic_errno;          /* status after failure */
-  short int child_count;          /* number of child addresses */
+  unsigned short child_count;     /* number of child addresses */
   short int return_file;          /* fileno of return data file */
   short int special_action;       /* ( used when when deferred or failed */
                                   /* (  also  */