git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SRS: native implementation. Bug 1649
[exim.git]
/
src
/
src
/
globals.c
diff --git
a/src/src/globals.c
b/src/src/globals.c
index a2fa032bc55904c4f4d6df62f2754c2518629911..3540a9eba44672126d6237ce6f3ccf8efa40cc34 100644
(file)
--- a/
src/src/globals.c
+++ b/
src/src/globals.c
@@
-115,7
+115,7
@@
int dsn_ret = 0;
const pcre *regex_DSN = NULL;
uschar *dsn_advertise_hosts = NULL;
const pcre *regex_DSN = NULL;
uschar *dsn_advertise_hosts = NULL;
-#if
def SUPPORT
_TLS
+#if
ndef DISABLE
_TLS
BOOL gnutls_compat_mode = FALSE;
BOOL gnutls_allow_auto_pkcs11 = FALSE;
uschar *openssl_options = NULL;
BOOL gnutls_compat_mode = FALSE;
BOOL gnutls_allow_auto_pkcs11 = FALSE;
uschar *openssl_options = NULL;
@@
-141,7
+141,7
@@
uschar *tls_resumption_hosts = NULL;
uschar *tls_try_verify_hosts = NULL;
uschar *tls_verify_certificates= US"system";
uschar *tls_verify_hosts = NULL;
uschar *tls_try_verify_hosts = NULL;
uschar *tls_verify_certificates= US"system";
uschar *tls_verify_hosts = NULL;
-#else /*
!SUPPORT
_TLS*/
+#else /*
DISABLE
_TLS*/
uschar *tls_advertise_hosts = NULL;
#endif
uschar *tls_advertise_hosts = NULL;
#endif
@@
-238,8
+238,9
@@
struct global_flags f =
.disable_logging = FALSE,
#ifndef DISABLE_DKIM
.dkim_disable_verify = FALSE,
.disable_logging = FALSE,
#ifndef DISABLE_DKIM
.dkim_disable_verify = FALSE,
+ .dkim_init_done = FALSE,
#endif
#endif
-#ifdef
EXPERIMENTAL
_DMARC
+#ifdef
SUPPORT
_DMARC
.dmarc_has_been_checked = FALSE,
.dmarc_disable_verify = FALSE,
.dmarc_enable_forensic = FALSE,
.dmarc_has_been_checked = FALSE,
.dmarc_disable_verify = FALSE,
.dmarc_enable_forensic = FALSE,
@@
-297,7
+298,7
@@
struct global_flags f =
.sender_name_forced = FALSE,
.sender_set_untrusted = FALSE,
.smtp_authenticated = FALSE,
.sender_name_forced = FALSE,
.sender_set_untrusted = FALSE,
.smtp_authenticated = FALSE,
-#ifdef
EXPERIMENTAL
_PIPE_CONNECT
+#ifdef
SUPPORT
_PIPE_CONNECT
.smtp_in_early_pipe_advertised = FALSE,
.smtp_in_early_pipe_no_auth = FALSE,
.smtp_in_early_pipe_used = FALSE,
.smtp_in_early_pipe_advertised = FALSE,
.smtp_in_early_pipe_no_auth = FALSE,
.smtp_in_early_pipe_used = FALSE,
@@
-548,7
+549,7
@@
address_item address_defaults = {
.return_filename = NULL,
.self_hostname = NULL,
.shadow_message = NULL,
.return_filename = NULL,
.self_hostname = NULL,
.shadow_message = NULL,
-#if
def SUPPORT
_TLS
+#if
ndef DISABLE
_TLS
.cipher = NULL,
.ourcert = NULL,
.peercert = NULL,
.cipher = NULL,
.ourcert = NULL,
.peercert = NULL,
@@
-585,6
+586,7
@@
address_item address_defaults = {
.errors_address = NULL,
.extra_headers = NULL,
.remove_headers = NULL,
.errors_address = NULL,
.extra_headers = NULL,
.remove_headers = NULL,
+ .variables = NULL,
#ifdef EXPERIMENTAL_SRS
.srs_sender = NULL,
#endif
#ifdef EXPERIMENTAL_SRS
.srs_sender = NULL,
#endif
@@
-829,12
+831,15
@@
void *dkim_signatures = NULL;
uschar *dkim_signers = NULL;
uschar *dkim_signing_domain = NULL;
uschar *dkim_signing_selector = NULL;
uschar *dkim_signers = NULL;
uschar *dkim_signing_domain = NULL;
uschar *dkim_signing_selector = NULL;
+uschar *dkim_verify_hashes = US"sha256:sha512:sha1";
+uschar *dkim_verify_keytypes = US"ed25519:rsa";
+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
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_domain_policy = NULL;
uschar *dmarc_forensic_sender = NULL;
uschar *dmarc_history_file = NULL;
@@
-1163,12
+1168,12
@@
uschar *override_pid_file_path = NULL;
uschar *percent_hack_domains = NULL;
uschar *pid_file_path = US PID_FILE_PATH
"\0<--------------Space to patch pid_file_path->";
uschar *percent_hack_domains = NULL;
uschar *pid_file_path = US PID_FILE_PATH
"\0<--------------Space to patch pid_file_path->";
-#ifdef
EXPERIMENTAL
_PIPE_CONNECT
+#ifdef
SUPPORT
_PIPE_CONNECT
uschar *pipe_connect_advertise_hosts = US"*";
#endif
uschar *pipelining_advertise_hosts = US"*";
uschar *primary_hostname = NULL;
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;
int process_info_len = 0;
uschar *process_log_path = NULL;
@@
-1227,7
+1232,7
@@
uschar *received_header_text = US
"${if def:sender_helo_name {(helo=$sender_helo_name)\n\t}}}}"
"by $primary_hostname "
"${if def:received_protocol {with $received_protocol }}"
"${if def:sender_helo_name {(helo=$sender_helo_name)\n\t}}}}"
"by $primary_hostname "
"${if def:received_protocol {with $received_protocol }}"
-#if
def SUPPORT
_TLS
+#if
ndef DISABLE
_TLS
"${if def:tls_in_cipher_std { tls $tls_in_cipher_std\n\t}}"
#endif
"(Exim $version_number)\n\t"
"${if def:tls_in_cipher_std { tls $tls_in_cipher_std\n\t}}"
#endif
"(Exim $version_number)\n\t"
@@
-1253,7
+1258,7
@@
const pcre *regex_From = NULL;
const pcre *regex_IGNOREQUOTA = NULL;
const pcre *regex_PIPELINING = NULL;
const pcre *regex_SIZE = NULL;
const pcre *regex_IGNOREQUOTA = NULL;
const pcre *regex_PIPELINING = NULL;
const pcre *regex_SIZE = NULL;
-#ifdef
EXPERIMENTAL
_PIPE_CONNECT
+#ifdef
SUPPORT
_PIPE_CONNECT
const pcre *regex_EARLY_PIPE = NULL;
#endif
const pcre *regex_ismsgid = NULL;
const pcre *regex_EARLY_PIPE = NULL;
#endif
const pcre *regex_ismsgid = NULL;
@@
-1340,6
+1345,7
@@
router_instance router_defaults = {
.retry_use_local_part = TRUE_UNSET,
.same_domain_copy_routing = FALSE,
.self_rewrite = FALSE,
.retry_use_local_part = TRUE_UNSET,
.same_domain_copy_routing = FALSE,
.self_rewrite = FALSE,
+ .set = NULL,
.suffix_optional = FALSE,
.verify_only = FALSE,
.verify_recipient = TRUE,
.suffix_optional = FALSE,
.verify_only = FALSE,
.verify_recipient = TRUE,
@@
-1361,6
+1367,7
@@
router_instance router_defaults = {
};
uschar *router_name = NULL;
};
uschar *router_name = NULL;
+tree_node *router_var = NULL;
ip_address_item *running_interfaces = NULL;
ip_address_item *running_interfaces = NULL;
@@
-1491,6
+1498,9
@@
uschar *srs_recipient = NULL;
uschar *srs_secrets = NULL;
uschar *srs_status = NULL;
#endif
uschar *srs_secrets = NULL;
uschar *srs_status = NULL;
#endif
+#ifdef EXPERIMENTAL_SRS_NATIVE
+uschar *srs_recipient = NULL;
+#endif
int string_datestamp_offset= -1;
int string_datestamp_length= 0;
int string_datestamp_type = -1;
int string_datestamp_offset= -1;
int string_datestamp_length= 0;
int string_datestamp_type = -1;
@@
-1516,6
+1526,9
@@
uschar *tcp_wrappers_daemon_name = US TCP_WRAPPERS_DAEMON_NAME;
int test_harness_load_avg = 0;
int thismessage_size_limit = 0;
int timeout_frozen_after = 0;
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 *transports = NULL;