X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsrc%2Fglobals.c;h=b2aeb861f2cb839c2afd75a94b9aa659d3bcc115;hb=c45e9ca19b439828bb71fc55b4054b0bd9229676;hp=5df84bd10299fc7e70328117ec03c21a4591b650;hpb=a79d883474c84fa2a286b7797a7664b599912fcd;p=user%2Fhenk%2Fcode%2Fexim.git diff --git a/src/src/globals.c b/src/src/globals.c index 5df84bd10..b2aeb861f 100644 --- a/src/src/globals.c +++ b/src/src/globals.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2017 */ +/* Copyright (c) University of Cambridge 1995 - 2018 */ /* See the file NOTICE for conditions of use and distribution. */ /* All the global variables are defined together in this one module, so @@ -104,7 +104,7 @@ tls_support tls_in = { .active = -1, .bits = 0, .certificate_verified = FALSE, -#ifdef EXPERIMENTAL_DANE +#ifdef SUPPORT_DANE .dane_verified = FALSE, .tlsa_usage = 0, #endif @@ -121,7 +121,7 @@ tls_support tls_out = { .active = -1, .bits = 0, .certificate_verified = FALSE, -#ifdef EXPERIMENTAL_DANE +#ifdef SUPPORT_DANE .dane_verified = FALSE, .tlsa_usage = 0, #endif @@ -420,7 +420,16 @@ BOOL allow_domain_literals = FALSE; BOOL allow_mx_to_ip = FALSE; BOOL allow_unqualified_recipient = TRUE; /* For local messages */ BOOL allow_unqualified_sender = TRUE; /* Reset for SMTP */ -BOOL allow_utf8_domains = FALSE; +BOOL allow_utf8_domains = FALSE; + +#ifdef EXPERIMENTAL_ARC +struct arc_set *arc_received = NULL; +int arc_received_instance = 0; +int arc_oldest_pass = 0; +const uschar *arc_state = NULL; +const uschar *arc_state_reason = NULL; +#endif + uschar *authenticated_fail_id = NULL; uschar *authenticated_id = NULL; uschar *authenticated_sender = NULL; @@ -488,7 +497,6 @@ int bounce_return_linesize_limit = 998; BOOL bounce_return_message = TRUE; int bounce_return_size_limit = 100*1024; uschar *bounce_sender_authentication = NULL; -uschar *builtin_macros_create_trigger = NULL; uschar *callout_address = NULL; int callout_cache_domain_positive_expire = 7*24*60*60; @@ -667,6 +675,7 @@ int dkim_key_length = 0; uschar *dkim_signers = NULL; uschar *dkim_signing_domain = NULL; uschar *dkim_signing_selector = NULL; +uschar *dkim_verify_overall = NULL; uschar *dkim_verify_signers = US"$dkim_signers"; uschar *dkim_verify_status = NULL; uschar *dkim_verify_reason = NULL; @@ -688,7 +697,7 @@ BOOL dmarc_enable_forensic = FALSE; uschar *dns_again_means_nonexist = NULL; int dns_csa_search_limit = 5; BOOL dns_csa_use_reverse = TRUE; -#ifdef EXPERIMENTAL_DANE +#ifdef SUPPORT_DANE int dns_dane_ok = -1; #endif uschar *dns_ipv4_lookup = NULL; @@ -785,7 +794,7 @@ header_name header_names[] = { { US"to", 2, TRUE, htype_to } }; -int header_names_size = sizeof(header_names)/sizeof(header_name); +int header_names_size = nelem(header_names); BOOL header_rewritten = FALSE; uschar *helo_accept_junk_hosts = NULL; @@ -858,6 +867,7 @@ int log_default[] = { /* for initializing log_selector */ Li_acl_warn_skipped, Li_connection_reject, Li_delay_delivery, + Li_dkim, Li_dnslist_defer, Li_etrn, Li_host_lookup_failed, @@ -892,6 +902,10 @@ bit_table log_options[] = { /* must be in alphabetical order */ BIT_TABLE(L, delay_delivery), BIT_TABLE(L, deliver_time), BIT_TABLE(L, delivery_size), +#ifndef DISABLE_DKIM + BIT_TABLE(L, dkim), + BIT_TABLE(L, dkim_verbose), +#endif BIT_TABLE(L, dnslist_defer), BIT_TABLE(L, dnssec), BIT_TABLE(L, etrn), @@ -904,12 +918,13 @@ bit_table log_options[] = { /* must be in alphabetical order */ BIT_TABLE(L, outgoing_interface), BIT_TABLE(L, outgoing_port), BIT_TABLE(L, pid), -#if defined(SUPPORT_PROXY) || defined (SUPPORT_SOCKS) +#if defined(SUPPORT_PROXY) || defined(SUPPORT_SOCKS) BIT_TABLE(L, proxy), #endif BIT_TABLE(L, queue_run), BIT_TABLE(L, queue_time), BIT_TABLE(L, queue_time_overall), + BIT_TABLE(L, receive_time), BIT_TABLE(L, received_recipients), BIT_TABLE(L, received_sender), BIT_TABLE(L, rejected_header), @@ -947,6 +962,7 @@ uschar *lookup_dnssec_authenticated = NULL; int lookup_open_max = 25; uschar *lookup_value = NULL; +macro_item *macros_user = NULL; uschar *mailstore_basename = NULL; #ifdef WITH_CONTENT_SCAN uschar *malware_name = NULL; /* Virus Name */ @@ -1115,6 +1131,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 }; uschar *recipient_data = NULL; uschar *recipient_unqualified_hosts = NULL; uschar *recipient_verify_failure = NULL; @@ -1269,6 +1286,7 @@ uschar *sender_helo_name = NULL; uschar **sender_host_aliases = &no_aliases; uschar *sender_host_address = NULL; uschar *sender_host_authenticated = NULL; +uschar *sender_host_auth_pubname = NULL; unsigned int sender_host_cache[(MAX_NAMED_LIST * 2)/32]; BOOL sender_host_dnssec = FALSE; uschar *sender_host_name = NULL; @@ -1360,7 +1378,7 @@ uschar *spam_action = NULL; uschar *spam_score = NULL; uschar *spam_score_int = NULL; #endif -#ifdef EXPERIMENTAL_SPF +#ifdef SUPPORT_SPF uschar *spf_guess = US"v=spf1 a/24 mx/24 ptr ?all"; uschar *spf_header_comment = NULL; uschar *spf_received = NULL; @@ -1542,8 +1560,8 @@ uschar *uucp_from_sender = US"$1"; uschar *verify_mode = NULL; uschar *version_copyright = - US"Copyright (c) University of Cambridge, 1995 - 2017\n" - "(c) The Exim Maintainers and contributors in ACKNOWLEDGMENTS file, 2007 - 2017"; + US"Copyright (c) University of Cambridge, 1995 - 2018\n" + "(c) The Exim Maintainers and contributors in ACKNOWLEDGMENTS file, 2007 - 2018"; uschar *version_date = US"?"; uschar *version_cnumber = US"????"; uschar *version_string = US"?";