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
Fix taint trap in parse_fix_phrase(). Bug 2617
[exim.git]
/
src
/
src
/
receive.c
diff --git
a/src/src/receive.c
b/src/src/receive.c
index f22816920da93f3bf72460add13cd48de066c06b..76b4d378db6de573c9fed674b46684b18c3551c6 100644
(file)
--- a/
src/src/receive.c
+++ b/
src/src/receive.c
@@
-3,6
+3,7
@@
*************************************************/
/* Copyright (c) University of Cambridge 1995 - 2018 */
*************************************************/
/* Copyright (c) University of Cambridge 1995 - 2018 */
+/* Copyright (c) The Exim Maintainers 2020 */
/* See the file NOTICE for conditions of use and distribution. */
/* Code for receiving a message and setting up spool files. */
/* See the file NOTICE for conditions of use and distribution. */
/* Code for receiving a message and setting up spool files. */
@@
-1783,7
+1784,7
@@
if (sender_host_address) dmarc_init(); /* initialize libopendmarc */
ids, and fractions of a second are required. See the comments that precede the
message id creation below. */
ids, and fractions of a second are required. See the comments that precede the
message id creation below. */
-
(void)gettimeofday(&message_id_tv, NULL
);
+
exim_gettime(&message_id_tv
);
/* For other uses of the received time we can operate with granularity of one
second, and for that we use the global variable received_time. This is for
/* For other uses of the received time we can operate with granularity of one
second, and for that we use the global variable received_time. This is for
@@
-3993,7
+3994,7
@@
g = add_host_info_for_log(g);
if (LOGGING(tls_cipher) && tls_in.cipher)
{
g = string_append(g, 2, US" X=", tls_in.cipher);
if (LOGGING(tls_cipher) && tls_in.cipher)
{
g = string_append(g, 2, US" X=", tls_in.cipher);
-# if
def EXPERIMENTAL
_TLS_RESUME
+# if
ndef DISABLE
_TLS_RESUME
if (LOGGING(tls_resumption) && tls_in.resumption & RESUME_USED)
g = string_catn(g, US"*", 1);
# endif
if (LOGGING(tls_resumption) && tls_in.resumption & RESUME_USED)
g = string_catn(g, US"*", 1);
# endif