0 /* tls_ocsp */
};
-#ifdef EXPERIMENTAL_DSN
uschar *dsn_envid = NULL;
int dsn_ret = 0;
const pcre *regex_DSN = NULL;
BOOL smtp_use_dsn = FALSE;
uschar *dsn_advertise_hosts = NULL;
-#endif
#ifdef SUPPORT_TLS
BOOL gnutls_compat_mode = FALSE;
NULL, /* authenticator */
NULL, /* auth_id */
NULL, /* auth_sndr */
- #ifdef EXPERIMENTAL_DSN
NULL, /* dsn_orcpt */
0, /* dsn_flags */
0, /* dsn_aware */
- #endif
(uid_t)(-1), /* uid */
(gid_t)(-1), /* gid */
0, /* flags */
uschar *continue_transport = NULL;
uschar *csa_status = NULL;
-BOOL cutthrough_delivery = FALSE;
-int cutthrough_fd = -1;
+cut_t cutthrough = {
+ FALSE, /* delivery: when to attempt */
+ -1, /* fd: open connection */
+ 0, /* nrcpt: number of addresses */
+};
BOOL daemon_listen = FALSE;
uschar *daemon_smtp_port = US"smtp";
uschar *return_path = NULL;
BOOL return_path_remove = TRUE;
int rewrite_existflags = 0;
-uschar *rfc1413_hosts = US"*";
-int rfc1413_query_timeout = 5;
+uschar *rfc1413_hosts = US"@[]";
+int rfc1413_query_timeout = 0;
/* BOOL rfc821_domains = FALSE; <<< on the way out */
uid_t root_gid = ROOT_GID;
uid_t root_uid = ROOT_UID;
TRUE, /* verify_sender */
FALSE, /* uid_set */
FALSE, /* unseen */
-#ifdef EXPERIMENTAL_DSN
FALSE, /* dsn_lasthop */
-#endif
self_freeze, /* self_code */
(uid_t)(-1), /* uid */
uschar *smtp_ratelimit_rcpt = NULL;
uschar *smtp_read_error = US"";
int smtp_receive_timeout = 5*60;
+uschar *smtp_receive_timeout_s = NULL;
uschar *smtp_reserve_hosts = NULL;
BOOL smtp_return_error_details = FALSE;
int smtp_rlm_base = 0;
uschar *spamd_address = US"127.0.0.1 783";
uschar *spam_bar = NULL;
uschar *spam_report = NULL;
+uschar *spam_action = NULL;
uschar *spam_score = NULL;
uschar *spam_score_int = NULL;
#endif