Added advanced mail server option to over-ride "in-transit" message attribute

on outgoing mail (send anyway).

src/sbbs3/mailsrvr.c

@@ -3339,7 +3339,7 @@ static void sendmail_thread(void* arg)
 				smb_unlockmsghdr(&smb,&msg);
 				continue;
 			}
-			if(msg.hdr.netattr&MSG_INTRANSIT) {
+			if(!(startup->options&MAIL_OPT_SEND_INTRANSIT) && msg.hdr.netattr&MSG_INTRANSIT) {
 				smb_unlockmsghdr(&smb,&msg);
 				lprintf(LOG_ERR,"0000 SEND Message #%lu from %s to %s - in transit"
 					,msg.hdr.number, msg.from, msg.to_net.addr);

src/sbbs3/mailsrvr.h

@@ -113,6 +113,7 @@ typedef struct {
 #define MAIL_OPT_DNSBL_CHKRECVHDRS	(1<<18)	/* Check all Recieved: from addresses */
 #define MAIL_OPT_DNSBL_DEBUG		(1<<20) /* Debug DNSBL activity */
 #define MAIL_OPT_SMTP_AUTH_VIA_IP	(1<<21)	/* Allow SMTP authentication via IP */
+#define MAIL_OPT_SEND_INTRANSIT		(1<<22)	/* Send mail, even if already "in transit" */
 #define MAIL_OPT_NO_RECYCLE			(1<<27)	/* Disable recycling of server		*/
 #define MAIL_OPT_LOCAL_TIMEZONE		(1<<30)	/* Don't force UTC/GMT */
 #define MAIL_OPT_MUTE				(1<<31)

src/sbbs3/sbbs_ini.c

@@ -123,6 +123,7 @@ static ini_bitdesc_t mail_options[] = {
 	{ MAIL_OPT_DNSBL_BADUSER		,"DNSBL_BADUSER"		},
 	{ MAIL_OPT_DNSBL_DEBUG			,"DNSBL_DEBUG"			},
 	{ MAIL_OPT_DNSBL_CHKRECVHDRS	,"DNSBL_CHKRECVHDRS"	},
+	{ MAIL_OPT_SEND_INTRANSIT		,"SEND_INTRANSIT"		},
 	{ MAIL_OPT_NO_RECYCLE			,"NO_RECYCLE"			},
 	{ MAIL_OPT_LOCAL_TIMEZONE		,"LOCAL_TIMEZONE"		},
 	{ MAIL_OPT_MUTE					,"MUTE"					},