X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/19050083522f210e8bb4f1a5ba03928ed0077a49..20913a313f33fd8ae2dea9f379552975867c6394:/src/exim_monitor/em_globals.c diff --git a/src/exim_monitor/em_globals.c b/src/exim_monitor/em_globals.c index 671bd7f03..43d1bbceb 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 - 2017 */ /* See the file NOTICE for conditions of use and distribution. */ @@ -145,10 +145,8 @@ BOOL dkim_disable_verify = FALSE; BOOL dont_deliver = FALSE; -#ifdef EXPERIMENTAL_DSN int dsn_ret = 0; uschar *dsn_envid = NULL; -#endif #ifdef WITH_CONTENT_SCAN int fake_response = OK; @@ -189,13 +187,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; @@ -220,6 +220,10 @@ 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 */