Eximon: handle new-format message IDs

Broken-by: 46a36afae4

diff --git a/src/exim_monitor/em_hdr.h b/src/exim_monitor/em_hdr.h
index feffa6bfc5b21de46b28270f52b7d91b310797fc..f79686a8062380ec38a819c1a4551248aa8bba34 100644 (file)
--- a/src/exim_monitor/em_hdr.h
+++ b/src/exim_monitor/em_hdr.h
@@ -190,7 +190,7 @@ typedef struct queue_item {
   int  update_time;
   int  size;
   uschar *sender;
-  uschar name[17];
+  uschar name[MESSAGE_ID_LENGTH + 1];
   uschar seen;
   uschar frozen;
   uschar dir_char;

diff --git a/src/exim_monitor/em_log.c b/src/exim_monitor/em_log.c
index 55925d78629494e09fa2169702cc8883f5b7c22f..fbcb6b1c01eed86a0038887fb358df0ec12ff19c 100644 (file)
--- a/src/exim_monitor/em_log.c
+++ b/src/exim_monitor/em_log.c
@@ -108,7 +108,9 @@ length = Ustrlen(buffer);
 #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)
     {