[src/trunk]: src/external/bsd/blacklist/diff make this nicer

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

details:   https://anonhg.NetBSD.org/src/rev/fe0710c66382
branches:  trunk
changeset: 335739:fe0710c66382
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Jan 22 17:59:31 2015 +0000

description:
make this nicer

diffstat:

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

diffs (90 lines):

diff -r bbf1fdd640fb -r fe0710c66382 external/bsd/blacklist/diff/named.diff
--- a/external/bsd/blacklist/diff/named.diff    Thu Jan 22 17:56:35 2015 +0000
+++ b/external/bsd/blacklist/diff/named.diff    Thu Jan 22 17:59:31 2015 +0000
@@ -1,14 +1,10 @@
-? named.diff
-? pfilter.c
-? pfilter.h
-? x
 Index: client.c
 ===================================================================
 RCS file: /cvsroot/src/external/bsd/bind/dist/bin/named/client.c,v
 retrieving revision 1.11
 diff -u -u -r1.11 client.c
 --- client.c   10 Dec 2014 04:37:51 -0000      1.11
-+++ client.c   22 Jan 2015 06:47:45 -0000
++++ client.c   22 Jan 2015 17:54:19 -0000
 @@ -65,6 +65,8 @@
  #include <named/server.h>
  #include <named/update.h>
@@ -32,23 +28,21 @@
 retrieving revision 1.15
 diff -u -u -r1.15 main.c
 --- main.c     10 Dec 2014 04:37:51 -0000      1.15
-+++ main.c     22 Jan 2015 06:47:45 -0000
-@@ -83,6 +83,9 @@
- #ifdef HAVE_LIBXML2
- #include <libxml/xmlversion.h>
++++ main.c     22 Jan 2015 17:54:19 -0000
+@@ -95,6 +95,8 @@
+ #include <dlz/dlz_drivers.h>
  #endif
-+
+ 
 +#include "pfilter.h"
 +
  /*
-  * Include header files for database drivers here.
+  * The maximum number of stack frames to dump on assertion failure.
   */
-@@ -1206,6 +1209,8 @@
+@@ -1206,6 +1208,7 @@
  
        parse_command_line(argc, argv);
  
 +      pfilter_open();
-+
        /*
         * Warn about common configuration error.
         */
@@ -58,7 +52,7 @@
 retrieving revision 1.17
 diff -u -u -r1.17 query.c
 --- query.c    10 Dec 2014 04:37:52 -0000      1.17
-+++ query.c    22 Jan 2015 06:47:45 -0000
++++ query.c    22 Jan 2015 17:54:19 -0000
 @@ -65,6 +65,8 @@
  #include <named/sortlist.h>
  #include <named/xfrout.h>
@@ -90,7 +84,7 @@
 retrieving revision 1.9
 diff -u -u -r1.9 update.c
 --- update.c   10 Dec 2014 04:37:52 -0000      1.9
-+++ update.c   22 Jan 2015 06:47:45 -0000
++++ update.c   22 Jan 2015 17:54:19 -0000
 @@ -59,6 +59,8 @@
  #include <named/server.h>
  #include <named/update.h>
@@ -122,7 +116,7 @@
 retrieving revision 1.7
 diff -u -u -r1.7 xfrout.c
 --- xfrout.c   10 Dec 2014 04:37:52 -0000      1.7
-+++ xfrout.c   22 Jan 2015 06:47:45 -0000
++++ xfrout.c   22 Jan 2015 17:54:19 -0000
 @@ -54,6 +54,8 @@
  #include <named/server.h>
  #include <named/xfrout.h>
@@ -132,11 +126,10 @@
  /*! \file
   * \brief
   * Outgoing AXFR and IXFR.
-@@ -821,7 +823,7 @@
-                                                    question_name,
+@@ -822,6 +824,7 @@
                                                     &client->peeraddr,
                                                     &db);
--
+ 
 +                      pfilter_notify(result, client, "zonexfr");
                        if (result == ISC_R_NOPERM) {
                                char _buf1[DNS_NAME_FORMATSIZE];