From: Mark Andrews <marka@isc.org>
Date: Fri, 25 May 2018 06:29:04 +0000 (+1000)
Subject: CHANGES, copyright
X-Git-Tag: v9.10.8rc2~4^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3c80aa59f100f0ef616ec068e39924c4254644a;p=thirdparty%2Fbind9.git

CHANGES, copyright

(cherry picked from commit f7d346357e93433947e953fb4fdfe736e3a283cb)
---

diff --git a/CHANGES b/CHANGES
index b2e24236bc2..2b02ea2e47f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4980.	[bug]		Named-checkconf failed to detect bad in-view targets.
+			[GL #288]
+
 4979.	[bug]		Non-libcap builds were not checking whether all
 			requested capabilities are present in the permitted
 			capability set. [GL #321]
diff --git a/bin/named/main.c b/bin/named/main.c
index 2a8a40c2b08..32e72218299 100644
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -1053,7 +1053,7 @@ setup(void) {
 	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
 		      NS_LOGMODULE_MAIN, ISC_LOG_NOTICE,
 		      "compiled with OpenSSL version: %s",
-	              OPENSSL_VERSION_TEXT);
+		      OPENSSL_VERSION_TEXT);
 #if !defined(LIBRESSL_VERSION_NUMBER) && \
     OPENSSL_VERSION_NUMBER >= 0x10100000L /* 1.1.0 or higher */
 	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
diff --git a/bin/tests/system/checkconf/bad-sharedzone3.conf b/bin/tests/system/checkconf/bad-sharedzone3.conf
index e174ab11653..48a49662cab 100644
--- a/bin/tests/system/checkconf/bad-sharedzone3.conf
+++ b/bin/tests/system/checkconf/bad-sharedzone3.conf
@@ -1,12 +1,17 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
- * 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/.
+ * 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.
  *
- * See the COPYRIGHT file distributed with this work for additional
- * information regarding copyright ownership.
+ * 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.
  */
 
 view first {
diff --git a/util/copyrights b/util/copyrights
index e11a13f9598..934c40a92d6 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -706,6 +706,7 @@
 ./bin/tests/system/checkconf/bad-sharedwritable2.conf	CONF-C	2014,2018
 ./bin/tests/system/checkconf/bad-sharedzone1.conf	CONF-C	2013,2018
 ./bin/tests/system/checkconf/bad-sharedzone2.conf	CONF-C	2013,2018
+./bin/tests/system/checkconf/bad-sharedzone3.conf	CONF-C	2018
 ./bin/tests/system/checkconf/bad-tsig.conf	CONF-C	2012,2013,2018
 ./bin/tests/system/checkconf/bad-update-policy1.conf	CONF-C	2018
 ./bin/tests/system/checkconf/bad-update-policy2.conf	CONF-C	2018