X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/9e4a64fd7c67f4a838ca588ee62c81227bdee9f2..46a36afae41f63de654269c8a0b7cf5852a85a14:/src/src/exim.c

diff --git a/src/src/exim.c b/src/src/exim.c
index 06863347d..94061f97d 100644
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -2022,7 +2022,14 @@ this here, because the -M options check their arguments for syntactic validity
 using mac_ismsgid, which uses this. */
 
 regex_ismsgid =
-  regex_must_compile(US"^(?:[^\\W_]{6}-){2}[^\\W_]{2}$", MCS_NOFLAGS, TRUE);
+  regex_must_compile(US"^(?:"
+	  "[^\\W_]{" str(MESSAGE_ID_TIME_LEN) "}"
+	  "-[^\\W_]{" str(MESSAGE_ID_PID_LEN) "}"
+	  "-[^\\W_]{" str(MESSAGE_ID_SUBTIME_LEN) "}"
+	"|"
+	  "(?:[^\\W_]{6}-){2}[^\\W_]{2}"		/* old ID format */
+	")$",
+    MCS_NOFLAGS, TRUE);
 
 /* Precompile the regular expression that is used for matching an SMTP error
 code, possibly extended, at the start of an error message. Note that the