[src/trunk]: src/external/bsd/blacklist/diff don't let positive aclquery resu...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/aa9d3976816c
branches:  trunk
changeset: 335785:aa9d3976816c
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Jan 23 21:10:44 2015 +0000

description:
don't let positive aclquery results clear the blacklist.

diffstat:

 external/bsd/blacklist/diff/named.diff |  25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 deletions(-)

diffs (95 lines):

diff -r b58a68bd79ed -r aa9d3976816c external/bsd/blacklist/diff/named.diff
--- a/external/bsd/blacklist/diff/named.diff    Fri Jan 23 20:28:24 2015 +0000
+++ b/external/bsd/blacklist/diff/named.diff    Fri Jan 23 21:10:44 2015 +0000
@@ -54,7 +54,7 @@
 retrieving revision 1.8
 diff -u -u -r1.8 Makefile
 --- bin/named/Makefile 31 Dec 2013 20:23:12 -0000      1.8
-+++ bin/named/Makefile 22 Jan 2015 23:26:04 -0000
++++ bin/named/Makefile 23 Jan 2015 21:09:41 -0000
 @@ -33,7 +33,9 @@
        lwaddr.c lwdclient.c lwderror.c \
        lwdgabn.c lwdgnba.c lwdgrbn.c lwdnoop.c lwresd.c lwsearch.c \
@@ -72,7 +72,7 @@
 retrieving revision 1.11
 diff -u -u -r1.11 client.c
 --- dist/bin/named/client.c    10 Dec 2014 04:37:51 -0000      1.11
-+++ dist/bin/named/client.c    22 Jan 2015 23:26:04 -0000
++++ dist/bin/named/client.c    23 Jan 2015 21:09:42 -0000
 @@ -65,6 +65,8 @@
  #include <named/server.h>
  #include <named/update.h>
@@ -96,7 +96,7 @@
 retrieving revision 1.15
 diff -u -u -r1.15 main.c
 --- dist/bin/named/main.c      10 Dec 2014 04:37:51 -0000      1.15
-+++ dist/bin/named/main.c      22 Jan 2015 23:26:04 -0000
++++ dist/bin/named/main.c      23 Jan 2015 21:09:42 -0000
 @@ -83,6 +83,9 @@
  #ifdef HAVE_LIBXML2
  #include <libxml/xmlversion.h>
@@ -122,7 +122,7 @@
 retrieving revision 1.17
 diff -u -u -r1.17 query.c
 --- dist/bin/named/query.c     10 Dec 2014 04:37:52 -0000      1.17
-+++ dist/bin/named/query.c     22 Jan 2015 23:26:04 -0000
++++ dist/bin/named/query.c     23 Jan 2015 21:09:42 -0000
 @@ -65,6 +65,8 @@
  #include <named/sortlist.h>
  #include <named/xfrout.h>
@@ -132,15 +132,16 @@
  #if 0
  /*
   * It has been recommended that DNS64 be changed to return excluded
-@@ -762,6 +764,7 @@
+@@ -762,6 +764,8 @@
        }
  
        result = ns_client_checkaclsilent(client, NULL, queryacl, ISC_TRUE);
-+      pfilter_notify(result, client, "validatezonedb");
++      if (result != ISC_R_SUCCESS)
++              pfilter_notify(result, client, "validatezonedb");
        if ((options & DNS_GETDB_NOLOG) == 0) {
                char msg[NS_CLIENT_ACLMSGSIZE("query")];
                if (result == ISC_R_SUCCESS) {
-@@ -1026,6 +1029,7 @@
+@@ -1026,6 +1030,7 @@
                result = ns_client_checkaclsilent(client, NULL,
                                                  client->view->cacheacl,
                                                  ISC_TRUE);
@@ -154,7 +155,7 @@
 retrieving revision 1.9
 diff -u -u -r1.9 update.c
 --- dist/bin/named/update.c    10 Dec 2014 04:37:52 -0000      1.9
-+++ dist/bin/named/update.c    22 Jan 2015 23:26:04 -0000
++++ dist/bin/named/update.c    23 Jan 2015 21:09:42 -0000
 @@ -59,6 +59,8 @@
  #include <named/server.h>
  #include <named/update.h>
@@ -164,14 +165,14 @@
  /*! \file
   * \brief
   * This module implements dynamic update as in RFC2136.
-@@ -306,6 +308,7 @@
-       isc_result_t result;
+@@ -307,6 +309,7 @@
  
        result = ns_client_checkaclsilent(client, NULL, queryacl, ISC_TRUE);
-+      pfilter_notify(result, client, "queryacl");
        if (result != ISC_R_SUCCESS) {
++              pfilter_notify(result, client, "queryacl");
                dns_name_format(zonename, namebuf, sizeof(namebuf));
                dns_rdataclass_format(client->view->rdclass, classbuf,
+                                     sizeof(classbuf));
 @@ -324,6 +327,7 @@
                                      sizeof(classbuf));
  
@@ -194,7 +195,7 @@
 retrieving revision 1.7
 diff -u -u -r1.7 xfrout.c
 --- dist/bin/named/xfrout.c    10 Dec 2014 04:37:52 -0000      1.7
-+++ dist/bin/named/xfrout.c    22 Jan 2015 23:26:05 -0000
++++ dist/bin/named/xfrout.c    23 Jan 2015 21:09:42 -0000
 @@ -54,6 +54,8 @@
  #include <named/server.h>
  #include <named/xfrout.h>