diff src/dnsbl.cpp @ 458:6c1c2bd9fb54 stable-6-0-73

ignore dnswl entries if the sender is <>
author Carl Byington <carl@five-ten-sg.com>
date Tue, 18 Sep 2018 09:49:21 -0700
parents 2cf7183a911c
children 79e944269c0b
line wrap: on
line diff
--- a/src/dnsbl.cpp	Wed Jun 06 07:33:44 2018 -0700
+++ b/src/dnsbl.cpp	Tue Sep 18 09:49:21 2018 -0700
@@ -1435,8 +1435,8 @@
         else st = white;    // might be <>, envelope from has no @
     }
 
-    if ((st == oksofar) || (st == whitesofar)) {
-        // check the dns based whitelists
+    if (((st == oksofar) || (st == whitesofar)) && (strcmp(priv.mailaddr, "<>") != 0)) {
+        // check the dns based whitelists if the sender was not empty
         DNSWLP acceptlist = NULL;   // list that caused the whitelisting
         if (check_dnswl(priv, con.get_dnswl_list(), acceptlist)) {
             st = white;
@@ -1520,7 +1520,7 @@
     WHITELISTERP w = con2.find_autowhite(loto, priv.mailaddr);
 
     // check if local part is too big
-    const int max_local_size = 30;
+    const int max_local_size = 35;
     const char *p = strchr(loto, '@');
     int len = (p) ? p-loto : max_local_size;
     if (len >= max_local_size) w = NULL;    // too big, pretend we don't have a whitelister