[src/trunk]: src/external/bsd/blacklist/diff one more case missed.

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

details:   https://anonhg.NetBSD.org/src/rev/4fda24a6049f
branches:  trunk
changeset: 805897:4fda24a6049f
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Jan 22 23:26:42 2015 +0000

description:
one more case missed.

diffstat:

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

diffs (95 lines):

diff -r 70fb3dc1fee5 -r 4fda24a6049f external/bsd/blacklist/diff/named.diff
--- a/external/bsd/blacklist/diff/named.diff    Thu Jan 22 23:20:28 2015 +0000
+++ b/external/bsd/blacklist/diff/named.diff    Thu Jan 22 23:26:42 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 21:40:38 -0000
++++ bin/named/Makefile 22 Jan 2015 23:26:04 -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 21:40:38 -0000
++++ dist/bin/named/client.c    22 Jan 2015 23:26:04 -0000
 @@ -65,6 +65,8 @@
  #include <named/server.h>
  #include <named/update.h>
@@ -96,21 +96,23 @@
 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 21:40:38 -0000
-@@ -95,6 +95,8 @@
- #include <dlz/dlz_drivers.h>
++++ dist/bin/named/main.c      22 Jan 2015 23:26:04 -0000
+@@ -83,6 +83,9 @@
+ #ifdef HAVE_LIBXML2
+ #include <libxml/xmlversion.h>
  #endif
- 
++
 +#include "pfilter.h"
 +
  /*
-  * The maximum number of stack frames to dump on assertion failure.
+  * Include header files for database drivers here.
   */
-@@ -1206,6 +1208,7 @@
+@@ -1206,6 +1209,8 @@
  
        parse_command_line(argc, argv);
  
 +      pfilter_open();
++
        /*
         * Warn about common configuration error.
         */
@@ -120,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 21:40:39 -0000
++++ dist/bin/named/query.c     22 Jan 2015 23:26:04 -0000
 @@ -65,6 +65,8 @@
  #include <named/sortlist.h>
  #include <named/xfrout.h>
@@ -152,7 +154,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 21:40:39 -0000
++++ dist/bin/named/update.c    22 Jan 2015 23:26:04 -0000
 @@ -59,6 +59,8 @@
  #include <named/server.h>
  #include <named/update.h>
@@ -170,7 +172,15 @@
        if (result != ISC_R_SUCCESS) {
                dns_name_format(zonename, namebuf, sizeof(namebuf));
                dns_rdataclass_format(client->view->rdclass, classbuf,
-@@ -362,6 +365,7 @@
+@@ -324,6 +327,7 @@
+                                     sizeof(classbuf));
+ 
+               result = DNS_R_REFUSED;
++              pfilter_notify(result, client, "updateacl");
+               ns_client_log(client, NS_LOGCATEGORY_UPDATE_SECURITY,
+                             NS_LOGMODULE_UPDATE, ISC_LOG_INFO,
+                             "update '%s/%s' denied", namebuf, classbuf);
+@@ -362,6 +366,7 @@
                msg = "disabled";
        } else {
                result = ns_client_checkaclsilent(client, NULL, acl, ISC_FALSE);
@@ -184,7 +194,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 21:40:39 -0000
++++ dist/bin/named/xfrout.c    22 Jan 2015 23:26:05 -0000
 @@ -54,6 +54,8 @@
  #include <named/server.h>
  #include <named/xfrout.h>