Multi-recipient cutthrough delivery. Bug 1542

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

diff --git a/src/src/globals.c b/src/src/globals.c
index 85d2e5c36e2af42b327ac74d01fe7a769ac9cf11..a066f35955b875264d75b56270aaceb7a6f60c71 100644 (file)
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -506,8 +506,11 @@ int     continue_sequence      = 1;
 uschar *continue_transport     = NULL;
 
 uschar *csa_status             = NULL;
-BOOL    cutthrough_delivery    = FALSE;
-int     cutthrough_fd          = -1;
+cut_t   cutthrough = {
+  FALSE,                               /* delivery: when to attempt */
+  -1,                                  /* fd: open connection */
+  0,                                   /* nrcpt: number of addresses */
+};
 
 BOOL    daemon_listen          = FALSE;
 uschar *daemon_smtp_port       = US"smtp";
@@ -1254,6 +1257,7 @@ uschar *smtp_ratelimit_mail    = NULL;
 uschar *smtp_ratelimit_rcpt    = NULL;
 uschar *smtp_read_error        = US"";
 int     smtp_receive_timeout   = 5*60;
+uschar *smtp_receive_timeout_s = NULL;
 uschar *smtp_reserve_hosts     = NULL;
 BOOL    smtp_return_error_details = FALSE;
 int     smtp_rlm_base          = 0;