X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/d9c3c8ed8b17e693befc72912bbb1ef737027d5a..14de8063d82edc5bf003ed50abdea55ac542679b:/src/src/transports/smtp.h

diff --git a/src/src/transports/smtp.h b/src/src/transports/smtp.h
index f158e701c..c965a72a7 100644
--- a/src/src/transports/smtp.h
+++ b/src/src/transports/smtp.h
@@ -2,7 +2,7 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
-/* Copyright (c) University of Cambridge 1995 - 2015 */
+/* Copyright (c) University of Cambridge 1995 - 2017 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 #define DELIVER_BUFFER_SIZE 4096
@@ -46,7 +46,10 @@ typedef struct {
   uschar *hosts_verify_avoid_tls;
   uschar *hosts_avoid_pipelining;
   uschar *hosts_avoid_esmtp;
+#ifdef SUPPORT_TLS
   uschar *hosts_nopass_tls;
+  uschar *hosts_noproxy_tls;
+#endif
   int     command_timeout;
   int     connect_timeout;
   int     data_timeout;
@@ -98,15 +101,13 @@ typedef struct {
   int			port;
   uschar *		interface;
 
+  BOOL verify:1;
   BOOL lmtp:1;
   BOOL smtps:1;
   BOOL ok:1;
-  BOOL send_rset:1;
-  BOOL send_quit:1;
   BOOL setting_up:1;
   BOOL esmtp:1;
   BOOL esmtp_sent:1;
-  BOOL pending_MAIL:1;
 #ifndef DISABLE_PRDR
   BOOL prdr_active:1;
 #endif
@@ -118,11 +119,18 @@ typedef struct {
   BOOL dane:1;
   BOOL dane_required:1;
 #endif
-  BOOL completed_addr;	/* pointer to this used by BDAT callback */
+  BOOL pending_MAIL:1;
+  BOOL pending_BDAT:1;
+  BOOL good_RCPT:1;
+  BOOL completed_addr:1;
+  BOOL send_rset:1;
+  BOOL send_quit:1;
 
   int		max_rcpt;
+  int		cmd_count;
 
   uschar	peer_offered;
+  uschar	avoid_option;
   uschar *	igquotstr;
   uschar *	helo_data;
 #ifdef EXPERIMENTAL_DSN_INFO
@@ -144,7 +152,8 @@ typedef struct {
   smtp_transport_options_block *	ob;
 } smtp_context;
 
-extern int smtp_setup_conn(smtp_context *, BOOL, BOOL);
+extern int smtp_setup_conn(smtp_context *, BOOL);
+extern int smtp_write_mail_and_rcpt_cmds(smtp_context *, int *);
 
 
 /* Data for reading the private options. */