git://git.exim.org
/
users
/
jgh
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use dedicated union member for option offsets
[users/jgh/exim.git]
/
src
/
src
/
globals.c
diff --git
a/src/src/globals.c
b/src/src/globals.c
index 677c03e77074a12831539d54db65149684490870..53a4d12c615955868fc3db79d2ff92a2dd36bf9e 100644
(file)
--- a/
src/src/globals.c
+++ b/
src/src/globals.c
@@
-16,23
+16,23
@@
data blocks and hence have the opt_public flag set. */
optionlist optionlist_auths[] = {
{ "client_condition", opt_stringptr | opt_public,
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,
{ "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,
{ "driver", opt_stringptr | opt_public,
-
(void *)(offsetof(auth_instance, driver_name)
) },
+
OPT_OFF(auth_instance, driver_name
) },
{ "public_name", opt_stringptr | opt_public,
{ "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,
{ "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,
{ "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,
{ "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,
{ "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,
{ "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);
};
int optionlist_auths_size = nelem(optionlist_auths);
@@
-238,6
+238,7
@@
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
#ifdef SUPPORT_DMARC
.dmarc_has_been_checked = FALSE,
#endif
#ifdef SUPPORT_DMARC
.dmarc_has_been_checked = 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,
-#if
def SUPPORT
_PIPE_CONNECT
+#if
ndef DISABLE
_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,
@@
-311,6
+312,7
@@
struct global_flags f =
.synchronous_delivery = FALSE,
.system_filtering = FALSE,
.synchronous_delivery = FALSE,
.system_filtering = FALSE,
+ .taint_check_slow = FALSE,
.tcp_fastopen_ok = FALSE,
.tcp_in_fastopen = FALSE,
.tcp_in_fastopen_data = FALSE,
.tcp_fastopen_ok = FALSE,
.tcp_in_fastopen = FALSE,
.tcp_in_fastopen_data = FALSE,
@@
-572,7
+574,7
@@
address_item address_defaults = {
.localpart_cache = { 0 }, /* localpart_cache - ditto */
.mode = -1,
.more_errno = 0,
.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,
.basic_errno = ERRNO_UNKNOWNERROR,
.child_count = 0,
.return_file = -1,
@@
-816,6
+818,7
@@
uschar *deliver_localpart_orig = NULL;
uschar *deliver_localpart_parent = NULL;
uschar *deliver_localpart_prefix = NULL;
uschar *deliver_localpart_suffix = NULL;
uschar *deliver_localpart_parent = NULL;
uschar *deliver_localpart_prefix = NULL;
uschar *deliver_localpart_suffix = NULL;
+uschar *deliver_localpart_verified = NULL;
uschar *deliver_out_buffer = NULL;
int deliver_queue_load_max = -1;
address_item *deliver_recipients = NULL;
uschar *deliver_out_buffer = NULL;
int deliver_queue_load_max = -1;
address_item *deliver_recipients = NULL;
@@
-830,7
+833,7
@@
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_hashes = US"sha256:sha512";
uschar *dkim_verify_keytypes = US"ed25519:rsa";
BOOL dkim_verify_minimal = FALSE;
uschar *dkim_verify_overall = NULL;
uschar *dkim_verify_keytypes = US"ed25519:rsa";
BOOL dkim_verify_minimal = FALSE;
uschar *dkim_verify_overall = NULL;
@@
-844,7
+847,7
@@
uschar *dmarc_forensic_sender = NULL;
uschar *dmarc_history_file = NULL;
uschar *dmarc_status = NULL;
uschar *dmarc_status_text = 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
uschar *dmarc_used_domain = NULL;
#endif
@@
-1167,7
+1170,7
@@
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->";
-#if
def SUPPORT
_PIPE_CONNECT
+#if
ndef DISABLE
_PIPE_CONNECT
uschar *pipe_connect_advertise_hosts = US"*";
#endif
uschar *pipelining_advertise_hosts = US"*";
uschar *pipe_connect_advertise_hosts = US"*";
#endif
uschar *pipelining_advertise_hosts = US"*";
@@
-1194,6
+1197,7
@@
uschar *qualify_domain_sender = NULL;
uschar *queue_domains = NULL;
int queue_interval = -1;
uschar *queue_name = US"";
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";
uschar *queue_only_file = NULL;
int queue_only_load = -1;
uschar *queue_run_max = US"5";
@@
-1232,6
+1236,7
@@
uschar *received_header_text = US
"by $primary_hostname "
"${if def:received_protocol {with $received_protocol }}"
#ifndef DISABLE_TLS
"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"
"${if def:tls_in_cipher_std { tls $tls_in_cipher_std\n\t}}"
#endif
"(Exim $version_number)\n\t"
@@
-1257,7
+1262,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;
-#if
def SUPPORT
_PIPE_CONNECT
+#if
ndef DISABLE
_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;
@@
-1497,6
+1502,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;