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
DANE: move to mainline
[exim.git]
/
src
/
src
/
deliver.c
diff --git
a/src/src/deliver.c
b/src/src/deliver.c
index 5c34b929ca7078fef3d7709df328c6398322cb6d..255b4d9c9476db82df36c610fce50e0087e5540a 100644
(file)
--- a/
src/src/deliver.c
+++ b/
src/src/deliver.c
@@
-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