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
Debug: process exits
[exim.git]
/
src
/
exim_monitor
/
em_log.c
diff --git
a/src/exim_monitor/em_log.c
b/src/exim_monitor/em_log.c
index 55925d78629494e09fa2169702cc8883f5b7c22f..55dad0bae24b23d8e6ca3fd4b42017f7508afa1e 100644
(file)
--- a/
src/exim_monitor/em_log.c
+++ b/
src/exim_monitor/em_log.c
@@
-2,8
+2,8
@@
* Exim Monitor *
*************************************************/
* Exim Monitor *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2021 - 2024 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainters 2021 - 2022 */
/* See the file NOTICE for conditions of use and distribution. */
/* SPDX-License-Identifier: GPL-2.0-or-later */
/* See the file NOTICE for conditions of use and distribution. */
/* SPDX-License-Identifier: GPL-2.0-or-later */
@@
-108,7
+108,9
@@
length = Ustrlen(buffer);
#ifdef ANONYMIZE
{
uschar *p = buffer + 9;
#ifdef ANONYMIZE
{
uschar *p = buffer + 9;
- if (p[6] == '-' && p[13] == '-') p += 17;
+ if ( p[MESSAGE_ID_TIME_LEN] == '-'
+ && p[MESSAGE_ID_TIME_LEN + MESSAGE_ID_PID_LEN + 1] == '-')
+ p += MESSAGE_ID_LENGTH + 1;
while (p < buffer + length)
{
while (p < buffer + length)
{
@@
-292,7
+294,7
@@
if (LOG != NULL)
if ((p = Ustrstr(buffer, "==")) != NULL)
{
if ((p = Ustrstr(buffer, "==")) != NULL)
{
- queue_item *qq = find_queue(id, queue_noop, 0);
+ queue_item *
qq = find_queue(id, queue_noop, 0);
if (qq)
{
dest_item *d;
if (qq)
{
dest_item *d;
@@
-300,14
+302,12
@@
if (LOG != NULL)
p += 2;
while (isspace(*p)) p++;
q = p;
p += 2;
while (isspace(*p)) p++;
q = p;
- while (*p
!= 0
&& !isspace(*p))
+ while (*p && !isspace(*p))
{
if (*p++ != '\"') continue;
{
if (*p++ != '\"') continue;
- while (*p != 0)
- {
+ while (*p)
if (*p == '\\') p += 2;
if (*p == '\\') p += 2;
- else if (*p++ == '\"') break;
- }
+ else if (*p++ == '\"') break;
}
*p++ = 0;
if ((r = strstric(q, qualify_domain, FALSE)) != NULL &&
}
*p++ = 0;
if ((r = strstric(q, qualify_domain, FALSE)) != NULL &&