# HG changeset patch
# User Carl Byington <carl@five-ten-sg.com>
# Date 1528295388 25200
# Node ID 2cf7183a911c64ce64498e6543861f1ac5f785a0
# Parent  48cfa55cd73b19058d7dd67059b7e3128805fe01
add unsigned_black for enforcement of dmarc policy

diff -r 48cfa55cd73b -r 2cf7183a911c ChangeLog
--- a/ChangeLog	Tue Jun 05 09:24:29 2018 -0700
+++ b/ChangeLog	Wed Jun 06 07:29:48 2018 -0700
@@ -1,4 +1,4 @@
-6.71 2018-06-04
+6.72 2018-06-06
     add unsigned_black for enforcement of dmarc policy.
 
 6.69 2018-04-10
diff -r 48cfa55cd73b -r 2cf7183a911c NEWS
--- a/NEWS	Tue Jun 05 09:24:29 2018 -0700
+++ b/NEWS	Wed Jun 06 07:29:48 2018 -0700
@@ -1,4 +1,4 @@
-6.71 2018-06-04 add unsigned_black for enforcement of dmarc policy
+6.72 2018-06-06 add unsigned_black for enforcement of dmarc policy
 6.69 2018-04-10 fix spf mx:domain.tld token parsing
 6.68 2018-02-19 round spamassassin scores; check >= rather than >
 6.67 2018-01-05 always call dcc code so we get log entries
diff -r 48cfa55cd73b -r 2cf7183a911c configure.in
--- a/configure.in	Tue Jun 05 09:24:29 2018 -0700
+++ b/configure.in	Wed Jun 06 07:29:48 2018 -0700
@@ -1,6 +1,6 @@
 
 AC_PREREQ(2.59)
-AC_INIT(dnsbl,6.71,carl@five-ten-sg.com)
+AC_INIT(dnsbl,6.72,carl@five-ten-sg.com)
 AC_CONFIG_SRCDIR([config.h.in])
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
diff -r 48cfa55cd73b -r 2cf7183a911c dnsbl.spec.in
--- a/dnsbl.spec.in	Tue Jun 05 09:24:29 2018 -0700
+++ b/dnsbl.spec.in	Wed Jun 06 07:29:48 2018 -0700
@@ -155,7 +155,7 @@
 
 
 %changelog
-* Mon Jun 04 2018 Carl Byington <carl@five-ten-sg.com> - 6.71-1
+* Wed Jun 06 2018 Carl Byington <carl@five-ten-sg.com> - 6.72-1
 - add unsigned_black for enforcement of dmarc policy
 
 * Tue Apr 10 2018 Carl Byington <carl@five-ten-sg.com> - 6.69-1
diff -r 48cfa55cd73b -r 2cf7183a911c src/dnsbl.cpp
--- a/src/dnsbl.cpp	Tue Jun 05 09:24:29 2018 -0700
+++ b/src/dnsbl.cpp	Wed Jun 06 07:29:48 2018 -0700
@@ -1578,6 +1578,7 @@
         // remember the non-whites
         register_string(priv.env_to, rcptaddr, &con);
         priv.only_whites = false;
+        if (st == oksofar) {
         priv.want_spamassassin |= (priv.assassin) &&                    // have spam assassin available and
                                   (con.get_spamassassin_limit() != 0);  // want to use it with a non-zero score
         priv.want_dccgrey      |= (priv.dccifd) &&                      // have dcc interface and
@@ -1585,6 +1586,7 @@
         priv.want_dccbulk      |= (priv.dccifd) &&                      // have dcc interface and
                                   (con.get_bulk() != 0);                // want to use it for bulk detection
     }
+    }
     if (st == white) {
         priv.have_whites = true;
     }