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
Experimental: ESMTP LIMITS extension
[exim.git]
/
src
/
src
/
deliver.c
diff --git
a/src/src/deliver.c
b/src/src/deliver.c
index ef6eb22e2037cd19a8510ece30c6206d83d84e98..9ebd281fca33d32ba750050d28355d0688bef00f 100644
(file)
--- a/
src/src/deliver.c
+++ b/
src/src/deliver.c
@@
-1269,8
+1269,8
@@
if ( LOGGING(smtp_confirmation)
/* Time on queue and actual time taken to deliver */
if (LOGGING(queue_time))
/* Time on queue and actual time taken to deliver */
if (LOGGING(queue_time))
- g = string_append(g, 2, US" QT=",
-
string_timesince(
&received_time));
+ g = string_append(g, 2, US" QT=",
string_timesince(
+
LOGGING(queue_time_exclusive) ? &received_time_complete :
&received_time));
if (LOGGING(deliver_time))
g = string_append(g, 2, US" DT=", string_timediff(&addr->delivery_time));
if (LOGGING(deliver_time))
g = string_append(g, 2, US" DT=", string_timediff(&addr->delivery_time));
@@
-8570,6
+8570,9
@@
f.tcp_fastopen_ok = TRUE;
+/* Called from a commandline, or from the daemon, to do a delivery.
+We need to regain privs; do this by exec of the exim binary. */
+
void
delivery_re_exec(int exec_type)
{
void
delivery_re_exec(int exec_type)
{