X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsrc%2Fstructs.h;h=d9d37f1c028c41871d43293d130b38658df82865;hb=856d1e16b3386ce51b73986b9d7aaf1fbf95aba9;hp=ffbc899a5dacc46559e70a60573a18d3491d0f3f;hpb=44bc8f0c2f3576b46bd6df1b818cb29eaf84df5b;p=exim.git

diff --git a/src/src/structs.h b/src/src/structs.h
index ffbc899a5..d9d37f1c0 100644
--- a/src/src/structs.h
+++ b/src/src/structs.h
@@ -28,10 +28,11 @@ struct router_info;
 /* Structure for remembering macros for the configuration file */
 
 typedef struct macro_item {
-  struct  macro_item *next;
-  BOOL    command_line;
-  uschar *replacement;
-  uschar  name[1];
+  struct   macro_item *next;
+  BOOL     command_line;
+  unsigned namelen;
+  uschar * replacement;
+  uschar   name[1];
 } macro_item;
 
 /* Structure for bit tables for debugging and logging */
@@ -226,8 +227,7 @@ typedef struct transport_info {
 /* smtp transport datachunk callback */
 
 #define tc_reap_prev	BIT(0)	/* Flags: reap previous SMTP cmd responses */
-#define tc_reap_one	BIT(1)	/* reap one SMTP response */
-#define tc_chunk_last	BIT(2)	/* annotate chunk SMTP cmd as LAST */
+#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,
@@ -244,17 +244,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;
 
 
@@ -731,11 +721,11 @@ typedef struct search_cache {
 uncompressed, but the data pointer is into the raw data. */
 
 typedef struct {
-  uschar  name[DNS_MAXNAME];      /* domain name */
-  int     type;                   /* record type */
-  unsigned short ttl;		  /* time-to-live, seconds */
-  int     size;                   /* size of data */
-  uschar *data;                   /* pointer to data */
+  uschar        name[DNS_MAXNAME];      /* domain name */
+  int           type;                   /* record type */
+  unsigned short ttl;		        /* time-to-live, seconds */
+  int           size;                   /* size of data */
+  const uschar *data;                   /* pointer to data */
 } dns_record;
 
 /* Structure for holding the result of a DNS query. */
@@ -749,9 +739,9 @@ typedef struct {
 block. */
 
 typedef struct {
-  int     rrcount;                /* count of RRs in the answer */
-  uschar *aptr;                   /* pointer in the answer while scanning */
-  dns_record srr;                 /* data from current record in scan */
+  int            rrcount;         /* count of RRs in the answer */
+  const uschar *aptr;             /* pointer in the answer while scanning */
+  dns_record     srr;             /* data from current record in scan */
 } dns_scan;
 
 /* Structure for holding a chain of IP addresses that are extracted from
@@ -875,6 +865,7 @@ struct ob_dkim {
   uschar *dkim_canon;
   uschar *dkim_sign_headers;
   uschar *dkim_strict;
-} dkim;
+  BOOL    dot_stuffed;
+};
 
 /* End of structs.h */