From 0bccc5b8e35a2f56de20182c83aa498626376bd4 Mon Sep 17 00:00:00 2001 From: "Jean-Marc Pigeon (Delson)" Date: Sun, 13 Jul 2025 13:09:43 -0400 Subject: [PATCH] Able to find blacklist remote system --- Makefile | 3 --- app/scarmt.c | 9 +++++++-- conf/blacklister.conf | 5 ++++- lib/subafn.c | 1 + lib/unidns.c | 2 +- sql/datatest.sql | 5 +---- 6 files changed, 14 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index ddb31a7..ec8bfca 100644 --- a/Makefile +++ b/Makefile @@ -192,9 +192,6 @@ newtest : deltest @ mkdir -p $(TESTDIR)/var/spool/$(APPNAME)/queue @ mkdir -p $(TESTDIR)/var/spool/$(APPNAME)/mails @ mkdir -p $(TESTDIR)/usr - @ cp -a \ - bin/* \ - $(TESTDIR)/$(SBINDIR) @ cp -a \ conf/* \ $(TESTDIR)/etc/$(APPNAME) diff --git a/app/scarmt.c b/app/scarmt.c index b34524f..2a7f231 100644 --- a/app/scarmt.c +++ b/app/scarmt.c @@ -74,9 +74,14 @@ while (proceed==true) { while (*dnsbls!=(char *)0) { char *listed; - (void) rou_alert(0,"%s JMPDBG scan <%s> against <%s> result=<%s>", - OPEP,rmtip,*dnsbls,listed); listed=dns_is_blacklisted(*dnsbls,reversip); + if (listed!=(char *)0) { + srv->credit-=10; + if (srv->listing==(char *)0) + srv->listing=strdup(listed); + (void) rou_alert(4,"%s JMPDBG scan <%s> against <%s> result=<%s>", + OPEP,rmtip,*dnsbls,listed); + } listed=rou_freestr(listed); dnsbls++; } diff --git a/conf/blacklister.conf b/conf/blacklister.conf index a8b737e..fa54dc8 100644 --- a/conf/blacklister.conf +++ b/conf/blacklister.conf @@ -1,7 +1,10 @@ #dnsbl.sorbs.net -t1.dnsbl.net.au +#t1.dnsbl.net.au #checked 2025-07-12 by preference order bl.spamcop.net +sbl.spamhaus.org +pbl.spamhaus.org +xbl.spamhaus.org b.barracudacentral.org bl.blocklist.de ips.backscatterer.org diff --git a/lib/subafn.c b/lib/subafn.c index a2d2ca9..22a843f 100644 --- a/lib/subafn.c +++ b/lib/subafn.c @@ -516,6 +516,7 @@ if (afnnum!=(AFNTYP *)0) { (void) snprintf(revers,sizeof(revers),"%d.0.0.0.0.ukn.",afnnum->afntype); break; } + revers[strlen(revers)-1]='\000'; reversip=strdup(revers); } return reversip; diff --git a/lib/unidns.c b/lib/unidns.c index 6b76682..e18b9dc 100644 --- a/lib/unidns.c +++ b/lib/unidns.c @@ -547,7 +547,7 @@ char **txt; char dnsquest[300]; listed=(char *)0; -(void) snprintf(dnsquest,sizeof(dnsquest),"%s%s",reversip,blssite); +(void) snprintf(dnsquest,sizeof(dnsquest),"%s.%s",reversip,blssite); (void) rou_alert(12,"%s, checking <%s>",OPEP,dnsquest); if ((txt=gettxt(dnsquest,T_TXT,"TXT"))!=(char **)0) { (void) rou_asprintf(&listed,"%s -> %s",blssite,txt[0]); diff --git a/sql/datatest.sql b/sql/datatest.sql index 8894854..aa0e57f 100644 --- a/sql/datatest.sql +++ b/sql/datatest.sql @@ -32,10 +32,6 @@ INSERT INTO emails (email,password) \ INSERT INTO remotes (remoteip,credit,lastscan) \ values ('127.127.0.25',10,now()); //--------------------------------------------------------------- -//selected IP from 'known' spammer -INSERT INTO remotes (remoteip) \ - values ('122.175.193.134'); -#ifdef BIGRE INSERT INTO remotes (remoteip) \ values ('27.151.45.98'); INSERT INTO remotes (remoteip) \ @@ -50,6 +46,7 @@ INSERT INTO remotes (remoteip) \ values ('209.85.218.68'); INSERT INTO remotes (remoteip) \ values ('216.246.113.145'); +#ifdef BIGRE #endif //selected IP from from 'clean' server -- 2.47.3