fixup copyrights

diff --git a/lib/samples/rootkey.sh b/lib/samples/rootkey.sh
index e26f153863f10b856b9979686a9ea038ba4bddf8..53b818a7ad32d4a62f94183775838dfdf1451c17 100644 (file)
--- a/lib/samples/rootkey.sh
+++ b/lib/samples/rootkey.sh
@@ -1,4 +1,19 @@
 #!/bin/sh
+#
+# Copyright (C) 2013  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
+# copyright notice and this permission notice appear in all copies.
+#
+# 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.
+
 # Fetch a copy of a current root signing key; used for testing
 # DNSSEC validation in 'sample'.
 #

diff --git a/util/copyrights b/util/copyrights
index 56537b2443182ce65476e4c88632d85ed307c317..b9c24ed891b3a0525dae266a5bd43f7c27794f95 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -2848,7 +2848,6 @@
 ./lib/isc/include/isc/msgcat.h                 C       1999,2000,2001,2004,2005,2007
 ./lib/isc/include/isc/msgs.h                   C       2000,2001,2002,2003,2004,2005,2006,2007,2008,2009
 ./lib/isc/include/isc/mutexblock.h             C       1999,2000,2001,2004,2005,2006,2007
-./lib/isc/include/isc/namespace.h              C       2009,2010,2011,2012,2013
 ./lib/isc/include/isc/netaddr.h                        C       1998,1999,2000,2001,2002,2004,2005,2006,2007,2009
 ./lib/isc/include/isc/netscope.h               C       2002,2004,2005,2006,2007,2009
 ./lib/isc/include/isc/ondestroy.h              C       2000,2001,2004,2005,2006,2007
@@ -2897,7 +2896,6 @@
 ./lib/isc/log.c                                        C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2009,2011,2012,2013
 ./lib/isc/md5.c                                        C       2000,2001,2004,2005,2007,2009
 ./lib/isc/mem.c                                        C       1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2012,2013
-./lib/isc/mem_api.c                            C       2009,2010,2012
 ./lib/isc/mips/Makefile.in                     MAKE    2007,2012
 ./lib/isc/mips/include/Makefile.in             MAKE    2007,2012
 ./lib/isc/mips/include/isc/Makefile.in         MAKE    2007,2012
@@ -2963,7 +2961,6 @@
 ./lib/isc/strtoul.c                            C       2003,2004,2005,2007
 ./lib/isc/symtab.c                             C       1996,1997,1998,1999,2000,2001,2004,2005,2007,2011,2012,2013
 ./lib/isc/task.c                               C       1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013
-./lib/isc/task_api.c                           C       2009,2010,2011,2012
 ./lib/isc/task_p.h                             C       2000,2001,2004,2005,2007,2009,2011,2012,2013
 ./lib/isc/taskpool.c                           C       1999,2000,2001,2004,2005,2007,2011,2012,2013
 ./lib/isc/tests/Atffile                                X       2011
@@ -2981,7 +2978,6 @@
 ./lib/isc/tests/task_test.c                    C       2011,2012
 ./lib/isc/tests/taskpool_test.c                        C       2011,2012
 ./lib/isc/timer.c                              C       1998,1999,2000,2001,2002,2004,2005,2007,2008,2009,2011,2012,2013
-./lib/isc/timer_api.c                          C       2009,2012
 ./lib/isc/timer_p.h                            C       2000,2001,2004,2005,2007,2009
 ./lib/isc/unix/Makefile.in                     MAKE    1998,1999,2000,2001,2004,2007,2009,2012
 ./lib/isc/unix/app.c                           C       1999,2000,2001,2002,2003,2004,2005,2007,2008,2009,2013
@@ -3262,8 +3258,7 @@
 ./lib/samples/Makefile-postinstall.in          MAKE    2009,2012,2013
 ./lib/samples/Makefile.in                      MAKE    2009,2012,2013
 ./lib/samples/nsprobe.c                                C       2009,2010,2011,2012,2013
-./lib/samples/request.c                                C       2009,2012,2013
-./lib/samples/resolve.c                                C       2013
+./lib/samples/resolve.c                                C       2009,2012,2013
 ./lib/samples/rootkey.sh                       SH      2013
 ./lib/samples/sample-async.c                   C       2009,2013
 ./lib/samples/sample-gai.c                     C       2009,2012,2013