# HG changeset patch
# User Carl Byington <carl@five-ten-sg.com>
# Date 1528164413 25200
# Node ID 8393ce4658cc18b819f2fe744810a1987af9e5e5
# Parent  3bbc64cece705fb827065d7018a74b262fc7a6e2
add unsigned_black for enforcement of dmarc policy

diff -r 3bbc64cece70 -r 8393ce4658cc ChangeLog
--- a/ChangeLog	Mon Jun 04 16:47:20 2018 -0700
+++ b/ChangeLog	Mon Jun 04 19:06:53 2018 -0700
@@ -1,4 +1,4 @@
-6.70 2018-06-04
+6.71 2018-06-04
     add unsigned_black for enforcement of dmarc policy.
 
 6.69 2018-04-10
diff -r 3bbc64cece70 -r 8393ce4658cc NEWS
--- a/NEWS	Mon Jun 04 16:47:20 2018 -0700
+++ b/NEWS	Mon Jun 04 19:06:53 2018 -0700
@@ -1,4 +1,4 @@
-6.70 2018-06-04 add unsigned_black for enforcement of dmarc policy
+6.71 2018-06-04 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 3bbc64cece70 -r 8393ce4658cc configure.in
--- a/configure.in	Mon Jun 04 16:47:20 2018 -0700
+++ b/configure.in	Mon Jun 04 19:06:53 2018 -0700
@@ -1,6 +1,6 @@
 
 AC_PREREQ(2.59)
-AC_INIT(dnsbl,6.70,carl@five-ten-sg.com)
+AC_INIT(dnsbl,6.71,carl@five-ten-sg.com)
 AC_CONFIG_SRCDIR([config.h.in])
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
diff -r 3bbc64cece70 -r 8393ce4658cc dnsbl.spec.in
--- a/dnsbl.spec.in	Mon Jun 04 16:47:20 2018 -0700
+++ b/dnsbl.spec.in	Mon Jun 04 19:06:53 2018 -0700
@@ -155,7 +155,7 @@
 
 
 %changelog
-* Mon Jun 04 2018 Carl Byington <carl@five-ten-sg.com> - 6.70-1
+* Mon Jun 04 2018 Carl Byington <carl@five-ten-sg.com> - 6.71-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 3bbc64cece70 -r 8393ce4658cc src/context.cpp
--- a/src/context.cpp	Mon Jun 04 16:47:20 2018 -0700
+++ b/src/context.cpp	Mon Jun 04 19:06:53 2018 -0700
@@ -1791,13 +1791,13 @@
         else {
             const char *from   = have;
             const char *action = tok.next();
-            if ((action == token_signed_white) || (action == token_signed_black) || (action == token_require_signed)) {
+            if ((action == token_signed_white) || (action == token_signed_black) || (action == token_unsigned_black) || (action == token_require_signed)) {
                 const char *signer = tok.next();
                 if (!signer) break;
                 else         me.add_dkim_from(from, action, signer);
             }
             else {
-                tok.token_error("signed_white/signed_black/require_signed", action);
+                tok.token_error("signed_white/signed_black/unsigned_black/require_signed", action);
             }
         }
     }