Merge branch 'master' of ssh://repo.isc.org/proj/git/prod/bind9

bin/tests/system/rpz/ns7/named.conf

@@ -23,7 +23,7 @@ options {
 	} qname-wait-recurse no
 	nsip-enable yes
 	nsdname-enable yes
-        min-update-interval 0;
+	min-update-interval 0;
 
 	include "../dnsrps-slave.conf";
 };

bin/tests/system/rpzrecurse/testgen.pl

@@ -1,18 +1,10 @@
 #!/usr/bin/env perl
 #
-# Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
 #
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THIS SOFTWARE.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 use strict;
 use warnings;

lib/ns/query.c

@@ -3841,7 +3841,7 @@ rpz_rewrite_ns_skip(ns_client_t *client, dns_name_t *nsname,
 }
 
 /*
- * RPZ query result types 
+ * RPZ query result types
  */
 typedef enum {
 	qresult_type_done = 0,