update copyrights

diff --git a/bin/named/log.c b/bin/named/log.c
index 9f1b0fa2154e0b832eb2e9963b3702e2a744c2f7..39463b8b56a6b39e4f1e25cb02419c9d4121ed8e 100644 (file)
--- a/bin/named/log.c
+++ b/bin/named/log.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007, 2009, 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2009, 2013, 2014  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/bin/tests/system/logfileconfig/clean.sh b/bin/tests/system/logfileconfig/clean.sh
index a63f0f01306505c79baa9fe5bfbdc4c598287829..6bdd4f31dbdc98ff4fbcda5804929cf876999237 100644 (file)
--- a/bin/tests/system/logfileconfig/clean.sh
+++ b/bin/tests/system/logfileconfig/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011, 2012, 2014  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

diff --git a/bin/tests/system/logfileconfig/tests.sh b/bin/tests/system/logfileconfig/tests.sh
index d00848a1ddb8e8af789f58f0713dd0958978f230..95d24d6ee732a5a3ed78b72c87d4012a6986013b 100644 (file)
--- a/bin/tests/system/logfileconfig/tests.sh
+++ b/bin/tests/system/logfileconfig/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011-2013  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011-2014  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

diff --git a/lib/dns/include/dns/ttl.h b/lib/dns/include/dns/ttl.h
index fd5dc3f5da1d9e8a73c500b2460dc97f96792723..1fd4af1e9e26d82e29ee938804d9af19277d2a49 100644 (file)
--- a/lib/dns/include/dns/ttl.h
+++ b/lib/dns/include/dns/ttl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2014  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -40,7 +40,7 @@ dns_ttl_totext(isc_uint32_t src, isc_boolean_t verbose,
               isc_buffer_t *target);
 isc_result_t
 dns_ttl_totext2(isc_uint32_t src, isc_boolean_t verbose,
-               isc_boolean_t upcase, isc_buffer_t *target);
+               isc_boolean_t upcase, isc_buffer_t *target);
 /*%<
  * Output a TTL or other time interval in a human-readable form.
  * The time interval is given as a count of seconds in 'src'.

diff --git a/util/copyrights b/util/copyrights
index 819cc6789b4b806f8a850eb170ef9c034751d16b..7e7afc19bb0c5c98b0672566c90a92f28bf33264 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -255,7 +255,7 @@
 ./bin/named/include/named/zoneconf.h           C       1999,2000,2001,2002,2004,2005,2006,2007,2010,2011
 ./bin/named/interfacemgr.c                     C       1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014
 ./bin/named/listenlist.c                       C       2000,2001,2004,2005,2007,2013
-./bin/named/log.c                              C       1999,2000,2001,2002,2004,2005,2006,2007,2009,2013
+./bin/named/log.c                              C       1999,2000,2001,2002,2004,2005,2006,2007,2009,2013,2014
 ./bin/named/logconf.c                          C       1999,2000,2001,2004,2005,2006,2007,2011,2013
 ./bin/named/lwaddr.c                           C       2000,2001,2004,2005,2007,2008,2014
 ./bin/named/lwdclient.c                                C       2000,2001,2004,2005,2007
@@ -1385,15 +1385,16 @@
 ./bin/tests/system/limits/ns1/named.conf       CONF-C  2000,2001,2004,2007
 ./bin/tests/system/limits/ns1/root.db          ZONE    2000,2001,2004,2007
 ./bin/tests/system/limits/tests.sh             SH      2000,2001,2004,2007,2011,2012
-./bin/tests/system/logfileconfig/clean.sh      SH      2011,2012
+./bin/tests/system/logfileconfig/clean.sh      SH      2011,2012,2014
 ./bin/tests/system/logfileconfig/ns1/named.dirconf     CONF-C  2011,2013
 ./bin/tests/system/logfileconfig/ns1/named.pipeconf    CONF-C  2011,2013
 ./bin/tests/system/logfileconfig/ns1/named.plain       CONF-C  2011,2013
+./bin/tests/system/logfileconfig/ns1/named.plainconf   CONF-C  2014
 ./bin/tests/system/logfileconfig/ns1/named.symconf     CONF-C  2011,2013
 ./bin/tests/system/logfileconfig/ns1/rndc.conf CONF-C  2011,2013
 ./bin/tests/system/logfileconfig/ns1/root.db   ZONE    2011
 ./bin/tests/system/logfileconfig/setup.sh      SH      2011,2012
-./bin/tests/system/logfileconfig/tests.sh      SH      2011,2012,2013
+./bin/tests/system/logfileconfig/tests.sh      SH      2011,2012,2013,2014
 ./bin/tests/system/lwresd/Makefile.in          MAKE    2000,2001,2002,2004,2007,2009,2012,2014
 ./bin/tests/system/lwresd/clean.sh             SH      2008,2012,2013
 ./bin/tests/system/lwresd/lwresd1/lwresd.conf  CONF-C  2000,2001,2004,2007
@@ -2539,7 +2540,6 @@
 ./contrib/zkt-1.1.2/domaincmp.c                        X       2008,2010,2014
 ./contrib/zkt-1.1.2/domaincmp.h                        X       2008,2010,2014
 ./contrib/zkt-1.1.2/examples/dnssec.conf       X       2010,2014
-./contrib/zkt-1.1.2/examples/flat/core         X       2014
 ./contrib/zkt-1.1.2/examples/flat/dist.sh      X       2014
 ./contrib/zkt-1.1.2/examples/flat/dnssec.conf  X       2014
 ./contrib/zkt-1.1.2/examples/flat/dyn.example.net/Kdyn.example.net.+007+30323.key      X       2010,2014
@@ -2992,7 +2992,7 @@
 ./lib/dns/include/dns/tkey.h                   C       1999,2000,2001,2004,2005,2006,2007,2009,2010,2011
 ./lib/dns/include/dns/tsec.h                   C       2009,2010,2012
 ./lib/dns/include/dns/tsig.h                   C       1999,2000,2001,2002,2004,2005,2006,2007,2009,2010,2011
-./lib/dns/include/dns/ttl.h                    C       1999,2000,2001,2004,2005,2006,2007
+./lib/dns/include/dns/ttl.h                    C       1999,2000,2001,2004,2005,2006,2007,2014
 ./lib/dns/include/dns/types.h                  C       1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014
 ./lib/dns/include/dns/update.h                 C       2011
 ./lib/dns/include/dns/validator.h              C       2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2013,2014