Able to find blacklist remote system

diff --git a/Makefile b/Makefile
index ddb31a797210a7e1200236186a2e16ee791d7c76..ec8bfcaaf2bebf729bf45856972eae6089f958f4 100644 (file)
--- 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 b34524f4cc7c9efc830adaa80bb72cef2f66b801..2a7f231f9c8139fc341b2dcc7abb3c576f817a0b 100644 (file)
--- 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 a8b737ee2c45fe12e8759f9a1a382e079bd725b2..fa54dc86b528fa8442846b821f152006ab24c911 100644 (file)
--- 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 a2d2ca916dfea1c0a5366d1e35420f2112035b11..22a843f4139d5d76a7881aa9de202a3d4f009312 100644 (file)
--- 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 6b766826f348ebe296fa85ce34d8e01da74575c2..e18b9dc9906c82e913ade907b5da2c4e51a0cbd2 100644 (file)
--- 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 8894854c755e417bde6c4f7df6cba247265bb35b..aa0e57f6c885a9ac4fe138511e76dbfaab31160a 100644 (file)
--- 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