From 3fea471a4716424afc06b5309fe046f710609e4e Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Wed, 15 Nov 2000 13:19:03 +0000
Subject: [PATCH] Added startup option (MAIL_OPT_NO_SENDMAIIL) to disable
SendMail thread. This allows multiple instances with only one instance
handling mail sends.
---
src/sbbs3/mailsrvr.c | 3 ++-
src/sbbs3/mailsrvr.h | 11 ++++++-----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/sbbs3/mailsrvr.c b/src/sbbs3/mailsrvr.c
index 222122e65a..e39577e12a 100644
--- a/src/sbbs3/mailsrvr.c
+++ b/src/sbbs3/mailsrvr.c
@@ -2471,7 +2471,8 @@ void DLLCALL mail_server(void* arg)
if(startup->started!=NULL)
startup->started();
- _beginthread (sendmail_thread, 0, NULL);
+ if(!(startup->options&MAIL_OPT_NO_SENDMAIL))
+ _beginthread (sendmail_thread, 0, NULL);
lprintf("%04d Mail Server thread started",server_socket);
status(STATUS_WFC);
diff --git a/src/sbbs3/mailsrvr.h b/src/sbbs3/mailsrvr.h
index 979686999a..f865dd489f 100644
--- a/src/sbbs3/mailsrvr.h
+++ b/src/sbbs3/mailsrvr.h
@@ -92,14 +92,15 @@ typedef struct {
#define MAIL_OPT_ALLOW_POP3 (1<<2)
#define MAIL_OPT_DEBUG_TX (1<<3)
#define MAIL_OPT_DEBUG_RX_RSP (1<<4)
-#define MAIL_OPT_RELAY_TX (1<<5)
+#define MAIL_OPT_RELAY_TX (1<<5) /* Use SMTP relay server */
#define MAIL_OPT_DEBUG_POP3 (1<<6)
-#define MAIL_OPT_ALLOW_RX_BY_NUMBER (1<<7)
-#define MAIL_OPT_USE_RBL (1<<8)
+#define MAIL_OPT_ALLOW_RX_BY_NUMBER (1<<7) /* Allow mail sent to user # */
+#define MAIL_OPT_USE_RBL (1<<8) /* SPAM filters */
#define MAIL_OPT_USE_DUL (1<<9)
#define MAIL_OPT_USE_RSS (1<<10)
-#define MAIL_OPT_NO_HOST_LOOKUP (1<<11)
-#define MAIL_OPT_USE_TCP_DNS (1<<12)
+#define MAIL_OPT_NO_HOST_LOOKUP (1<<11) /* Don't look-up hostnames */
+#define MAIL_OPT_USE_TCP_DNS (1<<12) /* Use TCP vs UDP for DNS req */
+#define MAIL_OPT_NO_SENDMAIL (1<<13) /* Don't run SendMail thread */
#define MAIL_OPT_MUTE (1<<31)
#ifdef DLLEXPORT
--
GitLab