Update copyright information after !59 merge.

diff --git a/bin/named/main.c b/bin/named/main.c
index 4a2dcf060b62257d1835e4389a7a6e49307abf64..a3e1b84f0a2e798f3e956c521bdf022a18291ca6 100644 (file)
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1999-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

diff --git a/bin/tests/system/common/controls.conf b/bin/tests/system/common/controls.conf
deleted file mode 100644 (file)
index 52a31a9..0000000
--- a/bin/tests/system/common/controls.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (C) 2000, 2001, 2004, 2007, 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
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-/* $Id: controls.conf,v 1.6 2007/06/19 23:47:01 tbox Exp $ */
-
-key rndc_key {
-       secret "1234abcd8765";
-       algorithm hmac-sha256;
-};
-
-controls {
-       inet 10.53.0.2 port 9953 allow { any; } keys { rndc_key; };
-};
-

diff --git a/util/copyrights b/util/copyrights
index 5ed85f51ea5471d83219530acee9bee0b81ebf5c..dd1be6492640f758f9252328e824b3b2f090baca 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -200,7 +200,7 @@
 ./bin/named/include/named/zoneconf.h           C       1999,2000,2001,2002,2004,2005,2006,2007,2010,2011,2015,2016,2017
 ./bin/named/log.c                              C       1999,2000,2001,2002,2004,2005,2006,2007,2009,2013,2014,2016,2017
 ./bin/named/logconf.c                          C       1999,2000,2001,2004,2005,2006,2007,2011,2013,2014,2015,2016,2017
-./bin/named/main.c                             C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
+./bin/named/main.c                             C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/named/named.8                            MAN     DOCBOOK
 ./bin/named/named.conf.5                       MAN     DOCBOOK
 ./bin/named/named.conf.docbook                 SGML    2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
@@ -218,8 +218,8 @@
 ./bin/named/win32/dlz_dlopen_driver.c          C       2011,2012,2013,2014,2016
 ./bin/named/win32/include/named/ntservice.h    C       1999,2000,2001,2002,2003,2004,2007,2016
 ./bin/named/win32/include/named/os.h           C       1999,2000,2001,2002,2004,2007,2008,2009,2014,2016,2017
-./bin/named/win32/named.vcxproj.filters.in     X       2013,2015,2016,2017
-./bin/named/win32/named.vcxproj.in             X       2013,2014,2015,2016,2017
+./bin/named/win32/named.vcxproj.filters.in     X       2013,2015,2016,2017,2018
+./bin/named/win32/named.vcxproj.in             X       2013,2014,2015,2016,2017,2018
 ./bin/named/win32/named.vcxproj.user           X       2013
 ./bin/named/win32/ntservice.c                  C       1999,2000,2001,2002,2004,2006,2007,2009,2011,2013,2014,2015,2016,2017
 ./bin/named/win32/os.c                         C       1999,2000,2001,2002,2004,2005,2007,2008,2009,2012,2013,2014,2015,2016,2017