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

bin/tests/system/dnssec/ns4/named4.conf

 /*
- * Copyright (C) 2012, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2016  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

lib/isc/nothreads/include/isc/thread.h

 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2004, 2007, 2013, 2016, 2017  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

lib/isc/nothreads/thread.c

 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2004, 2007, 2016, 2017  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

lib/isc/pthreads/include/isc/thread.h

 /*
- * Copyright (C) 1998-2001, 2004, 2005, 2007, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1998-2001, 2004, 2005, 2007, 2013, 2016, 2017  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

lib/isc/pthreads/thread.c

 /*
- * Copyright (C) 2000, 2001, 2003-2005, 2007, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2003-2005, 2007, 2013, 2016, 2017  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

lib/isc/timer.c

 /*
- * Copyright (C) 1998-2002, 2004, 2005, 2007-2009, 2011-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1998-2002, 2004, 2005, 2007-2009, 2011-2017  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

lib/isc/unix/socket.c

 /*
- * Copyright (C) 1998-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1998-2017  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

lib/isc/win32/include/isc/thread.h

 /*
- * Copyright (C) 1998-2001, 2004, 2005, 2007, 2009, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1998-2001, 2004, 2005, 2007, 2009, 2013, 2016, 2017  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

lib/isc/win32/thread.c

 /*
- * Copyright (C) 1998-2001, 2004, 2005, 2007, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1998-2001, 2004, 2005, 2007, 2016, 2017  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

util/copyrights

@@ -4187,9 +4187,9 @@
 ./lib/isc/nothreads/include/isc/condition.h	C	2000,2001,2004,2007,2016
 ./lib/isc/nothreads/include/isc/mutex.h		C	2000,2001,2004,2007,2015,2016
 ./lib/isc/nothreads/include/isc/once.h		C	2000,2001,2004,2007,2016
-./lib/isc/nothreads/include/isc/thread.h	C	2000,2001,2004,2007,2013,2016
+./lib/isc/nothreads/include/isc/thread.h	C	2000,2001,2004,2007,2013,2016,2017
 ./lib/isc/nothreads/mutex.c			C	2000,2001,2004,2006,2007,2016
-./lib/isc/nothreads/thread.c			C	2000,2001,2004,2007,2016
+./lib/isc/nothreads/thread.c			C	2000,2001,2004,2007,2016,2017
 ./lib/isc/ondestroy.c				C	2000,2001,2004,2005,2007,2016
 ./lib/isc/parseint.c				C	2001,2002,2003,2004,2005,2007,2012,2016
 ./lib/isc/pk11.c				C	2014,2015,2016,2017
@@ -4208,9 +4208,9 @@
 ./lib/isc/pthreads/include/isc/condition.h	C	1998,1999,2000,2001,2004,2005,2007,2016
 ./lib/isc/pthreads/include/isc/mutex.h		C	1998,1999,2000,2001,2002,2004,2005,2007,2016
 ./lib/isc/pthreads/include/isc/once.h		C	1999,2000,2001,2004,2005,2007,2016
-./lib/isc/pthreads/include/isc/thread.h		C	1998,1999,2000,2001,2004,2005,2007,2013,2016
+./lib/isc/pthreads/include/isc/thread.h		C	1998,1999,2000,2001,2004,2005,2007,2013,2016,2017
 ./lib/isc/pthreads/mutex.c			C	2000,2001,2002,2004,2005,2007,2008,2011,2012,2014,2015,2016
-./lib/isc/pthreads/thread.c			C	2000,2001,2003,2004,2005,2007,2013,2016
+./lib/isc/pthreads/thread.c			C	2000,2001,2003,2004,2005,2007,2013,2016,2017
 ./lib/isc/quota.c				C	2000,2001,2004,2005,2007,2016
 ./lib/isc/radix.c				C	2007,2008,2009,2011,2012,2013,2014,2015,2016
 ./lib/isc/random.c				C	1999,2000,2001,2002,2003,2004,2005,2007,2009,2013,2014,2016
@@ -4267,7 +4267,7 @@
 ./lib/isc/tests/taskpool_test.c			C	2011,2012,2016
 ./lib/isc/tests/testdata/file/keep		X	2014
 ./lib/isc/tests/time_test.c			C	2014,2015,2016
-./lib/isc/timer.c				C	1998,1999,2000,2001,2002,2004,2005,2007,2008,2009,2011,2012,2013,2014,2015,2016
+./lib/isc/timer.c				C	1998,1999,2000,2001,2002,2004,2005,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017
 ./lib/isc/timer_p.h				C	2000,2001,2004,2005,2007,2009,2016
 ./lib/isc/tm.c					C	2014,2016
 ./lib/isc/unix/Makefile.in			MAKE	1998,1999,2000,2001,2004,2007,2009,2012,2014,2015,2016
@@ -4305,7 +4305,7 @@
 ./lib/isc/unix/os.c				C	2000,2001,2004,2005,2007,2016
 ./lib/isc/unix/pk11_api.c			C	2014,2016
 ./lib/isc/unix/resource.c			C	2000,2001,2004,2007,2008,2009,2016
-./lib/isc/unix/socket.c				C	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016
+./lib/isc/unix/socket.c				C	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
 ./lib/isc/unix/socket_p.h			C	2000,2001,2004,2005,2007,2008,2009,2016
 ./lib/isc/unix/stdio.c				C	2000,2001,2004,2007,2011,2012,2013,2014,2016
 ./lib/isc/unix/stdtime.c			C	1999,2000,2001,2004,2005,2007,2016
@@ -4346,7 +4346,7 @@
 ./lib/isc/win32/include/isc/stdtime.h		C	1999,2000,2001,2004,2005,2007,2011,2012,2016
 ./lib/isc/win32/include/isc/strerror.h		C	2001,2004,2007,2016
 ./lib/isc/win32/include/isc/syslog.h		C	1999,2000,2001,2004,2007,2016
-./lib/isc/win32/include/isc/thread.h		C	1998,1999,2000,2001,2004,2005,2007,2009,2013,2016
+./lib/isc/win32/include/isc/thread.h		C	1998,1999,2000,2001,2004,2005,2007,2009,2013,2016,2017
 ./lib/isc/win32/include/isc/time.h		C	1998,1999,2000,2001,2004,2006,2007,2008,2009,2012,2014,2015,2016,2017
 ./lib/isc/win32/include/isc/win32os.h		C	2002,2004,2007,2009,2015,2016
 ./lib/isc/win32/include/pkcs11/Makefile.in	MAKE	2014,2016
@@ -4378,7 +4378,7 @@
 ./lib/isc/win32/strerror.c			C	2001,2002,2004,2007,2016
 ./lib/isc/win32/syslog.c			C	2001,2002,2003,2004,2007,2014,2016
 ./lib/isc/win32/syslog.h			C	2001,2002,2004,2007,2016
-./lib/isc/win32/thread.c			C	1998,1999,2000,2001,2004,2005,2007,2016
+./lib/isc/win32/thread.c			C	1998,1999,2000,2001,2004,2005,2007,2016,2017
 ./lib/isc/win32/time.c				C	1998,1999,2000,2001,2003,2004,2006,2007,2008,2009,2012,2013,2014,2015,2016,2017
 ./lib/isc/win32/unistd.h			C	2000,2001,2004,2007,2008,2009,2016
 ./lib/isc/win32/version.c			C	1998,1999,2000,2001,2004,2007,2016