X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/74f1a42304ce056cf979d22fb970faae161e3ab2..b4a88d7a067354abbe93c7c32264f31d1e461123:/src/exim_monitor/em_globals.c diff --git a/src/exim_monitor/em_globals.c b/src/exim_monitor/em_globals.c index 6ed57ef17..b23accc65 100644 --- a/src/exim_monitor/em_globals.c +++ b/src/exim_monitor/em_globals.c @@ -2,8 +2,10 @@ * Exim Monitor * *************************************************/ +/* Copyright (c) The Exim Maintainers 2021 - 2024 */ /* Copyright (c) University of Cambridge 1995 - 2018 */ /* See the file NOTICE for conditions of use and distribution. */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #include "em_hdr.h" @@ -81,7 +83,7 @@ uschar *queue_stripchart_name = NULL; int queue_update = 60; int queue_width = 600; -pcre *yyyymmdd_regex; +pcre2_code *yyyymmdd_regex; uschar *size_stripchart = NULL; uschar *size_stripchart_name = NULL; @@ -89,7 +91,7 @@ int spool_is_split = FALSE; int start_small = FALSE; int stripchart_height = 90; int stripchart_number = 1; -pcre **stripchart_regex; +pcre2_code **stripchart_regex; uschar **stripchart_title; int *stripchart_total; int stripchart_update = 60; @@ -148,6 +150,10 @@ BOOL dont_deliver = FALSE; int dsn_ret = 0; uschar *dsn_envid = NULL; +struct global_flags f = { + .sender_local = FALSE, +}; + #ifdef WITH_CONTENT_SCAN int fake_response = OK; #endif @@ -192,20 +198,21 @@ uschar *queue_name = US""; int received_count = 0; uschar *received_protocol = NULL; struct timeval received_time = { 0, 0 }; +struct timeval received_time_complete = { 0, 0 }; int recipients_count = 0; recipient_item *recipients_list = NULL; int recipients_list_max = 0; BOOL running_in_test_harness=FALSE; -uschar *sender_address = NULL; +const uschar *sender_address = NULL; uschar *sender_fullhost = NULL; uschar *sender_helo_name = NULL; uschar *sender_host_address = NULL; +uschar *sender_host_auth_pubname = NULL; 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 +224,8 @@ int string_datestamp_type = -1; BOOL timestamps_utc = FALSE; tls_support tls_in = { - {-1}, /* tls_active */ - 0, /* bits */ - FALSE, /* tls_certificate_verified */ -#ifdef SUPPORT_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;