New way to configure blacklist.conf

diff --git a/conf/blacklister.conf b/conf/blacklister.conf
index 0d982a826b663dbda4bd609b3934ae5f36ade7ba..c0f3d01c3fd75b7f8082477fde00aa0cb56f746f 100644 (file)
--- a/conf/blacklister.conf
+++ b/conf/blacklister.conf
@@ -1,13 +1,26 @@
 #dnsbl.sorbs.net
 #t1.dnsbl.net.au
 #checked 2025-07-12 by preference order
--1     127.0.0.2       bl.spamcop.net
--1     127.0.0.2       sbl.spamhaus.org
--1     127.0.0.2       pbl.spamhaus.org
--1     127.0.0.2       xbl.spamhaus.org
--1     127.0.0.2       b.barracudacentral.org
--1     127.0.0.2       bl.blocklist.de
--1     127.0.0.2       ips.backscatterer.org
--1     127.0.0.2       dnsbl.dronebl.org
--1     127.0.0.2       all.s5h.net                     #http://s5h.net/rbl
--1     127.0.0.2       hostkarma.junkemailfilter.com   #
+#The SpamCop Blocking List (SCBL) lists IP addresses which
+#have transmitted reported email to SpamCop users. SpamCop
+-1     bl.spamcop.net                  127.0.0.2
+#Spamhaus Block List (SBL) is a realtime database of IP addresses
+#of spam sources, including known spammers, spam gangs,
+#spam operations and spam support services. 
+-1     sbl.spamhaus.org                127.0.0.2,127.0.0.3,127.0.0.9
+#b.barracudacentral.org will return the standard
+#127.0.0.2 IP address when queried if the SMTP server is listed.
+-1     b.barracudacentral.org          127.0.0.2
+#www.blocklist.de is a free and voluntary service provided
+#by a Fraud/Abuse-specialist,
+-1     bl.blocklist.de                 127.0.0.9,127.0.0.13
+# ips.backscatterer.org for scoring or rejecting misdirected
+#bounces and misdirected autoresponders 
+-1     ips.backscatterer.org           127.0.0.2
+#DroneBL is a realtime monitor of abusable IPs
+#-1    dnsbl.dronebl.org       
+#The s5h blacklist is a real-time IP-based blacklist that is
+#maintained by the System 5 Hosting (S5H) organization.
+-1     all.s5h.net                     127.0.0.2
+#Junk Email Filter is a front end email spam filtering 
+-1     hostkarma.junkemailfilter.co    127.0.0.2

diff --git a/lib/unidns.c b/lib/unidns.c
index 366c36571e8ce578d6384fe7d7795145bf7c58d8..590ca1cbb52591b4a0f4f3eb0389682551a9a83d 100644 (file)
--- a/lib/unidns.c
+++ b/lib/unidns.c
@@ -188,11 +188,10 @@ while((answer-->0)&&(cp<eom)) {
         list=(char **)rou_addlist((void **)list,(void *)dynbuf);
        break;
       case T_A         :       {
-        u_int32_t *addr;
+        char str[INET_ADDRSTRLEN];
 
-        addr=(u_int32_t *)calloc(1,sizeof(u_int32_t));
-        *addr=ntohl(*((u_int32_t *)cp));
-        list=(char **)rou_addlist((void **)list,(void *)addr);
+        (void) inet_ntop(AF_INET,cp,str,INET_ADDRSTRLEN);
+        list=(char **)rou_addlist((void **)list,(void *)strdup(str));
        }
        break;
       case T_AAAA      :       
@@ -692,8 +691,8 @@ char dnsquest[300];
 
 listed=(char *)0;
 (void) snprintf(dnsquest,sizeof(dnsquest),"%s.%s",reversip,blk->sitename);
-(void) rou_alert(0,"%s, JMPDBG checking <%s>",OPEP,dnsquest);
-if ((txt=gettxt(dnsquest,T_PTR,"TXT"))!=(char **)0) {
+//(void) rou_alert(0,"%s, JMPDBG checking <%s>",OPEP,dnsquest);
+if ((txt=gettxt(dnsquest,T_A,"TXT"))!=(char **)0) {
   int num;
   char **ptr;
 
@@ -701,7 +700,7 @@ if ((txt=gettxt(dnsquest,T_PTR,"TXT"))!=(char **)0) {
   ptr=txt;
   while (*ptr!=(char *)0) {
     (void) rou_alert(0,"JMPDBG site <%s> got txt[%d]=<%s>",
-                        blk->sitename,num,*ptr);
+                        dnsquest,num,*ptr);
     num++;
     ptr++;
     }