From ea94936338fc5d50845a523ad4ac63d6a024454f Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Wed, 28 Oct 2009 19:38:49 +0000
Subject: [PATCH] Fix initialization of SPAM database retry_time value (was 0)
 and log an error if/when the SPAM database open fails.

---
 src/sbbs3/mailsrvr.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/sbbs3/mailsrvr.c b/src/sbbs3/mailsrvr.c
index 333a0d0810..ad5cd7e6ea 100644
--- a/src/sbbs3/mailsrvr.c
+++ b/src/sbbs3/mailsrvr.c
@@ -2367,6 +2367,8 @@ static void smtp_thread(void* arg)
 		return;
 	}
 	SAFEPRINTF(spam.file,"%sspam",scfg.data_dir);
+	spam.retry_time=scfg.smb_retry_time;
+	spam.subnum=INVALID_SUB;
 
 	srand(time(NULL) ^ (DWORD)GetCurrentThreadId());	/* seed random number generator */
 	rand();	/* throw-away first result */
@@ -2869,7 +2871,10 @@ static void smtp_thread(void* arg)
 									,str, host_name, host_ip, rcpt_addr, reverse_path);
 								is_spam=TRUE;
 							}
-						}
+						} else if(i!=SMB_ERR_NOT_FOUND)
+							lprintf(LOG_ERR,"%04d !SMTP ERROR %d (%s) opening SPAM database"
+								,socket, i, spam.last_error);
+						
 						if(is_spam) {
 							size_t	n,total=0;
 							for(n=0;hashes[n]!=NULL;n++)
-- 
GitLab