X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/f9ba5e2255cf18092750fffacb6a9603571a2be5..2081aac24b67f3f3f34389aadc06354abcad0cad:/src/exim_monitor/em_globals.c?ds=sidebyside diff --git a/src/exim_monitor/em_globals.c b/src/exim_monitor/em_globals.c index e3e00c33b..30d22b5eb 100644 --- a/src/exim_monitor/em_globals.c +++ b/src/exim_monitor/em_globals.c @@ -139,7 +139,7 @@ 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 @@ -148,6 +148,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 @@ -201,11 +205,11 @@ 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 +221,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;