projects
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DANE: smtp transport option dane_require_tls_ciphers
[exim.git]
/
src
/
src
/
deliver.c
diff --git
a/src/src/deliver.c
b/src/src/deliver.c
index 05fd3ce6d3b6a47083b446779bdceab272db8446..34f36cd334c0c8e477e70cfdcd85815a909243a1 100644
(file)
--- a/
src/src/deliver.c
+++ b/
src/src/deliver.c
@@
-2,7
+2,7
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 201
7
*/
+/* Copyright (c) University of Cambridge 1995 - 201
8
*/
/* See the file NOTICE for conditions of use and distribution. */
/* The main code for delivering a message. */
/* See the file NOTICE for conditions of use and distribution. */
/* The main code for delivering a message. */
@@
-817,7
+817,7
@@
if (LOGGING(tls_certificate_verified) && addr->cipher)
s = string_append(s, 2, US" CV=",
testflag(addr, af_cert_verified)
?
s = string_append(s, 2, US" CV=",
testflag(addr, af_cert_verified)
?
-#ifdef
EXPERIMENTAL
_DANE
+#ifdef
SUPPORT
_DANE
testflag(addr, af_dane_verified)
? "dane"
:
testflag(addr, af_dane_verified)
? "dane"
:
@@
-1619,7
+1619,7
@@
if (result == OK)
tls_out.cipher = addr->cipher;
tls_out.peerdn = addr->peerdn;
tls_out.ocsp = addr->ocsp;
tls_out.cipher = addr->cipher;
tls_out.peerdn = addr->peerdn;
tls_out.ocsp = addr->ocsp;
-# ifdef
EXPERIMENTAL
_DANE
+# ifdef
SUPPORT
_DANE
tls_out.dane_verified = testflag(addr, af_dane_verified);
# endif
#endif
tls_out.dane_verified = testflag(addr, af_dane_verified);
# endif
#endif
@@
-1632,7
+1632,7
@@
if (result == OK)
tls_out.cipher = NULL;
tls_out.peerdn = NULL;
tls_out.ocsp = OCSP_NOT_REQ;
tls_out.cipher = NULL;
tls_out.peerdn = NULL;
tls_out.ocsp = OCSP_NOT_REQ;
-# ifdef
EXPERIMENTAL
_DANE
+# ifdef
SUPPORT
_DANE
tls_out.dane_verified = FALSE;
# endif
#endif
tls_out.dane_verified = FALSE;
# endif
#endif
@@
-4785,7
+4785,7
@@
all pipes, so I do not see a reason to use non-blocking IO here
/* The certificate verification status goes into the flags */
if (tls_out.certificate_verified) setflag(addr, af_cert_verified);
/* The certificate verification status goes into the flags */
if (tls_out.certificate_verified) setflag(addr, af_cert_verified);
-#ifdef
EXPERIMENTAL
_DANE
+#ifdef
SUPPORT
_DANE
if (tls_out.dane_verified) setflag(addr, af_dane_verified);
#endif
if (tls_out.dane_verified) setflag(addr, af_dane_verified);
#endif
@@
-4988,7
+4988,7
@@
all pipes, so I do not see a reason to use non-blocking IO here
if (cutthrough.fd >= 0 && cutthrough.callout_hold_only)
{
#ifdef SUPPORT_TLS
if (cutthrough.fd >= 0 && cutthrough.callout_hold_only)
{
#ifdef SUPPORT_TLS
- tls_close(FALSE,
FALSE
);
+ tls_close(FALSE,
TLS_NO_SHUTDOWN
);
#endif
(void) close(cutthrough.fd);
release_cutthrough_connection(US"passed to transport proc");
#endif
(void) close(cutthrough.fd);
release_cutthrough_connection(US"passed to transport proc");
@@
-6150,7
+6150,7
@@
if (process_recipients != RECIP_IGNORE)
new->dsn_flags = r->dsn_flags & rf_dsnflags;
new->dsn_orcpt = r->orcpt;
DEBUG(D_deliver) debug_printf("DSN: set orcpt: %s flags: %d\n",
new->dsn_flags = r->dsn_flags & rf_dsnflags;
new->dsn_orcpt = r->orcpt;
DEBUG(D_deliver) debug_printf("DSN: set orcpt: %s flags: %d\n",
- new->dsn_orcpt, new->dsn_flags);
+ new->dsn_orcpt
? new->dsn_orcpt : US""
, new->dsn_flags);
switch (process_recipients)
{
switch (process_recipients)
{
@@
-7219,11
+7219,12
@@
for (addr_dsntmp = addr_succeed; addr_dsntmp; addr_dsntmp = addr_dsntmp->next)
"DSN: envid: %s ret: %d\n"
"DSN: Final recipient: %s\n"
"DSN: Remote SMTP server supports DSN: %d\n",
"DSN: envid: %s ret: %d\n"
"DSN: Final recipient: %s\n"
"DSN: Remote SMTP server supports DSN: %d\n",
- addr_dsntmp->router
->name
,
+ addr_dsntmp->router
? addr_dsntmp->router->name : US"(unknown)"
,
addr_dsntmp->address,
sender_address,
addr_dsntmp->address,
sender_address,
- addr_dsntmp->dsn_orcpt, addr_dsntmp->dsn_flags,
- dsn_envid, dsn_ret,
+ addr_dsntmp->dsn_orcpt ? addr_dsntmp->dsn_orcpt : US"NULL",
+ addr_dsntmp->dsn_flags,
+ dsn_envid ? dsn_envid : US"NULL", dsn_ret,
addr_dsntmp->address,
addr_dsntmp->dsn_aware
);
addr_dsntmp->address,
addr_dsntmp->dsn_aware
);