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
Use dsn_from for success-DSN messages. Bug 2404
[exim.git]
/
src
/
src
/
deliver.c
diff --git
a/src/src/deliver.c
b/src/src/deliver.c
index c1396a7f7d754384450924733ad8d378f9fbeb37..ada042a24e935e6579bbdc33ccfe10120733862a 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;
}
@@
-801,14
+801,20
@@
return g;
-#if
def SUPPORT
_TLS
+#if
ndef DISABLE
_TLS
static gstring *
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
@@
-1225,7
+1231,7
@@
else
#endif
}
#endif
}
-#if
def SUPPORT
_TLS
+#if
ndef DISABLE
_TLS
g = d_tlslog(g, addr);
#endif
g = d_tlslog(g, addr);
#endif
@@
-1244,7
+1250,7
@@
else
{
if (testflag(addr, af_pipelining))
g = string_catn(g, US" L", 2);
{
if (testflag(addr, af_pipelining))
g = string_catn(g, US" L", 2);
-#ifdef
EXPERIMENTAL
_PIPE_CONNECT
+#ifdef
SUPPORT
_PIPE_CONNECT
if (testflag(addr, af_early_pipe))
g = string_catn(g, US"*", 1);
#endif
if (testflag(addr, af_early_pipe))
g = string_catn(g, US"*", 1);
#endif
@@
-1429,7
+1435,7
@@
if (addr->transport)
if (addr->host_used)
g = d_hostlog(g, addr);
if (addr->host_used)
g = d_hostlog(g, addr);
-#if
def SUPPORT
_TLS
+#if
ndef DISABLE
_TLS
g = d_tlslog(g, addr);
#endif
g = d_tlslog(g, addr);
#endif
@@
-1629,7
+1635,7
@@
if (result == OK)
}
/* Certificates for logging (via events) */
}
/* Certificates for logging (via events) */
-#if
def SUPPORT
_TLS
+#if
ndef DISABLE
_TLS
tls_out.ourcert = addr->ourcert;
addr->ourcert = NULL;
tls_out.peercert = addr->peercert;
tls_out.ourcert = addr->ourcert;
addr->ourcert = NULL;
tls_out.peercert = addr->peercert;
@@
-1645,7
+1651,7
@@
if (result == OK)
delivery_log(LOG_MAIN, addr, logchar, NULL);
delivery_log(LOG_MAIN, addr, logchar, NULL);
-#if
def SUPPORT
_TLS
+#if
ndef DISABLE
_TLS
tls_free_cert(&tls_out.ourcert);
tls_free_cert(&tls_out.peercert);
tls_out.cipher = NULL;
tls_free_cert(&tls_out.ourcert);
tls_free_cert(&tls_out.peercert);
tls_out.cipher = NULL;
@@
-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");
@@
-3499,7
+3505,7
@@
while (!done)
it in with the other info, in order to keep each message short enough to
guarantee it won't be split in the pipe. */
it in with the other info, in order to keep each message short enough to
guarantee it won't be split in the pipe. */
-#if
def SUPPORT
_TLS
+#if
ndef DISABLE
_TLS
case 'X':
if (!addr) goto ADDR_MISMATCH; /* Below, in 'A' handler */
switch (*subid)
case 'X':
if (!addr) goto ADDR_MISMATCH; /* Below, in 'A' handler */
switch (*subid)
@@
-3537,7
+3543,7
@@
while (!done)
}
while (*ptr++);
break;
}
while (*ptr++);
break;
-#endif /*
SUPPORT
_TLS*/
+#endif /*
DISABLE
_TLS*/
case 'C': /* client authenticator information */
switch (*subid)
case 'C': /* client authenticator information */
switch (*subid)
@@
-3558,7
+3564,7
@@
while (!done)
case 'L':
switch (*subid)
{
case 'L':
switch (*subid)
{
-#ifdef
EXPERIMENTAL
_PIPE_CONNECT
+#ifdef
SUPPORT
_PIPE_CONNECT
case 2: setflag(addr, af_early_pipe); /*FALLTHROUGH*/
#endif
case 1: setflag(addr, af_pipelining); break;
case 2: setflag(addr, af_early_pipe); /*FALLTHROUGH*/
#endif
case 1: setflag(addr, af_pipelining); break;
@@
-4794,9
+4800,12
@@
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 */
/* Use an X item only if there's something to send */
-#if
def SUPPORT
_TLS
+#if
ndef DISABLE
_TLS
if (addr->cipher)
{
ptr = big_buffer + sprintf(CS big_buffer, "%.128s", addr->cipher) + 1;
if (addr->cipher)
{
ptr = big_buffer + sprintf(CS big_buffer, "%.128s", addr->cipher) + 1;
@@
-4839,7
+4848,7
@@
all pipes, so I do not see a reason to use non-blocking IO here
rmt_dlv_checked_write(fd, 'X', '4', big_buffer, ptr - big_buffer);
}
# endif
rmt_dlv_checked_write(fd, 'X', '4', big_buffer, ptr - big_buffer);
}
# endif
-#endif /*
SUPPORT
_TLS*/
+#endif /*
DISABLE
_TLS*/
if (client_authenticator)
{
if (client_authenticator)
{
@@
-4863,7
+4872,7
@@
all pipes, so I do not see a reason to use non-blocking IO here
#endif
if (testflag(addr, af_pipelining))
#endif
if (testflag(addr, af_pipelining))
-#ifdef
EXPERIMENTAL
_PIPE_CONNECT
+#ifdef
SUPPORT
_PIPE_CONNECT
if (testflag(addr, af_early_pipe))
rmt_dlv_checked_write(fd, 'L', '2', NULL, 0);
else
if (testflag(addr, af_early_pipe))
rmt_dlv_checked_write(fd, 'L', '2', NULL, 0);
else
@@
-5003,7
+5012,7
@@
all pipes, so I do not see a reason to use non-blocking IO here
if (cutthrough.cctx.sock >= 0 && cutthrough.callout_hold_only)
{
if (cutthrough.cctx.sock >= 0 && cutthrough.callout_hold_only)
{
-#if
def SUPPORT
_TLS
+#if
ndef DISABLE
_TLS
if (cutthrough.is_tls)
tls_close(cutthrough.cctx.tls_ctx, TLS_NO_SHUTDOWN);
#endif
if (cutthrough.is_tls)
tls_close(cutthrough.cctx.tls_ctx, TLS_NO_SHUTDOWN);
#endif
@@
-6235,7
+6244,7
@@
if (process_recipients != RECIP_IGNORE)
}
#ifndef DISABLE_EVENT
}
#ifndef DISABLE_EVENT
- if (process_recipients != RECIP_ACCEPT)
+ if (process_recipients != RECIP_ACCEPT
&& event_action
)
{
uschar * save_local = deliver_localpart;
const uschar * save_domain = deliver_domain;
{
uschar * save_local = deliver_localpart;
const uschar * save_domain = deliver_domain;
@@
-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)
@@
-7333,8
+7342,8
@@
if (addr_senddsn)
if (errors_reply_to)
fprintf(f, "Reply-To: %s\n", errors_reply_to);
if (errors_reply_to)
fprintf(f, "Reply-To: %s\n", errors_reply_to);
+ moan_write_from(f);
fprintf(f, "Auto-Submitted: auto-generated\n"
fprintf(f, "Auto-Submitted: auto-generated\n"
- "From: Mail Delivery System <Mailer-Daemon@%s>\n"
"To: %s\n"
"Subject: Delivery Status Notification\n"
"Content-Type: multipart/report; report-type=delivery-status; boundary=%s\n"
"To: %s\n"
"Subject: Delivery Status Notification\n"
"Content-Type: multipart/report; report-type=delivery-status; boundary=%s\n"
@@
-7345,7
+7354,7
@@
if (addr_senddsn)
"This message was created automatically by mail delivery software.\n"
" ----- The following addresses had successful delivery notifications -----\n",
"This message was created automatically by mail delivery software.\n"
" ----- The following addresses had successful delivery notifications -----\n",
-
qualify_domain_sender,
sender_address, bound, bound);
+ sender_address, bound, bound);
for (addr_dsntmp = addr_senddsn; addr_dsntmp;
addr_dsntmp = addr_dsntmp->next)
for (addr_dsntmp = addr_senddsn; addr_dsntmp;
addr_dsntmp = addr_dsntmp->next)
@@
-8504,7
+8513,7
@@
if (!regex_SIZE) regex_SIZE =
if (!regex_AUTH) regex_AUTH =
regex_must_compile(AUTHS_REGEX, FALSE, TRUE);
if (!regex_AUTH) regex_AUTH =
regex_must_compile(AUTHS_REGEX, FALSE, TRUE);
-#if
def SUPPORT
_TLS
+#if
ndef DISABLE
_TLS
if (!regex_STARTTLS) regex_STARTTLS =
regex_must_compile(US"\\n250[\\s\\-]STARTTLS(\\s|\\n|$)", FALSE, TRUE);
#endif
if (!regex_STARTTLS) regex_STARTTLS =
regex_must_compile(US"\\n250[\\s\\-]STARTTLS(\\s|\\n|$)", FALSE, TRUE);
#endif
@@
-8528,7
+8537,7
@@
if (!regex_DSN) regex_DSN =
if (!regex_IGNOREQUOTA) regex_IGNOREQUOTA =
regex_must_compile(US"\\n250[\\s\\-]IGNOREQUOTA(\\s|\\n|$)", FALSE, TRUE);
if (!regex_IGNOREQUOTA) regex_IGNOREQUOTA =
regex_must_compile(US"\\n250[\\s\\-]IGNOREQUOTA(\\s|\\n|$)", FALSE, TRUE);
-#ifdef
EXPERIMENTAL
_PIPE_CONNECT
+#ifdef
SUPPORT
_PIPE_CONNECT
if (!regex_EARLY_PIPE) regex_EARLY_PIPE =
regex_must_compile(US"\\n250[\\s\\-]" EARLY_PIPE_FEATURE_NAME "(\\s|\\n|$)", FALSE, TRUE);
#endif
if (!regex_EARLY_PIPE) regex_EARLY_PIPE =
regex_must_compile(US"\\n250[\\s\\-]" EARLY_PIPE_FEATURE_NAME "(\\s|\\n|$)", FALSE, TRUE);
#endif
@@
-8594,7
+8603,7
@@
if (cutthrough.cctx.sock >= 0 && cutthrough.callout_hold_only)
smtp_peer_options = cutthrough.peer_options;
continue_sequence = 0;
smtp_peer_options = cutthrough.peer_options;
continue_sequence = 0;
-#if
def SUPPORT
_TLS
+#if
ndef DISABLE
_TLS
if (cutthrough.is_tls)
{
int pfd[2], pid;
if (cutthrough.is_tls)
{
int pfd[2], pid;
@@
-8637,7
+8646,7
@@
else
}
return; /* compiler quietening; control does not reach here. */
}
return; /* compiler quietening; control does not reach here. */
-#if
def SUPPORT
_TLS
+#if
ndef DISABLE
_TLS
fail:
log_write(0,
LOG_MAIN | (exec_type == CEE_EXEC_EXIT ? LOG_PANIC : LOG_PANIC_DIE),
fail:
log_write(0,
LOG_MAIN | (exec_type == CEE_EXEC_EXIT ? LOG_PANIC : LOG_PANIC_DIE),