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
TLS: Session resumption, under the EXPERIMENTAL_TLS_RESUME build option.
[exim.git]
/
src
/
src
/
deliver.c
diff --git
a/src/src/deliver.c
b/src/src/deliver.c
index 071187942629cdacb081480a2edc24a8fa2b2e7a..f79522d8e8a948c82f81529b5111b6f949694b63 100644
(file)
--- a/
src/src/deliver.c
+++ b/
src/src/deliver.c
@@
-347,7
+347,7
@@
for (int i = 2; i > 0; i--)
#ifndef O_CLOEXEC
(void)fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
#endif
#ifndef O_CLOEXEC
(void)fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
#endif
- if (
fchown(fd, exim_uid, exim_gid
) < 0)
+ if (
exim_fchown(fd, exim_uid, exim_gid, filename
) < 0)
{
*error = US"chown";
return -1;
{
*error = US"chown";
return -1;
@@
-367,7
+367,7
@@
for (int i = 2; i > 0; i--)
MSGLOG_DIRECTORY_MODE, TRUE);
}
MSGLOG_DIRECTORY_MODE, TRUE);
}
-*error = US"create";
+*error = US"create
or open
";
return -1;
}
return -1;
}
@@
-803,12
+803,18
@@
return g;
#ifdef SUPPORT_TLS
static gstring *
#ifdef SUPPORT_TLS
static gstring *
-d_tlslog(gstring *
s
, address_item * addr)
+d_tlslog(gstring *
g
, address_item * addr)
{
if (LOGGING(tls_cipher) && addr->cipher)
{
if (LOGGING(tls_cipher) && addr->cipher)
- s = string_append(s, 2, US" X=", addr->cipher);
+ {
+ g = string_append(g, 2, US" X=", addr->cipher);
+#ifdef EXPERIMENTAL_TLS_RESUME
+ if (LOGGING(tls_resumption) && testflag(addr, af_tls_resume))
+ g = string_catn(g, US"*", 1);
+#endif
+ }
if (LOGGING(tls_certificate_verified) && addr->cipher)
if (LOGGING(tls_certificate_verified) && addr->cipher)
-
s = string_append(s
, 2, US" CV=",
+
g = string_append(g
, 2, US" CV=",
testflag(addr, af_cert_verified)
?
#ifdef SUPPORT_DANE
testflag(addr, af_cert_verified)
?
#ifdef SUPPORT_DANE
@@
-819,8
+825,8
@@
if (LOGGING(tls_certificate_verified) && addr->cipher)
"yes"
: "no");
if (LOGGING(tls_peerdn) && addr->peerdn)
"yes"
: "no");
if (LOGGING(tls_peerdn) && addr->peerdn)
-
s = string_append(s
, 3, US" DN=\"", string_printing(addr->peerdn), US"\"");
-return
s
;
+
g = string_append(g
, 3, US" DN=\"", string_printing(addr->peerdn), US"\"");
+return
g
;
}
#endif
}
#endif
@@
-2900,7
+2906,7
@@
while (addr_local)
of these checks, rather than for all local deliveries, because some local
deliveries (e.g. to pipes) can take a substantial time. */
of these checks, rather than for all local deliveries, because some local
deliveries (e.g. to pipes) can take a substantial time. */
- if (!(dbm_file = dbfn_open(US"retry", O_RDONLY, &dbblock, FALSE)))
+ if (!(dbm_file = dbfn_open(US"retry", O_RDONLY, &dbblock, FALSE
, TRUE
)))
{
DEBUG(D_deliver|D_retry|D_hints_lookup)
debug_printf("no retry data available\n");
{
DEBUG(D_deliver|D_retry|D_hints_lookup)
debug_printf("no retry data available\n");
@@
-4794,6
+4800,9
@@
all pipes, so I do not see a reason to use non-blocking IO here
#ifdef SUPPORT_DANE
if (tls_out.dane_verified) setflag(addr, af_dane_verified);
#endif
#ifdef SUPPORT_DANE
if (tls_out.dane_verified) setflag(addr, af_dane_verified);
#endif
+# ifdef EXPERIMENTAL_TLS_RESUME
+ if (tls_out.resumption & RESUME_USED) setflag(addr, af_tls_resume);
+# endif
/* Use an X item only if there's something to send */
#ifdef SUPPORT_TLS
/* Use an X item only if there's something to send */
#ifdef SUPPORT_TLS
@@
-6321,7
+6330,7
@@
while (addr_new) /* Loop until all addresses dealt with */
/* Failure to open the retry database is treated the same as if it does
not exist. In both cases, dbm_file is NULL. */
/* Failure to open the retry database is treated the same as if it does
not exist. In both cases, dbm_file is NULL. */
- if (!(dbm_file = dbfn_open(US"retry", O_RDONLY, &dbblock, FALSE)))
+ if (!(dbm_file = dbfn_open(US"retry", O_RDONLY, &dbblock, FALSE
, TRUE
)))
DEBUG(D_deliver|D_retry|D_route|D_hints_lookup)
debug_printf("no retry data available\n");
DEBUG(D_deliver|D_retry|D_route|D_hints_lookup)
debug_printf("no retry data available\n");
@@
-7072,7
+7081,7
@@
if (addr_local || addr_remote)
that the mode is correct - the group setting doesn't always seem to get
set automatically. */
that the mode is correct - the group setting doesn't always seem to get
set automatically. */
- if(
fchown(journal_fd, exim_uid, exim_gid
)
+ if(
exim_fchown(journal_fd, exim_uid, exim_gid, fname
)
|| fchmod(journal_fd, SPOOL_MODE)
#ifndef O_CLOEXEC
|| fcntl(journal_fd, F_SETFD, fcntl(journal_fd, F_GETFD) | FD_CLOEXEC)
|| fchmod(journal_fd, SPOOL_MODE)
#ifndef O_CLOEXEC
|| fcntl(journal_fd, F_SETFD, fcntl(journal_fd, F_GETFD) | FD_CLOEXEC)
@@
-8507,11
+8516,6
@@
if (!regex_AUTH) regex_AUTH =
#ifdef SUPPORT_TLS
if (!regex_STARTTLS) regex_STARTTLS =
regex_must_compile(US"\\n250[\\s\\-]STARTTLS(\\s|\\n|$)", FALSE, TRUE);
#ifdef SUPPORT_TLS
if (!regex_STARTTLS) regex_STARTTLS =
regex_must_compile(US"\\n250[\\s\\-]STARTTLS(\\s|\\n|$)", FALSE, TRUE);
-
-# ifdef EXPERIMENTAL_REQUIRETLS
-if (!regex_REQUIRETLS) regex_REQUIRETLS =
- regex_must_compile(US"\\n250[\\s\\-]REQUIRETLS(\\s|\\n|$)", FALSE, TRUE);
-# endif
#endif
if (!regex_CHUNKING) regex_CHUNKING =
#endif
if (!regex_CHUNKING) regex_CHUNKING =