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

2025-08-31 06:25:31 +00:00 · 2018-02-19 01:25:15 -08:00
parent 908b2f4b3b d7733df695
commit 2a50992ab3
9 changed files with 35 additions and 35 deletions
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000-2018  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
--- a/bin/dig/host.c
+++ b/bin/dig/host.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-2007, 2009-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000-2007, 2009-2018  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
--- a/bin/dig/include/dig/dig.h
+++ b/bin/dig/include/dig/dig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-2009, 2011-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000-2009, 2011-2018  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
--- a/bin/dig/nslookup.c
+++ b/bin/dig/nslookup.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000-2018  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
--- a/30
+++ b/30
@@ -23535,23 +23535,11 @@ done
 			then
 				use_dlz_mysql=$d
 				mysql_include=$d/include/mysql
-			if test -d $d/lib/mysql
-				then
-				mysql_lib=$d/lib/mysql
-				else
-					mysql_lib=$d/lib
-				fi
 				break
 			elif test -f $d/include/mysql.h
 			then
 				use_dlz_mysql=$d
 				mysql_include=$d/include
-				if test -d $d/lib/mysql
-				then
-					mysql_lib=$d/lib/mysql
-				else
-					mysql_lib=$d/lib
-				fi
 				break
 			fi
 		done
@@ -23562,21 +23550,9 @@ then
 	if test -f $d/include/mysql/mysql.h
 	then
 		mysql_include=$d/include/mysql
-		if test -d $d/lib/mysql
-		then
-			mysql_lib=$d/lib/mysql
-		else
-			mysql_lib=$d/lib
-		fi
 	elif test -f $d/include/mysql.h
 	then
 		mysql_include=$d/include
-		if test -d $d/lib/mysql
-		then
-			mysql_lib=$d/lib/mysql
-		else
-			mysql_lib=$d/lib
-		fi
 	fi
 fi

@@ -23616,6 +23592,12 @@ $as_echo "no" >&6; }
 $as_echo "using mysql with libs ${mysql_lib} and includes ${mysql_include}" >&6; }
 		;;
 	*)
+		if test -d "$use_dlz_mysql/lib/mysql"
+		then
+			mysql_lib="$use_dlz_mysql/lib/mysql"
+		else
+			mysql_lib="$use_dlz_mysql/lib"
+		fi

 	CONTRIB_DLZ="$CONTRIB_DLZ -DDLZ_MYSQL"
 	for i in dlz_mysql_driver
--- a/doc/arm/Bv9ARM.ch08.html
+++ b/doc/arm/Bv9ARM.ch08.html
@@ -129,14 +129,23 @@
  <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="relnotes_changes"></a>Feature Changes</h3></div></div></div>
-    <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
+    <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem">
 	<p>
 	  Zone types <span class="command"><strong>primary</strong></span> and
 	  <span class="command"><strong>secondary</strong></span> are now available as synonyms for
 	  <span class="command"><strong>master</strong></span> and <span class="command"><strong>slave</strong></span>,
 	  respectively, in <code class="filename">named.conf</code>.
 	</p>
-      </li></ul></div>
+      </li>
+<li class="listitem">
+	<p>
+	  <span class="command"><strong>named</strong></span> will now log a warning if the old
+	  root DNSSEC key is explicitly configured and has not been updated.
+	  [RT #43670]
+	</p>
+      </li>
+</ul></div>
  </div>

  <div class="section">
--- a/doc/arm/notes.html
+++ b/doc/arm/notes.html
@@ -91,14 +91,23 @@
  <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="relnotes_changes"></a>Feature Changes</h3></div></div></div>
-    <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
+    <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem">
 	<p>
 	  Zone types <span class="command"><strong>primary</strong></span> and
 	  <span class="command"><strong>secondary</strong></span> are now available as synonyms for
 	  <span class="command"><strong>master</strong></span> and <span class="command"><strong>slave</strong></span>,
 	  respectively, in <code class="filename">named.conf</code>.
 	</p>
-      </li></ul></div>
+      </li>
+<li class="listitem">
+	<p>
+	  <span class="command"><strong>named</strong></span> will now log a warning if the old
+	  root DNSSEC key is explicitly configured and has not been updated.
+	  [RT #43670]
+	</p>
+      </li>
+</ul></div>
  </div>

  <div class="section">
--- a/lib/dns/include/dns/dnstap.h
+++ b/lib/dns/include/dns/dnstap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015-2018  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
--- a/util/copyrights
+++ b/util/copyrights
@@ -2695,7 +2695,7 @@
 ./contrib/dlz/bin/.gitignore			X	2014
 ./contrib/dlz/bin/dlzbdb/Makefile.in		X	2005,2007,2009,2011,2012,2015,2016,2017
 ./contrib/dlz/bin/dlzbdb/dlzbdb.c		X	2005,2016
-./contrib/dlz/config.dlz.in			X	2005,2006,2008,2010,2011,2014,2016,2017
+./contrib/dlz/config.dlz.in			X	2005,2006,2008,2010,2011,2014,2016,2017,2018
 ./contrib/dlz/drivers/.gitignore		X	2012
 ./contrib/dlz/drivers/dlz_bdb_driver.c		X	2005,2008,2010,2011,2012,2016,2017
 ./contrib/dlz/drivers/dlz_bdbhpt_driver.c	X	2005,2010,2011,2012,2016,2017
@@ -3364,7 +3364,7 @@
 ./lib/dns/include/dns/dns64.h			C	2010,2014,2016
 ./lib/dns/include/dns/dnsrps.h			C	2017
 ./lib/dns/include/dns/dnssec.h			C	1999,2000,2001,2002,2004,2005,2006,2007,2009,2010,2011,2012,2013,2014,2015,2016
-./lib/dns/include/dns/dnstap.h			C	2015,2016,2017
+./lib/dns/include/dns/dnstap.h			C	2015,2016,2017,2018
 ./lib/dns/include/dns/ds.h			C	2002,2004,2005,2006,2007,2010,2012,2014,2016
 ./lib/dns/include/dns/dsdigest.h		C	2012,2016
 ./lib/dns/include/dns/dyndb.h			C	2015,2016