X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/9175a8d2ac50382af2045b37e7b054180f91f4e8..89a80675800115043189ea51437b062d88fa51b7:/src/exim_monitor/em_globals.c

diff --git a/src/exim_monitor/em_globals.c b/src/exim_monitor/em_globals.c
index 918659d98..925e88e05 100644
--- a/src/exim_monitor/em_globals.c
+++ b/src/exim_monitor/em_globals.c
@@ -2,7 +2,7 @@
 *                Exim Monitor                    *
 *************************************************/
 
-/* Copyright (c) University of Cambridge 1995 - 2012 */
+/* Copyright (c) University of Cambridge 1995 - 2018 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
@@ -139,16 +139,18 @@ uschar *dkim_signers             = NULL;
 uschar *dkim_signing_domain      = NULL;
 uschar *dkim_signing_selector    = NULL;
 uschar *dkim_verify_signers      = US"$dkim_signers";
-BOOL    dkim_collect_input       = FALSE;
+unsigned dkim_collect_input      = 0;
 BOOL    dkim_disable_verify      = FALSE;
 #endif
 
 BOOL    dont_deliver           = FALSE;
 
-#ifdef EXPERIMENTAL_DSN
 int     dsn_ret                = 0;
 uschar *dsn_envid              = NULL;
-#endif
+
+struct global_flags f = {
+ .sender_local		= FALSE,
+};
 
 #ifdef WITH_CONTENT_SCAN
 int     fake_response          = OK;
@@ -189,13 +191,15 @@ uid_t   originator_uid;
 
 uschar *primary_hostname       = NULL;
 
+uschar *queue_name             = US"";
+
 int     received_count         = 0;
 uschar *received_protocol      = NULL;
-int     received_time          = 0;
+struct timeval received_time   = { 0, 0 };
 int     recipients_count       = 0;
 recipient_item *recipients_list = NULL;
 int     recipients_list_max    = 0;
-int     running_in_test_harness=FALSE;
+BOOL    running_in_test_harness=FALSE;
 
 uschar *sender_address         = NULL;
 uschar *sender_fullhost        = NULL;
@@ -205,7 +209,6 @@ uschar *sender_host_authenticated = NULL;
 uschar *sender_host_name       = NULL;
 int     sender_host_port       = 0;
 uschar *sender_ident           = NULL;
-BOOL    sender_local           = FALSE;
 BOOL    sender_set_untrusted   = FALSE;
 uschar *smtp_active_hostname   = NULL;
 
@@ -217,18 +220,8 @@ int     string_datestamp_type  = -1;
 
 BOOL    timestamps_utc         = FALSE;
 tls_support tls_in = {
- -1,	/* tls_active */
- 0,	/* bits */
- FALSE,	/* tls_certificate_verified */
-#ifdef EXPERIMENTAL_DANE
- FALSE, /* dane_verified */
- 0,     /* tlsa_usage */
-#endif
- NULL,	/* tls_cipher */
- FALSE,	/* tls_on_connect */
- NULL,	/* tls_on_connect_ports */
- NULL,	/* tls_peerdn */
- NULL	/* tls_sni */
+ .active = { .sock = -1 }
+ /* remainder zero/null/false */
 };
 
 tree_node *tree_duplicates     = NULL;