# HG changeset patch
# User Carl Byington <carl@five-ten-sg.com>
# Date 1482254415 28800
# Node ID a4f2fda7242213d279b2d68ed6418fd4626293bc
# Parent  89574f8a2f640c08602ec599a1661b71e73692fc
missing ==0 testing for from header, we were scanning all the non-from headers

diff -r 89574f8a2f64 -r a4f2fda72422 dnsbl.conf
--- a/dnsbl.conf	Mon Dec 19 17:11:39 2016 -0800
+++ b/dnsbl.conf	Tue Dec 20 09:20:15 2016 -0800
@@ -68,7 +68,12 @@
             some.spammer                require_signed  some.spammer    // reject if not signed
 
             adp.com                     require_signed  adp.com;
+            amazon.com                  require_signed  amazon.com;
             billpay.bankofamerica.com   require_signed  billpay.bankofamerica.com;
+            craigslist.org              require_signed  craigslist.org;
+            dhl.com                     require_signed  dhl.com;
+            dropbox.com                 require_signed  dropbox.com;
+            dvd.com                     require_signed  dvd.com
             e.statefarm.com             require_signed  e.statefarm.com;
             ealerts.bankofamerica.com   require_signed  ealerts.bankofamerica.com;
             ebay.com                    require_signed  ebay.com;
@@ -82,6 +87,7 @@
             linkedin.com                require_signed  linkedin.com;
             monster.com                 require_signed  monster.com;
             paypal.com                  require_signed  paypal.com;
+            paychex.com                 require_signed  paychex.com;
             r.groupon.com               require_signed  r.groupon.com;
             service.capitalone.com      require_signed  capitalone.com;
             support.facebook.com        require_signed  support.facebook.com;
diff -r 89574f8a2f64 -r a4f2fda72422 src/dnsbl.cpp
--- a/src/dnsbl.cpp	Mon Dec 19 17:11:39 2016 -0800
+++ b/src/dnsbl.cpp	Tue Dec 20 09:20:15 2016 -0800
@@ -1500,7 +1500,8 @@
         }
     }
 
-    if ((priv.header_count > 2) && (strcasecmp(headerf, "from"))) {
+    // only look at the first from header
+    if ((priv.header_count > 2) && (!priv.fromaddr) && (strcasecmp(headerf, "from") == 0)) {
         const int nmatch = 2;
         regmatch_t match[nmatch];
         int err = regexec(&from_pattern, msg, nmatch, match, 0);
@@ -1512,11 +1513,6 @@
                 priv.fromaddr = strdup(msg+s1);
             }
         }
-        else {
-            char buf[maxlen];
-            size_t n = regerror(err, &from_pattern, buf, maxlen);
-            my_syslog(&priv, buf);
-        }
     }
 
     // headers that avoid autowhitelisting