* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 2015 */
+/* Copyright (c) University of Cambridge 1995 - 2017 */
/* See the file NOTICE for conditions of use and distribution. */
/* All the global variables are defined together in this one module, so
(void *)(offsetof(auth_instance, set_id)) }
};
-int optionlist_auths_size = sizeof(optionlist_auths)/sizeof(optionlist);
+int optionlist_auths_size = nelem(optionlist_auths);
/* An empty host aliases list. */
uschar *opt_perl_startup = NULL;
BOOL opt_perl_at_start = FALSE;
BOOL opt_perl_started = FALSE;
+BOOL opt_perl_taintmode = FALSE;
#endif
#ifdef EXPAND_DLFUNC
them. Also, the tls_ variables are now always visible. */
tls_support tls_in = {
- -1, /* tls_active */
- 0, /* tls_bits */
- FALSE,/* tls_certificate_verified */
+ .active = -1,
+ .bits = 0,
+ .certificate_verified = FALSE,
#ifdef EXPERIMENTAL_DANE
- FALSE,/* dane_verified */
- 0, /* tlsa_usage */
+ .dane_verified = FALSE,
+ .tlsa_usage = 0,
#endif
- NULL, /* tls_cipher */
- FALSE,/* tls_on_connect */
- NULL, /* tls_on_connect_ports */
- NULL, /* tls_ourcert */
- NULL, /* tls_peercert */
- NULL, /* tls_peerdn */
- NULL, /* tls_sni */
- 0 /* tls_ocsp */
+ .cipher = NULL,
+ .on_connect = FALSE,
+ .on_connect_ports = NULL,
+ .ourcert = NULL,
+ .peercert = NULL,
+ .peerdn = NULL,
+ .sni = NULL,
+ .ocsp = OCSP_NOT_REQ
};
tls_support tls_out = {
- -1, /* tls_active */
- 0, /* tls_bits */
- FALSE,/* tls_certificate_verified */
+ .active = -1,
+ .bits = 0,
+ .certificate_verified = FALSE,
#ifdef EXPERIMENTAL_DANE
- FALSE,/* dane_verified */
- 0, /* tlsa_usage */
+ .dane_verified = FALSE,
+ .tlsa_usage = 0,
#endif
- NULL, /* tls_cipher */
- FALSE,/* tls_on_connect */
- NULL, /* tls_on_connect_ports */
- NULL, /* tls_ourcert */
- NULL, /* tls_peercert */
- NULL, /* tls_peerdn */
- NULL, /* tls_sni */
- 0 /* tls_ocsp */
+ .cipher = NULL,
+ .on_connect = FALSE,
+ .on_connect_ports = NULL,
+ .ourcert = NULL,
+ .peercert = NULL,
+ .peerdn = NULL,
+ .sni = NULL,
+ .ocsp = OCSP_NOT_REQ
};
uschar *dsn_envid = NULL;
int dsn_ret = 0;
const pcre *regex_DSN = NULL;
-BOOL smtp_use_dsn = FALSE;
uschar *dsn_advertise_hosts = NULL;
#ifdef SUPPORT_TLS
BOOL gnutls_compat_mode = FALSE;
BOOL gnutls_allow_auto_pkcs11 = FALSE;
-uschar *gnutls_require_mac = NULL;
-uschar *gnutls_require_kx = NULL;
-uschar *gnutls_require_proto = NULL;
uschar *openssl_options = NULL;
const pcre *regex_STARTTLS = NULL;
uschar *tls_advertise_hosts = US"*";
bit-count as "NORMAL" (2432) and Thunderbird dropping connection. */
int tls_dh_max_bits = 2236;
uschar *tls_dhparam = NULL;
-uschar *tls_eccurve = US"prime256v1";
+uschar *tls_eccurve = US"auto";
# ifndef DISABLE_OCSP
uschar *tls_ocsp_file = NULL;
# endif
-BOOL tls_offered = FALSE;
uschar *tls_privatekey = NULL;
BOOL tls_remember_esmtp = FALSE;
uschar *tls_require_ciphers = NULL;
incoming TCP/IP. The defaults use stdin. We never need these for any
stand-alone tests. */
-#ifndef STAND_ALONE
-int (*receive_getc)(void) = stdin_getc;
+#if !defined(STAND_ALONE) && !defined(MACRO_PREDEF)
+int (*lwr_receive_getc)(unsigned) = stdin_getc;
+uschar * (*lwr_receive_getbuf)(unsigned *) = NULL;
+int (*lwr_receive_ungetc)(int) = stdin_ungetc;
+int (*receive_getc)(unsigned) = stdin_getc;
+uschar * (*receive_getbuf)(unsigned *) = NULL;
+void (*receive_get_cache)(void)= NULL;
int (*receive_ungetc)(int) = stdin_ungetc;
int (*receive_feof)(void) = stdin_feof;
int (*receive_ferror)(void) = stdin_ferror;
NULL, NULL, NULL, NULL};
int acl_narg = 0;
+int acl_level = 0;
+
uschar *acl_not_smtp = NULL;
#ifdef WITH_CONTENT_SCAN
uschar *acl_not_smtp_mime = NULL;
BOOL active_local_from_check = FALSE;
BOOL active_local_sender_retain = FALSE;
-int body_8bitmime = 0;
BOOL accept_8bitmime = TRUE; /* deliberately not RFC compliant */
+uschar *add_environment = NULL;
address_item *addr_duplicate = NULL;
address_item address_defaults = {
- NULL, /* next */
- NULL, /* parent */
- NULL, /* first */
- NULL, /* dupof */
- NULL, /* start_router */
- NULL, /* router */
- NULL, /* transport */
- NULL, /* host_list */
- NULL, /* host_used */
- NULL, /* fallback_hosts */
- NULL, /* reply */
- NULL, /* retries */
- NULL, /* address */
- NULL, /* unique */
- NULL, /* cc_local_part */
- NULL, /* lc_local_part */
- NULL, /* local_part */
- NULL, /* prefix */
- NULL, /* suffix */
- NULL, /* domain */
- NULL, /* address_retry_key */
- NULL, /* domain_retry_key */
- NULL, /* current_dir */
- NULL, /* home_dir */
- NULL, /* message */
- NULL, /* user_message */
- NULL, /* onetime_parent */
- NULL, /* pipe_expandn */
- NULL, /* return_filename */
- NULL, /* self_hostname */
- NULL, /* shadow_message */
+ .next = NULL,
+ .parent = NULL,
+ .first = NULL,
+ .dupof = NULL,
+ .start_router = NULL,
+ .router = NULL,
+ .transport = NULL,
+ .host_list = NULL,
+ .host_used = NULL,
+ .fallback_hosts = NULL,
+ .reply = NULL,
+ .retries = NULL,
+ .address = NULL,
+ .unique = NULL,
+ .cc_local_part = NULL,
+ .lc_local_part = NULL,
+ .local_part = NULL,
+ .prefix = NULL,
+ .suffix = NULL,
+ .domain = NULL,
+ .address_retry_key = NULL,
+ .domain_retry_key = NULL,
+ .current_dir = NULL,
+ .home_dir = NULL,
+ .message = NULL,
+ .user_message = NULL,
+ .onetime_parent = NULL,
+ .pipe_expandn = NULL,
+ .return_filename = NULL,
+ .self_hostname = NULL,
+ .shadow_message = NULL,
#ifdef SUPPORT_TLS
- NULL, /* cipher */
- NULL, /* ourcert */
- NULL, /* peercert */
- NULL, /* peerdn */
- OCSP_NOT_REQ, /* ocsp */
+ .cipher = NULL,
+ .ourcert = NULL,
+ .peercert = NULL,
+ .peerdn = NULL,
+ .ocsp = OCSP_NOT_REQ,
#endif
#ifdef EXPERIMENTAL_DSN_INFO
- NULL, /* smtp_greeting */
- NULL, /* helo_response */
+ .smtp_greeting = NULL,
+ .helo_response = NULL,
#endif
- NULL, /* authenticator */
- NULL, /* auth_id */
- NULL, /* auth_sndr */
- NULL, /* dsn_orcpt */
- 0, /* dsn_flags */
- 0, /* dsn_aware */
- (uid_t)(-1), /* uid */
- (gid_t)(-1), /* gid */
- 0, /* flags */
- { 0 }, /* domain_cache - any larger array should be zeroed */
- { 0 }, /* localpart_cache - ditto */
- -1, /* mode */
- 0, /* more_errno */
- ERRNO_UNKNOWNERROR, /* basic_errno */
- 0, /* child_count */
- -1, /* return_file */
- SPECIAL_NONE, /* special_action */
- DEFER, /* transport_return */
- { /* fields that are propagated to children */
- NULL, /* address_data */
- NULL, /* domain_data */
- NULL, /* localpart_data */
- NULL, /* errors_address */
- NULL, /* extra_headers */
- NULL, /* remove_headers */
+ .authenticator = NULL,
+ .auth_id = NULL,
+ .auth_sndr = NULL,
+ .dsn_orcpt = NULL,
+ .dsn_flags = 0,
+ .dsn_aware = 0,
+ .uid = (uid_t)(-1),
+ .gid = (gid_t)(-1),
+ .flags = { 0 },
+ .domain_cache = { 0 }, /* domain_cache - any larger array should be zeroed */
+ .localpart_cache = { 0 }, /* localpart_cache - ditto */
+ .mode = -1,
+ .more_errno = 0,
+ .delivery_usec = 0,
+ .basic_errno = ERRNO_UNKNOWNERROR,
+ .child_count = 0,
+ .return_file = -1,
+ .special_action = SPECIAL_NONE,
+ .transport_return = DEFER,
+ .prop = { /* fields that are propagated to children */
+ .address_data = NULL,
+ .domain_data = NULL,
+ .localpart_data = NULL,
+ .errors_address = NULL,
+ .extra_headers = NULL,
+ .remove_headers = NULL,
#ifdef EXPERIMENTAL_SRS
- NULL, /* srs_sender */
+ .srs_sender = NULL,
#endif
+ .ignore_error = FALSE,
#ifdef SUPPORT_I18N
- FALSE, /* utf8 */
+ .utf8_msg = FALSE,
+ .utf8_downcvt = FALSE,
+ .utf8_downcvt_maybe = FALSE
#endif
}
};
auth_instance *auths = NULL;
uschar *auth_advertise_hosts = US"*";
auth_instance auth_defaults = {
- NULL, /* chain pointer */
- NULL, /* name */
- NULL, /* info */
- NULL, /* private options block pointer */
- NULL, /* driver_name */
- NULL, /* advertise_condition */
- NULL, /* client_condition */
- NULL, /* public_name */
- NULL, /* set_id */
- NULL, /* set_client_id */
- NULL, /* server_mail_auth_condition */
- NULL, /* server_debug_string */
- NULL, /* server_condition */
- FALSE, /* client */
- FALSE, /* server */
- FALSE /* advertised */
+ .next = NULL,
+ .name = NULL,
+ .info = NULL,
+ .options_block = NULL,
+ .driver_name = NULL,
+ .advertise_condition = NULL,
+ .client_condition = NULL,
+ .public_name = NULL,
+ .set_id = NULL,
+ .set_client_id = NULL,
+ .mail_auth_condition = NULL,
+ .server_debug_string = NULL,
+ .server_condition = NULL,
+ .client = FALSE,
+ .server = FALSE,
+ .advertised = FALSE
};
uschar *auth_defer_msg = US"reason not recorded";
int bmi_run = 0;
uschar *bmi_verdicts = NULL;
#endif
+int bsmtp_transaction_linecount = 0;
+int body_8bitmime = 0;
int body_linecount = 0;
int body_zerocount = 0;
uschar *bounce_message_file = NULL;
uschar *bounce_message_text = NULL;
uschar *bounce_recipient = NULL;
BOOL bounce_return_body = TRUE;
+int bounce_return_linesize_limit = 998;
BOOL bounce_return_message = TRUE;
int bounce_return_size_limit = 100*1024;
uschar *bounce_sender_authentication = NULL;
-int bsmtp_transaction_linecount = 0;
+uschar *builtin_macros_create_trigger = NULL;
uschar *callout_address = NULL;
int callout_cache_domain_positive_expire = 7*24*60*60;
int callout_cache_negative_expire = 2*60*60;
uschar *callout_random_local_part = US"$primary_hostname-$tod_epoch-testing";
uschar *check_dns_names_pattern= US"(?i)^(?>(?(1)\\.|())[^\\W](?>[a-z0-9/_-]*[^\\W])?)+(\\.?)$";
-int check_log_inodes = 0;
-int check_log_space = 0;
+int check_log_inodes = 100;
+int check_log_space = 10*1024; /* 10K Kbyte == 10MB */
BOOL check_rfc2047_length = TRUE;
-int check_spool_inodes = 0;
-int check_spool_space = 0;
-uschar *client_authenticator = NULL;
-uschar *client_authenticated_id = NULL;
-uschar *client_authenticated_sender = NULL;
+int check_spool_inodes = 100;
+int check_spool_space = 10*1024; /* 10K Kbyte == 10MB */
+
+uschar *chunking_advertise_hosts = US"*";
+unsigned chunking_datasize = 0;
+unsigned chunking_data_left = 0;
+BOOL chunking_offered = FALSE;
+chunking_state_t chunking_state= CHUNKING_NOT_OFFERED;
+const pcre *regex_CHUNKING = NULL;
+
+uschar *client_authenticator = NULL;
+uschar *client_authenticated_id = NULL;
+uschar *client_authenticated_sender = NULL;
int clmacro_count = 0;
uschar *clmacros[MAX_CLMACROS];
+BOOL commandline_checks_require_admin = FALSE;
BOOL config_changed = FALSE;
FILE *config_file = NULL;
-uschar *config_filename = NULL;
+const uschar *config_filename = NULL;
int config_lineno = 0;
#ifdef CONFIGURE_GROUP
gid_t config_gid = CONFIGURE_GROUP;
+#else
+gid_t config_gid = 0;
#endif
uschar *config_main_filelist = US CONFIGURE_FILE
"\0<-----------Space to patch configure_filename->";
#ifdef CONFIGURE_OWNER
uid_t config_uid = CONFIGURE_OWNER;
+#else
+uid_t config_uid = 0;
#endif
int connection_max_messages= -1;
+uschar *continue_proxy_cipher = NULL;
uschar *continue_hostname = NULL;
uschar *continue_host_address = NULL;
BOOL continue_more = FALSE;
uschar *csa_status = NULL;
cut_t cutthrough = {
- FALSE, /* delivery: when to attempt */
- -1, /* fd: open connection */
- 0, /* nrcpt: number of addresses */
+ .callout_hold_only = FALSE, /* verify-only: normal delivery */
+ .delivery = FALSE, /* when to attempt */
+ .defer_pass = FALSE, /* on defer: spool locally */
+ .is_tls = FALSE, /* not a TLS conn yet */
+ .fd = -1, /* open connection */
+ .nrcpt = 0, /* number of addresses */
};
BOOL daemon_listen = FALSE;
int debug_options_count = nelem(debug_options);
unsigned int debug_selector = 0;
+BOOL debug_store = FALSE;
int delay_warning[DELAY_WARNING_SIZE] = { DELAY_WARNING_SIZE, 1, 24*60*60 };
uschar *delay_warning_condition=
US"${if or {"
BOOL deliver_selectstring_regex = FALSE;
uschar *deliver_selectstring_sender = NULL;
BOOL deliver_selectstring_sender_regex = FALSE;
-#ifdef WITH_OLD_DEMIME
-int demime_errorlevel = 0;
-int demime_ok = 0;
-uschar *demime_reason = NULL;
-#endif
BOOL disable_callout_flush = FALSE;
BOOL disable_delay_flush = FALSE;
#ifdef ENABLE_DISABLE_FSYNC
int errors_sender_rc = EXIT_FAILURE;
#ifndef DISABLE_EVENT
uschar *event_action = NULL; /* expansion for delivery events */
-uschar *event_data = NULL; /* auxilary data variable for event */
+uschar *event_data = NULL; /* auxiliary data variable for event */
int event_defer_errno = 0;
const uschar *event_name = NULL; /* event name variable */
#endif
"\0<---------------Space to patch exim_path->";
uid_t exim_uid = EXIM_UID;
BOOL exim_uid_set = TRUE; /* This uid is always set */
+int expand_level = 0; /* Nesting depth, indent for debug */
int expand_forbid = 0;
int expand_nlength[EXPAND_MAXN+1];
int expand_nmax = -1;
uschar *filter_test_ufile = NULL;
uschar *filter_thisaddress = NULL;
int finduser_retries = 0;
-#ifdef WITH_OLD_DEMIME
-uschar *found_extension = NULL;
-#endif
uid_t fixed_never_users[] = { FIXED_NEVER_USERS };
uschar *freeze_tell = NULL;
uschar *freeze_tell_config = NULL;
int header_line_maxsize = 0;
header_name header_names[] = {
- { US"bcc", 3, TRUE, htype_bcc },
- { US"cc", 2, TRUE, htype_cc },
- { US"date", 4, TRUE, htype_date },
- { US"delivery-date", 13, FALSE, htype_delivery_date },
- { US"envelope-to", 11, FALSE, htype_envelope_to },
- { US"from", 4, TRUE, htype_from },
- { US"message-id", 10, TRUE, htype_id },
- { US"received", 8, FALSE, htype_received },
- { US"reply-to", 8, FALSE, htype_reply_to },
- { US"return-path", 11, FALSE, htype_return_path },
- { US"sender", 6, TRUE, htype_sender },
- { US"subject", 7, FALSE, htype_subject },
- { US"to", 2, TRUE, htype_to }
+ /* name len allow_resent htype */
+ { US"bcc", 3, TRUE, htype_bcc },
+ { US"cc", 2, TRUE, htype_cc },
+ { US"date", 4, TRUE, htype_date },
+ { US"delivery-date", 13, FALSE, htype_delivery_date },
+ { US"envelope-to", 11, FALSE, htype_envelope_to },
+ { US"from", 4, TRUE, htype_from },
+ { US"message-id", 10, TRUE, htype_id },
+ { US"received", 8, FALSE, htype_received },
+ { US"reply-to", 8, FALSE, htype_reply_to },
+ { US"return-path", 11, FALSE, htype_return_path },
+ { US"sender", 6, TRUE, htype_sender },
+ { US"subject", 7, FALSE, htype_subject },
+ { US"to", 2, TRUE, htype_to }
};
int header_names_size = sizeof(header_names)/sizeof(header_name);
uschar *ignore_fromline_hosts = NULL;
BOOL inetd_wait_mode = FALSE;
int inetd_wait_timeout = -1;
+uschar *initial_cwd = NULL;
uschar *interface_address = NULL;
int interface_port = -1;
BOOL is_inetd = FALSE;
int journal_fd = -1;
+uschar *keep_environment = NULL;
+
int keep_malformed = 4*24*60*60; /* 4 days */
uschar *eldap_dn = NULL;
BIT_TABLE(L, deliver_time),
BIT_TABLE(L, delivery_size),
BIT_TABLE(L, dnslist_defer),
+ BIT_TABLE(L, dnssec),
BIT_TABLE(L, etrn),
BIT_TABLE(L, host_lookup_failed),
BIT_TABLE(L, ident_timeout),
BIT_TABLE(L, incoming_interface),
BIT_TABLE(L, incoming_port),
BIT_TABLE(L, lost_incoming_connection),
+ BIT_TABLE(L, millisec),
BIT_TABLE(L, outgoing_interface),
BIT_TABLE(L, outgoing_port),
BIT_TABLE(L, pid),
int lookup_open_max = 25;
uschar *lookup_value = NULL;
-macro_item *macros = NULL;
uschar *mailstore_basename = NULL;
#ifdef WITH_CONTENT_SCAN
uschar *malware_name = NULL; /* Virus Name */
#endif
BOOL no_multiline_responses = FALSE;
+const int on = 1; /* for setsockopt */
+const int off = 0;
+
uid_t original_euid;
gid_t originator_gid;
uschar *originator_login = NULL;
uschar *queue_domains = NULL;
int queue_interval = -1;
BOOL queue_list_requires_admin = TRUE;
+uschar *queue_name = US"";
BOOL queue_only = FALSE;
uschar *queue_only_file = NULL;
int queue_only_load = -1;
BOOL queue_run_force = FALSE;
BOOL queue_run_in_order = FALSE;
BOOL queue_run_local = FALSE;
-int queue_run_max = 5;
+uschar *queue_run_max = US"5";
pid_t queue_run_pid = (pid_t)0;
int queue_run_pipe = -1;
BOOL queue_running = FALSE;
int received_headers_max = 30;
uschar *received_protocol = NULL;
-int received_time = 0;
+struct timeval received_time = { 0, 0 };
uschar *recipient_data = NULL;
uschar *recipient_unqualified_hosts = NULL;
uschar *recipient_verify_failure = NULL;
router_instance *routers = NULL;
router_instance router_defaults = {
- NULL, /* chain pointer */
- NULL, /* name */
- NULL, /* info */
- NULL, /* private options block pointer */
- NULL, /* driver name */
+ .next = NULL,
+ .name = NULL,
+ .info = NULL,
+ .options_block = NULL,
+ .driver_name = NULL,
- NULL, /* address_data */
+ .address_data = NULL,
#ifdef EXPERIMENTAL_BRIGHTMAIL
- NULL, /* bmi_rule */
+ .bmi_rule = NULL,
#endif
- NULL, /* cannot_route_message */
- NULL, /* condition */
- NULL, /* current_directory */
- NULL, /* debug_string */
- NULL, /* domains */
- NULL, /* errors_to */
- NULL, /* expand_gid */
- NULL, /* expand_uid */
- NULL, /* expand_more */
- NULL, /* expand_unseen */
- NULL, /* extra_headers */
- NULL, /* fallback_hosts */
- NULL, /* home_directory */
- NULL, /* ignore_target_hosts */
- NULL, /* local_parts */
- NULL, /* pass_router_name */
- NULL, /* prefix */
- NULL, /* redirect_router_name */
- NULL, /* remove_headers */
- NULL, /* require_files */
- NULL, /* router_home_directory */
- US"freeze", /* self */
- NULL, /* senders */
- NULL, /* suffix */
- NULL, /* translate_ip_address */
- NULL, /* transport_name */
-
- TRUE, /* address_test */
+ .cannot_route_message = NULL,
+ .condition = NULL,
+ .current_directory = NULL,
+ .debug_string = NULL,
+ .domains = NULL,
+ .errors_to = NULL,
+ .expand_gid = NULL,
+ .expand_uid = NULL,
+ .expand_more = NULL,
+ .expand_unseen = NULL,
+ .extra_headers = NULL,
+ .fallback_hosts = NULL,
+ .home_directory = NULL,
+ .ignore_target_hosts = NULL,
+ .local_parts = NULL,
+ .pass_router_name = NULL,
+ .prefix = NULL,
+ .redirect_router_name = NULL,
+ .remove_headers = NULL,
+ .require_files = NULL,
+ .router_home_directory = NULL,
+ .self = US"freeze",
+ .senders = NULL,
+ .suffix = NULL,
+ .translate_ip_address = NULL,
+ .transport_name = NULL,
+
+ .address_test = TRUE,
#ifdef EXPERIMENTAL_BRIGHTMAIL
- FALSE, /* bmi_deliver_alternate */
- FALSE, /* bmi_deliver_default */
- FALSE, /* bmi_dont_deliver */
+ .bmi_deliver_alternate = FALSE,
+ .bmi_deliver_default = FALSE,
+ .bmi_dont_deliver = FALSE,
#endif
- TRUE, /* expn */
- FALSE, /* caseful_local_part */
- FALSE, /* check_local_user */
- FALSE, /* disable_logging */
- FALSE, /* fail_verify_recipient */
- FALSE, /* fail_verify_sender */
- FALSE, /* gid_set */
- FALSE, /* initgroups */
- TRUE_UNSET, /* log_as_local */
- TRUE, /* more */
- FALSE, /* pass_on_timeout */
- FALSE, /* prefix_optional */
- TRUE, /* repeat_use */
- TRUE_UNSET, /* retry_use_local_part - fudge "unset" */
- FALSE, /* same_domain_copy_routing */
- FALSE, /* self_rewrite */
- FALSE, /* suffix_optional */
- FALSE, /* verify_only */
- TRUE, /* verify_recipient */
- TRUE, /* verify_sender */
- FALSE, /* uid_set */
- FALSE, /* unseen */
- FALSE, /* dsn_lasthop */
-
- self_freeze, /* self_code */
- (uid_t)(-1), /* uid */
- (gid_t)(-1), /* gid */
-
- NULL, /* fallback_hostlist */
- NULL, /* transport instance */
- NULL, /* pass_router */
- NULL, /* redirect_router */
-
- { NULL, NULL }, /* dnssec_domains {require,request} */
+ .expn = TRUE,
+ .caseful_local_part = FALSE,
+ .check_local_user = FALSE,
+ .disable_logging = FALSE,
+ .fail_verify_recipient = FALSE,
+ .fail_verify_sender = FALSE,
+ .gid_set = FALSE,
+ .initgroups = FALSE,
+ .log_as_local = TRUE_UNSET,
+ .more = TRUE,
+ .pass_on_timeout = FALSE,
+ .prefix_optional = FALSE,
+ .repeat_use = TRUE,
+ .retry_use_local_part = TRUE_UNSET,
+ .same_domain_copy_routing = FALSE,
+ .self_rewrite = FALSE,
+ .suffix_optional = FALSE,
+ .verify_only = FALSE,
+ .verify_recipient = TRUE,
+ .verify_sender = TRUE,
+ .uid_set = FALSE,
+ .unseen = FALSE,
+ .dsn_lasthop = FALSE,
+
+ .self_code = self_freeze,
+ .uid = (uid_t)(-1),
+ .gid = (gid_t)(-1),
+
+ .fallback_hostlist = NULL,
+ .transport = NULL,
+ .pass_router = NULL,
+ .redirect_router = NULL,
+
+ .dnssec = { NULL, NULL }, /* dnssec_domains {require,request} */
};
uschar *router_name = NULL;
int smtp_ch_index = 0;
uschar *smtp_cmd_argument = NULL;
uschar *smtp_cmd_buffer = NULL;
-time_t smtp_connection_start = 0;
+struct timeval smtp_connection_start = {0,0};
uschar smtp_connection_had[SMTP_HBUFF_SIZE];
int smtp_connect_backlog = 20;
double smtp_delay_mail = 0.0;
double smtp_rlr_factor = 0.0;
int smtp_rlr_limit = 0;
int smtp_rlr_threshold = INT_MAX;
-BOOL smtp_use_pipelining = FALSE;
-BOOL smtp_use_size = FALSE;
+unsigned smtp_peer_options = 0;
+unsigned smtp_peer_options_wrap= 0;
#ifdef SUPPORT_I18N
uschar *smtputf8_advertise_hosts = US"*"; /* overridden under test-harness */
#endif
BOOL split_spool_directory = FALSE;
uschar *spool_directory = US SPOOL_DIRECTORY
"\0<--------------Space to patch spool_directory->";
+BOOL spool_file_wireformat = FALSE;
+BOOL spool_wireformat = FALSE;
#ifdef EXPERIMENTAL_SRS
uschar *srs_config = NULL;
uschar *srs_db_address = NULL;
BOOL synchronous_delivery = FALSE;
BOOL syslog_duplication = TRUE;
int syslog_facility = LOG_MAIL;
+BOOL syslog_pid = TRUE;
uschar *syslog_processname = US"exim";
BOOL syslog_timestamp = TRUE;
uschar *system_filter = NULL;
BOOL system_filter_uid_set = FALSE;
BOOL system_filtering = FALSE;
+BOOL tcp_fastopen_ok = FALSE;
+blob tcp_fastopen_nodata = { .data = NULL, .len = 0 };
+BOOL tcp_in_fastopen = FALSE;
+BOOL tcp_in_fastopen_logged = FALSE;
BOOL tcp_nodelay = TRUE;
+int tcp_out_fastopen = 0;
+BOOL tcp_out_fastopen_logged= FALSE;
#ifdef USE_TCP_WRAPPERS
uschar *tcp_wrappers_daemon_name = US TCP_WRAPPERS_DAEMON_NAME;
#endif
transport_instance *transports = NULL;
transport_instance transport_defaults = {
- NULL, /* chain pointer */
- NULL, /* name */
- NULL, /* info */
- NULL, /* private options block pointer */
- NULL, /* driver name */
- NULL, /* setup entry point */
- 1, /* batch_max */
- NULL, /* batch_id */
- NULL, /* home_dir */
- NULL, /* current_dir */
- NULL, /* expand-multi-domain */
- TRUE, /* multi-domain */
- FALSE, /* overrides_hosts */
- 100, /* max_addresses */
- 500, /* connection_max_messages */
- FALSE, /* deliver_as_creator */
- FALSE, /* disable_logging */
- FALSE, /* initgroups */
- FALSE, /* uid_set */
- FALSE, /* gid_set */
- (uid_t)(-1), /* uid */
- (gid_t)(-1), /* gid */
- NULL, /* 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 */
- 0, /* rewrite_existflags */
- 300, /* filter_timeout */
- FALSE, /* 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 */
- TRUE_UNSET /* retry_use_local_part: BOOL, but set neither
- 1 nor 0 so can detect unset */
+ .next = NULL,
+ .name = NULL,
+ .info = NULL,
+ .options_block = NULL,
+ .driver_name = NULL,
+ .setup = NULL,
+ .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
- ,NULL /* event_action */
+ .event_action = NULL
#endif
};
uschar *verify_mode = NULL;
uschar *version_copyright =
- US"Copyright (c) University of Cambridge, 1995 - 2015\n"
- "(c) The Exim Maintainers and contributors in ACKNOWLEDGMENTS file, 2007 - 2015";
+ US"Copyright (c) University of Cambridge, 1995 - 2017\n"
+ "(c) The Exim Maintainers and contributors in ACKNOWLEDGMENTS file, 2007 - 2017";
uschar *version_date = US"?";
uschar *version_cnumber = US"????";
uschar *version_string = US"?";
git://git.exim.org / exim.git / blobdiff