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 de1149b6cd4e61fe41638e2d9ac8e20da80b8e0b..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);
@@
-312,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,
@@
-573,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,
@@
-817,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;
@@
-845,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