From 12a67d7e86556f5c9232509be8060a700e63253d Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Wed, 9 Jul 2003 19:29:53 +0000
Subject: [PATCH] Don't filter spam bait takers that are already in a DNS
blacklist. Immediately disconnect spam bait takers.
---
src/sbbs3/mailsrvr.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/sbbs3/mailsrvr.c b/src/sbbs3/mailsrvr.c
index ecdb55f09a..fe67c19ec8 100644
--- a/src/sbbs3/mailsrvr.c
+++ b/src/sbbs3/mailsrvr.c
@@ -2463,11 +2463,14 @@ static void smtp_thread(void* arg)
sprintf(str,"SPAM BAIT (%s) taken", rcpt_addr);
lprintf("%04d !SMTP %s by: %s"
,socket, str, reverse_path);
- spamlog(&scfg, "SMTP", "REFUSED and FILTERED", str
+ strcpy(tmp,"REFUSED");
+ if(dnsbl_result.s_addr==0) { /* Don't double-filter */
+ filter_ip(&scfg, "SMTP", str, host_ip, reverse_path);
+ strcat(tmp," and FILTERED");
+ }
+ spamlog(&scfg, "SMTP", tmp, "Spam Bait Taken"
,host_name, host_ip, rcpt_addr, reverse_path);
- filter_ip(&scfg, "SMTP", str, host_ip, reverse_path);
- sockprintf(socket, "550 Unknown User:%s", buf+8);
- continue;
+ break;
}
/* Check for blocked recipients */
--
GitLab