Generate Message-ID's that will not be reused/repeated if Citadel server is reinstall...

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 17b440db695c6ac1863934f94f14701e251a416b..e9c5c338d26b75293c943f4558e4427b9ea9c190 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -2755,7 +2755,11 @@ long send_message(struct CtdlMessage *msg) {
 
        /* Get a new message number */
        newmsgid = get_new_message_number();
-       snprintf(msgidbuf, sizeof msgidbuf, "%010ld@%s", newmsgid, config.c_fqdn);
+       snprintf(msgidbuf, sizeof msgidbuf, "%08lX-%08lX@%s",
+               (long unsigned int) time(NULL),
+               (long unsigned int) newmsgid,
+               config.c_fqdn
+       );
 
        /* Generate an ID if we don't have one already */
        if (msg->cm_fields['I']==NULL) {