From ead26ec905902addcf614cd56f0a980b04e59ce5 Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Thu, 16 Nov 2017 03:28:29 +0000
Subject: [PATCH] Insure that bounce messages have a message-ID.
---
src/sbbs3/mailsrvr.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/sbbs3/mailsrvr.c b/src/sbbs3/mailsrvr.c
index badf9a8dcc..43fcd56812 100644
--- a/src/sbbs3/mailsrvr.c
+++ b/src/sbbs3/mailsrvr.c
@@ -4358,6 +4358,7 @@ BOOL bounce(SOCKET sock, smb_t* smb, smbmsg_t* msg, char* err, BOOL immediate)
{
char str[128];
char attempts[64];
+ char msgid[256];
int i;
ushort agent=AGENT_SMTPSYSMSG;
smbmsg_t newmsg;
@@ -4431,6 +4432,7 @@ BOOL bounce(SOCKET sock, smb_t* smb, smbmsg_t* msg, char* err, BOOL immediate)
strcpy(str,"Mail Delivery Subsystem");
smb_hfield_str(&newmsg, SENDER, str);
smb_hfield(&newmsg, SENDERAGENT, sizeof(agent), &agent);
+ smb_hfield_str(&newmsg, RFC822MSGID, get_msgid(&scfg, INVALID_SUB, &newmsg, msgid, sizeof(msgid)));
/* Put error message in subject for now */
if(msg->hdr.delivery_attempts>1)
--
GitLab