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
$local_part_verified
[exim.git]
/
src
/
src
/
globals.c
diff --git
a/src/src/globals.c
b/src/src/globals.c
index 87ff2e65fca05feb2de42f7caed90671b8277555..edd1edbbc9eb40fe78a6b19403bd48136c75d78c 100644
(file)
--- a/
src/src/globals.c
+++ b/
src/src/globals.c
@@
-573,7
+573,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
+817,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;
@@
-831,7
+832,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;
@@
-845,7
+846,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
@@
-1195,6
+1196,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";
@@
-1233,6
+1235,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"
@@
-1363,7
+1366,7
@@
router_instance router_defaults = {
.pass_router = NULL,
.redirect_router = NULL,
.pass_router = NULL,
.redirect_router = NULL,
- .dnssec =
{ NULL, NULL }, /* dnssec_domains {require,request} */
+ .dnssec =
{ .request= US"*", .require=NULL },
};
uschar *router_name = NULL;
};
uschar *router_name = NULL;