*************************************************/
/* Copyright (c) University of Cambridge 1995 - 2018 */
+/* Copyright (c) The Exim Maintainers 2020 */
/* See the file NOTICE for conditions of use and distribution. */
/* All the global variables are defined together in this one module, so
optionlist optionlist_auths[] = {
{ "client_condition", opt_stringptr | opt_public,
- (void *)(offsetof(auth_instance, client_condition)) },
+ OPT_OFF(auth_instance, client_condition) },
{ "client_set_id", opt_stringptr | opt_public,
- (void *)(offsetof(auth_instance, set_client_id)) },
+ OPT_OFF(auth_instance, set_client_id) },
{ "driver", opt_stringptr | opt_public,
- (void *)(offsetof(auth_instance, driver_name)) },
+ OPT_OFF(auth_instance, driver_name) },
{ "public_name", opt_stringptr | opt_public,
- (void *)(offsetof(auth_instance, public_name)) },
+ OPT_OFF(auth_instance, public_name) },
{ "server_advertise_condition", opt_stringptr | opt_public,
- (void *)(offsetof(auth_instance, advertise_condition))},
+ OPT_OFF(auth_instance, advertise_condition)},
{ "server_condition", opt_stringptr | opt_public,
- (void *)(offsetof(auth_instance, server_condition)) },
+ OPT_OFF(auth_instance, server_condition) },
{ "server_debug_print", opt_stringptr | opt_public,
- (void *)(offsetof(auth_instance, server_debug_string)) },
+ OPT_OFF(auth_instance, server_debug_string) },
{ "server_mail_auth_condition", opt_stringptr | opt_public,
- (void *)(offsetof(auth_instance, mail_auth_condition)) },
+ OPT_OFF(auth_instance, mail_auth_condition) },
{ "server_set_id", opt_stringptr | opt_public,
- (void *)(offsetof(auth_instance, set_id)) }
+ OPT_OFF(auth_instance, set_id) }
};
int optionlist_auths_size = nelem(optionlist_auths);
#endif
#ifdef LOOKUP_SQLITE
+uschar *sqlite_dbfile = NULL;
int sqlite_lock_timeout = 5;
#endif
uschar *tls_privatekey = NULL;
BOOL tls_remember_esmtp = FALSE;
uschar *tls_require_ciphers = NULL;
-# ifdef EXPERIMENTAL_TLS_RESUME
+# ifndef DISABLE_TLS_RESUME
uschar *tls_resumption_hosts = NULL;
# endif
uschar *tls_try_verify_hosts = NULL;
+#if defined(SUPPORT_SYSDEFAULT_CABUNDLE) || !defined(USE_GNUTLS)
uschar *tls_verify_certificates= US"system";
+#else
+uschar *tls_verify_certificates= NULL;
+#endif
uschar *tls_verify_hosts = NULL;
+int tls_watch_fd = -1;
+time_t tls_watch_trigger_time = (time_t)0;
#else /*DISABLE_TLS*/
uschar *tls_advertise_hosts = NULL;
#endif
.disable_logging = FALSE,
#ifndef DISABLE_DKIM
.dkim_disable_verify = FALSE,
+ .dkim_init_done = FALSE,
#endif
-#ifdef EXPERIMENTAL_DMARC
+#ifdef SUPPORT_DMARC
.dmarc_has_been_checked = FALSE,
.dmarc_disable_verify = FALSE,
.dmarc_enable_forensic = FALSE,
.sender_name_forced = FALSE,
.sender_set_untrusted = FALSE,
.smtp_authenticated = FALSE,
-#ifdef SUPPORT_PIPE_CONNECT
+#ifndef DISABLE_PIPE_CONNECT
.smtp_in_early_pipe_advertised = FALSE,
.smtp_in_early_pipe_no_auth = FALSE,
.smtp_in_early_pipe_used = FALSE,
#endif
.smtp_in_pipelining_advertised = FALSE,
.smtp_in_pipelining_used = FALSE,
+ .smtp_in_quit = FALSE,
.spool_file_wireformat = FALSE,
.submission_mode = FALSE,
.suppress_local_fixups = FALSE,
.synchronous_delivery = FALSE,
.system_filtering = FALSE,
+ .taint_check_slow = FALSE,
+ .testsuite_delays = TRUE,
.tcp_fastopen_ok = FALSE,
.tcp_in_fastopen = FALSE,
.tcp_in_fastopen_data = FALSE,
BOOL proxy_session = FALSE;
#endif
+#ifndef DISABLE_QUEUE_RAMP
+BOOL queue_fast_ramp = FALSE;
+#endif
BOOL queue_list_requires_admin = TRUE;
BOOL queue_only = FALSE;
BOOL queue_only_load_latch = TRUE;
#endif
BOOL split_spool_directory = FALSE;
BOOL spool_wireformat = FALSE;
-#ifdef EXPERIMENTAL_SRS
+#ifdef EXPERIMENTAL_SRS_ALT
BOOL srs_usehash = TRUE;
BOOL srs_usetimestamp = TRUE;
#endif
.lc_local_part = NULL,
.local_part = NULL,
.prefix = NULL,
+ .prefix_v = NULL,
.suffix = NULL,
+ .suffix_v = NULL,
.domain = NULL,
.address_retry_key = NULL,
.domain_retry_key = NULL,
.localpart_cache = { 0 }, /* localpart_cache - ditto */
.mode = -1,
.more_errno = 0,
- .delivery_usec = 0,
+ .delivery_time = {.tv_sec = 0, .tv_usec = 0},
.basic_errno = ERRNO_UNKNOWNERROR,
.child_count = 0,
.return_file = -1,
.extra_headers = NULL,
.remove_headers = NULL,
.variables = NULL,
-#ifdef EXPERIMENTAL_SRS
+#ifdef EXPERIMENTAL_SRS_ALT
.srs_sender = NULL,
#endif
.ignore_error = FALSE,
int connection_max_messages= -1;
uschar *continue_proxy_cipher = NULL;
+BOOL continue_proxy_dane = FALSE;
+uschar *continue_proxy_sni = NULL;
uschar *continue_hostname = NULL;
uschar *continue_host_address = NULL;
int continue_sequence = 1;
.nrcpt = 0, /* number of addresses */
};
+int daemon_notifier_fd = -1;
uschar *daemon_smtp_port = US"smtp";
int daemon_startup_retries = 9;
int daemon_startup_sleep = 30;
uschar *deliver_localpart_orig = NULL;
uschar *deliver_localpart_parent = NULL;
uschar *deliver_localpart_prefix = NULL;
+uschar *deliver_localpart_prefix_v = NULL;
uschar *deliver_localpart_suffix = NULL;
+uschar *deliver_localpart_suffix_v = NULL;
uschar *deliver_out_buffer = NULL;
int deliver_queue_load_max = -1;
address_item *deliver_recipients = NULL;
uschar *dkim_signers = NULL;
uschar *dkim_signing_domain = NULL;
uschar *dkim_signing_selector = NULL;
+uschar *dkim_verify_hashes = US"sha256:sha512";
+uschar *dkim_verify_keytypes = US"ed25519:rsa";
+uschar *dkim_verify_min_keysizes = US"rsa=1024 ed25519=250";
+BOOL dkim_verify_minimal = FALSE;
uschar *dkim_verify_overall = NULL;
uschar *dkim_verify_signers = US"$dkim_signers";
uschar *dkim_verify_status = NULL;
uschar *dkim_verify_reason = NULL;
#endif
-#ifdef EXPERIMENTAL_DMARC
+#ifdef SUPPORT_DMARC
uschar *dmarc_domain_policy = NULL;
uschar *dmarc_forensic_sender = NULL;
uschar *dmarc_history_file = NULL;
uschar *dmarc_status = NULL;
uschar *dmarc_status_text = NULL;
-uschar *dmarc_tld_file = US DMARC_TLD_FILE;
+uschar *dmarc_tld_file = NULL;
uschar *dmarc_used_domain = NULL;
#endif
BIT_TABLE(L, outgoing_port),
BIT_TABLE(L, pid),
BIT_TABLE(L, pipelining),
+ BIT_TABLE(L, protocol_detail),
#if defined(SUPPORT_PROXY) || defined(SUPPORT_SOCKS)
BIT_TABLE(L, proxy),
#endif
#endif
uid_t *never_users = NULL;
+uschar *notifier_socket = US"$spool_directory/" NOTIFIER_SOCKET_NAME ;
const int on = 1; /* for setsockopt */
const int off = 0;
uschar *percent_hack_domains = NULL;
uschar *pid_file_path = US PID_FILE_PATH
"\0<--------------Space to patch pid_file_path->";
-#ifdef SUPPORT_PIPE_CONNECT
+#ifndef DISABLE_PIPE_CONNECT
uschar *pipe_connect_advertise_hosts = US"*";
#endif
uschar *pipelining_advertise_hosts = US"*";
uschar *primary_hostname = NULL;
-uschar process_info[PROCESS_INFO_SIZE];
+uschar *process_info;
int process_info_len = 0;
uschar *process_log_path = NULL;
+const uschar *process_purpose = US"fresh-exec";
#if defined(SUPPORT_PROXY) || defined(SUPPORT_SOCKS)
uschar *hosts_proxy = NULL;
int proxy_external_port = 0;
uschar *proxy_local_address = NULL;
int proxy_local_port = 0;
+int proxy_protocol_timeout = 3;
#endif
uschar *prvscheck_address = NULL;
uschar *queue_domains = NULL;
int queue_interval = -1;
uschar *queue_name = US"";
+uschar *queue_name_dest = NULL;
uschar *queue_only_file = NULL;
int queue_only_load = -1;
uschar *queue_run_max = US"5";
pid_t queue_run_pid = (pid_t)0;
int queue_run_pipe = -1;
+unsigned queue_size = 0;
+time_t queue_size_next = 0;
uschar *queue_smtp_domains = NULL;
uint32_t random_seed = 0;
"by $primary_hostname "
"${if def:received_protocol {with $received_protocol }}"
#ifndef DISABLE_TLS
+ "${if def:tls_in_ver { ($tls_in_ver)}}"
"${if def:tls_in_cipher_std { tls $tls_in_cipher_std\n\t}}"
#endif
"(Exim $version_number)\n\t"
const pcre *regex_IGNOREQUOTA = NULL;
const pcre *regex_PIPELINING = NULL;
const pcre *regex_SIZE = NULL;
-#ifdef SUPPORT_PIPE_CONNECT
+#ifndef DISABLE_PIPE_CONNECT
const pcre *regex_EARLY_PIPE = NULL;
#endif
const pcre *regex_ismsgid = NULL;
.pass_router = NULL,
.redirect_router = NULL,
- .dnssec = { NULL, NULL }, /* dnssec_domains {require,request} */
+ .dnssec = { .request= US"*", .require=NULL },
};
uschar *router_name = NULL;
int smtp_max_synprot_errors= 3;
int smtp_max_unknown_commands = 3;
uschar *smtp_notquit_reason = NULL;
+unsigned smtp_peer_options = 0;
+unsigned smtp_peer_options_wrap= 0;
uschar *smtp_ratelimit_hosts = NULL;
uschar *smtp_ratelimit_mail = NULL;
uschar *smtp_ratelimit_rcpt = NULL;
double smtp_rlr_factor = 0.0;
int smtp_rlr_limit = 0;
int smtp_rlr_threshold = INT_MAX;
-unsigned smtp_peer_options = 0;
-unsigned smtp_peer_options_wrap= 0;
#ifdef SUPPORT_I18N
uschar *smtputf8_advertise_hosts = US"*"; /* overridden under test-harness */
#endif
uschar *spf_received = NULL;
uschar *spf_result = NULL;
uschar *spf_smtp_comment = NULL;
+uschar *spf_smtp_comment_template
+ /* Used to be: "Please%_see%_http://www.open-spf.org/Why?id=%{S}&ip=%{C}&receiver=%{R}" */
+ = US"Please%_see%_http://www.open-spf.org/Why";
+
#endif
FILE *spool_data_file = NULL;
uschar *spool_directory = US SPOOL_DIRECTORY
"\0<--------------Space to patch spool_directory->";
-#ifdef EXPERIMENTAL_SRS
+#ifdef EXPERIMENTAL_SRS_ALT
uschar *srs_config = NULL;
uschar *srs_db_address = NULL;
uschar *srs_db_key = NULL;
uschar *srs_secrets = NULL;
uschar *srs_status = NULL;
#endif
+#ifdef SUPPORT_SRS
+uschar *srs_recipient = NULL;
+#endif
int string_datestamp_offset= -1;
int string_datestamp_length= 0;
int string_datestamp_type = -1;
-uschar *submission_domain = NULL;
-uschar *submission_name = NULL;
+const uschar *submission_domain = NULL;
+const uschar *submission_name = NULL;
int syslog_facility = LOG_MAIL;
uschar *syslog_processname = US"exim";
uschar *system_filter = NULL;
int test_harness_load_avg = 0;
int thismessage_size_limit = 0;
int timeout_frozen_after = 0;
+#ifdef MEASURE_TIMING
+struct timeval timestamp_startup;
+#endif
transport_instance *transports = NULL;
transport_instance transport_defaults = {
- .next = NULL,
- .name = NULL,
- .info = NULL,
- .options_block = NULL,
- .driver_name = NULL,
- .setup = NULL,
+ /* All non-mentioned elements zero/NULL/FALSE */
.batch_max = 1,
- .batch_id = NULL,
- .home_dir = NULL,
- .current_dir = NULL,
- .expand_multi_domain = NULL,
.multi_domain = TRUE,
- .overrides_hosts = FALSE,
.max_addresses = 100,
.connection_max_messages = 500,
- .deliver_as_creator = FALSE,
- .disable_logging = FALSE,
- .initgroups = FALSE,
- .uid_set = FALSE,
- .gid_set = FALSE,
.uid = (uid_t)(-1),
.gid = (gid_t)(-1),
- .expand_uid = NULL,
- .expand_gid = NULL,
- .warn_message = NULL,
- .shadow = NULL,
- .shadow_condition = NULL,
- .filter_command = NULL,
- .add_headers = NULL,
- .remove_headers = NULL,
- .return_path = NULL,
- .debug_string = NULL,
- .max_parallel = NULL,
- .message_size_limit = NULL,
- .headers_rewrite = NULL,
- .rewrite_rules = NULL,
- .rewrite_existflags = 0,
.filter_timeout = 300,
- .body_only = FALSE,
- .delivery_date_add = FALSE,
- .envelope_to_add = FALSE,
- .headers_only = FALSE,
- .rcpt_include_affixes = FALSE,
- .return_path_add = FALSE,
- .return_output = FALSE,
- .return_fail_output = FALSE,
- .log_output = FALSE,
- .log_fail_output = FALSE,
- .log_defer_output = FALSE,
.retry_use_local_part = TRUE_UNSET, /* retry_use_local_part: BOOL, but set neither
1 nor 0 so can detect unset */
-#ifndef DISABLE_EVENT
- .event_action = NULL
-#endif
};
int transport_count;
uschar *verify_mode = NULL;
uschar *version_copyright =
US"Copyright (c) University of Cambridge, 1995 - 2018\n"
- "(c) The Exim Maintainers and contributors in ACKNOWLEDGMENTS file, 2007 - 2018";
+ "(c) The Exim Maintainers and contributors in ACKNOWLEDGMENTS file, 2007 - 2020";
uschar *version_date = US"?";
uschar *version_cnumber = US"????";
uschar *version_string = US"?";
git://git.exim.org / exim.git / blobdiff