X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/051018257599e8a91f4ba2c2c99b72697eb0a4a4..a1108b5118d32e969c5fe91b2110944f7483a7cb:/src/src/globals.c

diff --git a/src/src/globals.c b/src/src/globals.c
index aa94a276f..c45e8a930 100644
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -141,8 +141,14 @@ uschar *tls_require_ciphers    = NULL;
 uschar *tls_resumption_hosts   = NULL;
 # endif
 uschar *tls_try_verify_hosts   = NULL;
+#if defined(SUPPORT_SYSDEFAULT_CABUNDLE) || !defined(USE_GNUTLS)
 uschar *tls_verify_certificates= US"system";
+#else
+uschar *tls_verify_certificates= NULL;
+#endif
 uschar *tls_verify_hosts       = NULL;
+int     tls_watch_fd	       = -1;
+time_t  tls_watch_trigger_time = (time_t)0;
 #else	/*DISABLE_TLS*/
 uschar *tls_advertise_hosts    = NULL;
 #endif
@@ -704,6 +710,10 @@ unsigned chunking_data_left    = 0;
 chunking_state_t chunking_state= CHUNKING_NOT_OFFERED;
 const pcre *regex_CHUNKING     = NULL;
 
+#ifdef EXPERIMENTAL_ESMTP_LIMITS
+const pcre *regex_LIMITS        = NULL;
+#endif
+
 uschar *client_authenticator   = NULL;
 uschar *client_authenticated_id = NULL;
 uschar *client_authenticated_sender = NULL;
@@ -730,10 +740,17 @@ uid_t   config_uid             = 0;
 
 int     connection_max_messages= -1;
 uschar *continue_proxy_cipher  = NULL;
+BOOL    continue_proxy_dane    = FALSE;
+uschar *continue_proxy_sni     = NULL;
 uschar *continue_hostname      = NULL;
 uschar *continue_host_address  = NULL;
 int     continue_sequence      = 1;
 uschar *continue_transport     = NULL;
+#ifdef EXPERIMENTAL_ESMTP_LIMITS
+unsigned continue_limit_mail   = 0;
+unsigned continue_limit_rcpt   = 0;
+unsigned continue_limit_rcptdom= 0;
+#endif
 
 uschar *csa_status             = NULL;
 cut_t   cutthrough = {
@@ -993,6 +1010,9 @@ uschar *keep_environment       = NULL;
 int     keep_malformed         = 4*24*60*60;    /* 4 days */
 
 uschar *eldap_dn               = NULL;
+#ifdef EXPERIMENTAL_ESMTP_LIMITS
+uschar *limits_advertise_hosts = US"*";
+#endif
 int     load_average           = -2;
 uschar *local_from_prefix      = NULL;
 uschar *local_from_suffix      = NULL;
@@ -1026,6 +1046,7 @@ int     log_default[]          = { /* for initializing log_selector */
   Li_outgoing_interface, /* see d_log_interface in deliver.c */
   Li_msg_id,
   Li_queue_run,
+  Li_queue_time_exclusive,
   Li_rejected_header,
   Li_retry_defer,
   Li_sender_verify_fail,
@@ -1080,6 +1101,7 @@ bit_table log_options[]        = { /* must be in alphabetical order,
 #endif
   BIT_TABLE(L, queue_run),
   BIT_TABLE(L, queue_time),
+  BIT_TABLE(L, queue_time_exclusive),
   BIT_TABLE(L, queue_time_overall),
   BIT_TABLE(L, receive_time),
   BIT_TABLE(L, received_recipients),
@@ -1200,6 +1222,7 @@ uschar *proxy_external_address = NULL;
 int     proxy_external_port    = 0;
 uschar *proxy_local_address    = NULL;
 int     proxy_local_port       = 0;
+int     proxy_protocol_timeout = 3;
 #endif
 
 uschar *prvscheck_address      = NULL;
@@ -1265,7 +1288,7 @@ uschar *received_header_text   = US
 int     received_headers_max   = 30;
 uschar *received_protocol      = NULL;
 struct timeval received_time   = { 0, 0 };
-struct timeval received_time_taken = { 0, 0 };
+struct timeval received_time_complete = { 0, 0 };
 uschar *recipient_data         = NULL;
 uschar *recipient_unqualified_hosts = NULL;
 uschar *recipient_verify_failure = NULL;
@@ -1441,7 +1464,7 @@ int     smtp_accept_count      = 0;
 int     smtp_accept_max        = 20;
 int     smtp_accept_max_nonmail= 10;
 uschar *smtp_accept_max_nonmail_hosts = US"*";
-int     smtp_accept_max_per_connection = 1000;
+uschar *smtp_accept_max_per_connection = US"1000";
 uschar *smtp_accept_max_per_host = NULL;
 int     smtp_accept_queue      = 0;
 int     smtp_accept_queue_per_connection = 10;
@@ -1558,60 +1581,16 @@ struct timeval timestamp_startup;
 transport_instance  *transports = NULL;
 
 transport_instance  transport_defaults = {
-    .next =			NULL,
-    .name =			NULL,
-    .info =			NULL,
-    .options_block =		NULL,
-    .driver_name =		NULL,
-    .setup =			NULL,
+    /* All non-mentioned elements zero/NULL/FALSE */
     .batch_max =		1,
-    .batch_id =			NULL,
-    .home_dir =			NULL,
-    .current_dir =		NULL,
-    .expand_multi_domain =	NULL,
     .multi_domain =		TRUE,
-    .overrides_hosts =		FALSE,
     .max_addresses =		100,
     .connection_max_messages =	500,
-    .deliver_as_creator =	FALSE,
-    .disable_logging =		FALSE,
-    .initgroups =		FALSE,
-    .uid_set =			FALSE,
-    .gid_set =			FALSE,
     .uid =			(uid_t)(-1),
     .gid =			(gid_t)(-1),
-    .expand_uid =		NULL,
-    .expand_gid =		NULL,
-    .warn_message =		NULL,
-    .shadow =			NULL,
-    .shadow_condition =		NULL,
-    .filter_command =		NULL,
-    .add_headers =		NULL,
-    .remove_headers =		NULL,
-    .return_path =		NULL,
-    .debug_string =		NULL,
-    .max_parallel =		NULL,
-    .message_size_limit =	NULL,
-    .headers_rewrite =		NULL,
-    .rewrite_rules =		NULL,
-    .rewrite_existflags =	0,
     .filter_timeout =		300,
-    .body_only =		FALSE,
-    .delivery_date_add =	FALSE,
-    .envelope_to_add =		FALSE,
-    .headers_only =		FALSE,
-    .rcpt_include_affixes =	FALSE,
-    .return_path_add =		FALSE,
-    .return_output =		FALSE,
-    .return_fail_output =	FALSE,
-    .log_output =		FALSE,
-    .log_fail_output =		FALSE,
-    .log_defer_output =		FALSE,
     .retry_use_local_part =	TRUE_UNSET,	/* retry_use_local_part: BOOL, but set neither
 						 1 nor 0 so can detect unset */
-#ifndef DISABLE_EVENT
-   .event_action =		NULL
-#endif
 };
 
 int     transport_count;