From ffd297db793b3efa3854f32f443b9f79e0417f2c Mon Sep 17 00:00:00 2001
From: Automatic Updater <source@isc.org>
Date: Mon, 30 Nov 2009 23:48:02 +0000
Subject: [PATCH] update copyright notice

---
 bin/tests/system/autosign/clean.sh               |  5 ++---
 bin/tests/system/autosign/ns1/keygen.sh          |  5 ++---
 bin/tests/system/autosign/ns1/named.conf         |  5 ++---
 bin/tests/system/autosign/ns1/root.db.in         |  5 ++---
 .../system/autosign/ns2/child.nsec3.example.db   |  4 ++--
 .../system/autosign/ns2/child.optout.example.db  |  4 ++--
 bin/tests/system/autosign/ns2/dst.example.db.in  |  4 ++--
 bin/tests/system/autosign/ns2/example.db.in      |  5 ++---
 .../autosign/ns2/insecure.secure.example.db      |  5 ++---
 bin/tests/system/autosign/ns2/keygen.sh          |  5 ++---
 bin/tests/system/autosign/ns2/named.conf         |  5 ++---
 .../autosign/ns2/private.secure.example.db.in    |  5 ++---
 .../system/autosign/ns3/insecure.example.db      |  5 ++---
 bin/tests/system/autosign/ns3/keygen.sh          |  5 ++---
 .../system/autosign/ns3/multiple.example.db.in   |  4 ++--
 bin/tests/system/autosign/ns3/named.conf         |  5 ++---
 .../system/autosign/ns3/nsec3.example.db.in      |  4 ++--
 .../autosign/ns3/nsec3.nsec3.example.db.in       |  4 ++--
 .../autosign/ns3/nsec3.optout.example.db.in      |  4 ++--
 .../system/autosign/ns3/optout.example.db.in     |  4 ++--
 .../autosign/ns3/optout.nsec3.example.db.in      |  4 ++--
 .../autosign/ns3/optout.optout.example.db.in     |  4 ++--
 .../system/autosign/ns3/secure.example.db.in     |  5 ++---
 .../autosign/ns3/secure.nsec3.example.db.in      |  4 ++--
 .../autosign/ns3/secure.optout.example.db.in     |  4 ++--
 bin/tests/system/autosign/ns4/named.conf         |  5 ++---
 bin/tests/system/autosign/ns5/named.conf         |  5 ++---
 bin/tests/system/autosign/prereq.sh              |  5 ++---
 bin/tests/system/autosign/setup.sh               |  5 ++---
 bin/tests/system/autosign/tests.sh               |  5 ++---
 bin/tests/system/metadata/child.db               | 16 ++++++++++++++++
 bin/tests/system/metadata/clean.sh               |  5 ++---
 bin/tests/system/metadata/parent.db              | 16 ++++++++++++++++
 bin/tests/system/metadata/prereq.sh              |  5 ++---
 bin/tests/system/metadata/setup.sh               |  5 ++---
 bin/tests/system/metadata/tests.sh               |  5 ++---
 36 files changed, 100 insertions(+), 90 deletions(-)

diff --git a/bin/tests/system/autosign/clean.sh b/bin/tests/system/autosign/clean.sh
index 35eeb5ffe4..303b4b479c 100644
--- a/bin/tests/system/autosign/clean.sh
+++ b/bin/tests/system/autosign/clean.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007-2009  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 2000-2002  Internet Software Consortium.
+# Copyright (C) 2009  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
@@ -15,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.2 2009/11/30 21:00:47 each Exp $
+# $Id: clean.sh,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
 rm -f */K* */dsset-* */*.signed */trusted.conf */tmp* */*.jnl */*.bk
 rm -f inact.key del.key unpub.key standby.key rev.key
diff --git a/bin/tests/system/autosign/ns1/keygen.sh b/bin/tests/system/autosign/ns1/keygen.sh
index 408c7049be..cdcf31d9af 100644
--- a/bin/tests/system/autosign/ns1/keygen.sh
+++ b/bin/tests/system/autosign/ns1/keygen.sh
@@ -1,7 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2004, 2006-2009  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 2000-2003  Internet Software Consortium.
+# Copyright (C) 2009  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
@@ -15,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: keygen.sh,v 1.2 2009/11/30 21:00:47 each Exp $
+# $Id: keygen.sh,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/autosign/ns1/named.conf b/bin/tests/system/autosign/ns1/named.conf
index 187640cc99..2fbe62f6fc 100644
--- a/bin/tests/system/autosign/ns1/named.conf
+++ b/bin/tests/system/autosign/ns1/named.conf
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2006, 2007  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2000, 2001  Internet Software Consortium.
+ * Copyright (C) 2009  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
@@ -15,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.2 2009/11/30 21:00:47 each Exp $ */
+/* $Id: named.conf,v 1.3 2009/11/30 23:48:02 tbox Exp $ */
 
 // NS1
 
diff --git a/bin/tests/system/autosign/ns1/root.db.in b/bin/tests/system/autosign/ns1/root.db.in
index 01f9ba6439..a1a19c4d60 100644
--- a/bin/tests/system/autosign/ns1/root.db.in
+++ b/bin/tests/system/autosign/ns1/root.db.in
@@ -1,5 +1,4 @@
-; Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) 2000, 2001  Internet Software Consortium.
+; Copyright (C) 2009  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
@@ -13,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: root.db.in,v 1.2 2009/11/30 21:00:47 each Exp $
+; $Id: root.db.in,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
 $TTL 30
 . 			IN SOA	a.root.servers.nil. each.isc.org. (
diff --git a/bin/tests/system/autosign/ns2/child.nsec3.example.db b/bin/tests/system/autosign/ns2/child.nsec3.example.db
index 8aa2427703..1305af6d9f 100644
--- a/bin/tests/system/autosign/ns2/child.nsec3.example.db
+++ b/bin/tests/system/autosign/ns2/child.nsec3.example.db
@@ -1,4 +1,4 @@
-; Copyright (C) 2006, 2008  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2009  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
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: child.nsec3.example.db,v 1.2 2009/11/30 21:00:47 each Exp $
+; $Id: child.nsec3.example.db,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
diff --git a/bin/tests/system/autosign/ns2/child.optout.example.db b/bin/tests/system/autosign/ns2/child.optout.example.db
index 1fb542cb29..ef9b6d0dd1 100644
--- a/bin/tests/system/autosign/ns2/child.optout.example.db
+++ b/bin/tests/system/autosign/ns2/child.optout.example.db
@@ -1,4 +1,4 @@
-; Copyright (C) 2006, 2008  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2009  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
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: child.optout.example.db,v 1.2 2009/11/30 21:00:47 each Exp $
+; $Id: child.optout.example.db,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
diff --git a/bin/tests/system/autosign/ns2/dst.example.db.in b/bin/tests/system/autosign/ns2/dst.example.db.in
index 9e0feae3a2..8238a73e38 100644
--- a/bin/tests/system/autosign/ns2/dst.example.db.in
+++ b/bin/tests/system/autosign/ns2/dst.example.db.in
@@ -1,4 +1,4 @@
-; Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2009  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
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: dst.example.db.in,v 1.2 2009/11/30 21:00:47 each Exp $
+; $Id: dst.example.db.in,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
diff --git a/bin/tests/system/autosign/ns2/example.db.in b/bin/tests/system/autosign/ns2/example.db.in
index d02517e8d7..88f113f02b 100644
--- a/bin/tests/system/autosign/ns2/example.db.in
+++ b/bin/tests/system/autosign/ns2/example.db.in
@@ -1,5 +1,4 @@
-; Copyright (C) 2004, 2007-2009  Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) 2000-2002  Internet Software Consortium.
+; Copyright (C) 2009  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
@@ -13,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: example.db.in,v 1.2 2009/11/30 21:00:47 each Exp $
+; $Id: example.db.in,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
diff --git a/bin/tests/system/autosign/ns2/insecure.secure.example.db b/bin/tests/system/autosign/ns2/insecure.secure.example.db
index cd2d62e6d9..d086e64c80 100644
--- a/bin/tests/system/autosign/ns2/insecure.secure.example.db
+++ b/bin/tests/system/autosign/ns2/insecure.secure.example.db
@@ -1,5 +1,4 @@
-; Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) 2000, 2001  Internet Software Consortium.
+; Copyright (C) 2009  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
@@ -13,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: insecure.secure.example.db,v 1.2 2009/11/30 21:00:47 each Exp $
+; $Id: insecure.secure.example.db,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
diff --git a/bin/tests/system/autosign/ns2/keygen.sh b/bin/tests/system/autosign/ns2/keygen.sh
index 9554723412..12ed51d8a8 100644
--- a/bin/tests/system/autosign/ns2/keygen.sh
+++ b/bin/tests/system/autosign/ns2/keygen.sh
@@ -1,7 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2004, 2006-2009  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 2000-2003  Internet Software Consortium.
+# Copyright (C) 2009  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
@@ -15,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: keygen.sh,v 1.2 2009/11/30 21:00:47 each Exp $
+# $Id: keygen.sh,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/autosign/ns2/named.conf b/bin/tests/system/autosign/ns2/named.conf
index f7ec6e8b1d..de79f6b039 100644
--- a/bin/tests/system/autosign/ns2/named.conf
+++ b/bin/tests/system/autosign/ns2/named.conf
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2006-2008  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2000-2002  Internet Software Consortium.
+ * Copyright (C) 2009  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
@@ -15,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.2 2009/11/30 21:00:47 each Exp $ */
+/* $Id: named.conf,v 1.3 2009/11/30 23:48:02 tbox Exp $ */
 
 // NS2
 
diff --git a/bin/tests/system/autosign/ns2/private.secure.example.db.in b/bin/tests/system/autosign/ns2/private.secure.example.db.in
index a5d4cde51f..25cda54c57 100644
--- a/bin/tests/system/autosign/ns2/private.secure.example.db.in
+++ b/bin/tests/system/autosign/ns2/private.secure.example.db.in
@@ -1,5 +1,4 @@
-; Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) 2000, 2001  Internet Software Consortium.
+; Copyright (C) 2009  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
@@ -13,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: private.secure.example.db.in,v 1.2 2009/11/30 21:00:47 each Exp $
+; $Id: private.secure.example.db.in,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
diff --git a/bin/tests/system/autosign/ns3/insecure.example.db b/bin/tests/system/autosign/ns3/insecure.example.db
index 66fdc4c96e..ea5c7f4d7b 100644
--- a/bin/tests/system/autosign/ns3/insecure.example.db
+++ b/bin/tests/system/autosign/ns3/insecure.example.db
@@ -1,5 +1,4 @@
-; Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) 2000, 2001  Internet Software Consortium.
+; Copyright (C) 2009  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
@@ -13,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: insecure.example.db,v 1.2 2009/11/30 21:00:47 each Exp $
+; $Id: insecure.example.db,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
diff --git a/bin/tests/system/autosign/ns3/keygen.sh b/bin/tests/system/autosign/ns3/keygen.sh
index a9c288b071..06d8ab53ec 100644
--- a/bin/tests/system/autosign/ns3/keygen.sh
+++ b/bin/tests/system/autosign/ns3/keygen.sh
@@ -1,7 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2004, 2006-2009  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 2000-2002  Internet Software Consortium.
+# Copyright (C) 2009  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
@@ -15,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: keygen.sh,v 1.2 2009/11/30 21:00:47 each Exp $
+# $Id: keygen.sh,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/autosign/ns3/multiple.example.db.in b/bin/tests/system/autosign/ns3/multiple.example.db.in
index dd90f4631c..08a803bdf8 100644
--- a/bin/tests/system/autosign/ns3/multiple.example.db.in
+++ b/bin/tests/system/autosign/ns3/multiple.example.db.in
@@ -1,4 +1,4 @@
-; Copyright (C) 2006, 2008  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2009  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
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: multiple.example.db.in,v 1.2 2009/11/30 21:00:47 each Exp $
+; $Id: multiple.example.db.in,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
diff --git a/bin/tests/system/autosign/ns3/named.conf b/bin/tests/system/autosign/ns3/named.conf
index ffd029e802..ea07c276a2 100644
--- a/bin/tests/system/autosign/ns3/named.conf
+++ b/bin/tests/system/autosign/ns3/named.conf
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2006-2009  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2000-2002  Internet Software Consortium.
+ * Copyright (C) 2009  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
@@ -15,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.2 2009/11/30 21:00:47 each Exp $ */
+/* $Id: named.conf,v 1.3 2009/11/30 23:48:02 tbox Exp $ */
 
 // NS3
 
diff --git a/bin/tests/system/autosign/ns3/nsec3.example.db.in b/bin/tests/system/autosign/ns3/nsec3.example.db.in
index c7db3fe432..f8706c572a 100644
--- a/bin/tests/system/autosign/ns3/nsec3.example.db.in
+++ b/bin/tests/system/autosign/ns3/nsec3.example.db.in
@@ -1,4 +1,4 @@
-; Copyright (C) 2006, 2008  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2009  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
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: nsec3.example.db.in,v 1.2 2009/11/30 21:00:47 each Exp $
+; $Id: nsec3.example.db.in,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
diff --git a/bin/tests/system/autosign/ns3/nsec3.nsec3.example.db.in b/bin/tests/system/autosign/ns3/nsec3.nsec3.example.db.in
index 8869b7899e..f87db9db82 100644
--- a/bin/tests/system/autosign/ns3/nsec3.nsec3.example.db.in
+++ b/bin/tests/system/autosign/ns3/nsec3.nsec3.example.db.in
@@ -1,4 +1,4 @@
-; Copyright (C) 2008  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2009  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
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: nsec3.nsec3.example.db.in,v 1.2 2009/11/30 21:00:47 each Exp $
+; $Id: nsec3.nsec3.example.db.in,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
diff --git a/bin/tests/system/autosign/ns3/nsec3.optout.example.db.in b/bin/tests/system/autosign/ns3/nsec3.optout.example.db.in
index a35fa79272..659c794d38 100644
--- a/bin/tests/system/autosign/ns3/nsec3.optout.example.db.in
+++ b/bin/tests/system/autosign/ns3/nsec3.optout.example.db.in
@@ -1,4 +1,4 @@
-; Copyright (C) 2008  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2009  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
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: nsec3.optout.example.db.in,v 1.2 2009/11/30 21:00:47 each Exp $
+; $Id: nsec3.optout.example.db.in,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
diff --git a/bin/tests/system/autosign/ns3/optout.example.db.in b/bin/tests/system/autosign/ns3/optout.example.db.in
index 780c048fd1..7d5d114702 100644
--- a/bin/tests/system/autosign/ns3/optout.example.db.in
+++ b/bin/tests/system/autosign/ns3/optout.example.db.in
@@ -1,4 +1,4 @@
-; Copyright (C) 2006, 2008  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2009  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
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: optout.example.db.in,v 1.2 2009/11/30 21:00:47 each Exp $
+; $Id: optout.example.db.in,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
diff --git a/bin/tests/system/autosign/ns3/optout.nsec3.example.db.in b/bin/tests/system/autosign/ns3/optout.nsec3.example.db.in
index 0ee2375111..df5d14e50f 100644
--- a/bin/tests/system/autosign/ns3/optout.nsec3.example.db.in
+++ b/bin/tests/system/autosign/ns3/optout.nsec3.example.db.in
@@ -1,4 +1,4 @@
-; Copyright (C) 2008  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2009  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
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: optout.nsec3.example.db.in,v 1.2 2009/11/30 21:00:47 each Exp $
+; $Id: optout.nsec3.example.db.in,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
diff --git a/bin/tests/system/autosign/ns3/optout.optout.example.db.in b/bin/tests/system/autosign/ns3/optout.optout.example.db.in
index 63a281cb97..d2be4b40b7 100644
--- a/bin/tests/system/autosign/ns3/optout.optout.example.db.in
+++ b/bin/tests/system/autosign/ns3/optout.optout.example.db.in
@@ -1,4 +1,4 @@
-; Copyright (C) 2008  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2009  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
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: optout.optout.example.db.in,v 1.2 2009/11/30 21:00:47 each Exp $
+; $Id: optout.optout.example.db.in,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
diff --git a/bin/tests/system/autosign/ns3/secure.example.db.in b/bin/tests/system/autosign/ns3/secure.example.db.in
index 58a500ae84..a0e7051e41 100644
--- a/bin/tests/system/autosign/ns3/secure.example.db.in
+++ b/bin/tests/system/autosign/ns3/secure.example.db.in
@@ -1,5 +1,4 @@
-; Copyright (C) 2004, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) 2000, 2001  Internet Software Consortium.
+; Copyright (C) 2009  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
@@ -13,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: secure.example.db.in,v 1.2 2009/11/30 21:00:47 each Exp $
+; $Id: secure.example.db.in,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
diff --git a/bin/tests/system/autosign/ns3/secure.nsec3.example.db.in b/bin/tests/system/autosign/ns3/secure.nsec3.example.db.in
index 563808b144..ff530a04ce 100644
--- a/bin/tests/system/autosign/ns3/secure.nsec3.example.db.in
+++ b/bin/tests/system/autosign/ns3/secure.nsec3.example.db.in
@@ -1,4 +1,4 @@
-; Copyright (C) 2008  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2009  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
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: secure.nsec3.example.db.in,v 1.2 2009/11/30 21:00:47 each Exp $
+; $Id: secure.nsec3.example.db.in,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
diff --git a/bin/tests/system/autosign/ns3/secure.optout.example.db.in b/bin/tests/system/autosign/ns3/secure.optout.example.db.in
index 36361d2956..9fb5211651 100644
--- a/bin/tests/system/autosign/ns3/secure.optout.example.db.in
+++ b/bin/tests/system/autosign/ns3/secure.optout.example.db.in
@@ -1,4 +1,4 @@
-; Copyright (C) 2008  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2009  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
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: secure.optout.example.db.in,v 1.2 2009/11/30 21:00:47 each Exp $
+; $Id: secure.optout.example.db.in,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
diff --git a/bin/tests/system/autosign/ns4/named.conf b/bin/tests/system/autosign/ns4/named.conf
index 5b9242a393..9e2dda4642 100644
--- a/bin/tests/system/autosign/ns4/named.conf
+++ b/bin/tests/system/autosign/ns4/named.conf
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2006, 2007  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2000, 2001  Internet Software Consortium.
+ * Copyright (C) 2009  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
@@ -15,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.2 2009/11/30 21:00:47 each Exp $ */
+/* $Id: named.conf,v 1.3 2009/11/30 23:48:02 tbox Exp $ */
 
 // NS4
 
diff --git a/bin/tests/system/autosign/ns5/named.conf b/bin/tests/system/autosign/ns5/named.conf
index 3a821154c9..2ce156ce23 100644
--- a/bin/tests/system/autosign/ns5/named.conf
+++ b/bin/tests/system/autosign/ns5/named.conf
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2006, 2007  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2000, 2001  Internet Software Consortium.
+ * Copyright (C) 2009  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
@@ -15,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.2 2009/11/30 21:00:47 each Exp $ */
+/* $Id: named.conf,v 1.3 2009/11/30 23:48:02 tbox Exp $ */
 
 // NS5
 
diff --git a/bin/tests/system/autosign/prereq.sh b/bin/tests/system/autosign/prereq.sh
index 9c31602201..4ce0b55054 100644
--- a/bin/tests/system/autosign/prereq.sh
+++ b/bin/tests/system/autosign/prereq.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2006, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 2000-2002  Internet Software Consortium.
+# Copyright (C) 2009  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
@@ -15,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: prereq.sh,v 1.2 2009/11/30 21:00:47 each Exp $
+# $Id: prereq.sh,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
 ../../../tools/genrandom 400 random.data
 
diff --git a/bin/tests/system/autosign/setup.sh b/bin/tests/system/autosign/setup.sh
index 4864dbfb5c..d4c95462d9 100644
--- a/bin/tests/system/autosign/setup.sh
+++ b/bin/tests/system/autosign/setup.sh
@@ -1,7 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2004, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 2000, 2001  Internet Software Consortium.
+# Copyright (C) 2009  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
@@ -15,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: setup.sh,v 1.2 2009/11/30 21:00:47 each Exp $
+# $Id: setup.sh,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/autosign/tests.sh b/bin/tests/system/autosign/tests.sh
index 04706b4874..083962f490 100644
--- a/bin/tests/system/autosign/tests.sh
+++ b/bin/tests/system/autosign/tests.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 2000-2002  Internet Software Consortium.
+# Copyright (C) 2009  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
@@ -15,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: tests.sh,v 1.2 2009/11/30 21:00:47 each Exp $
+# $Id: tests.sh,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/metadata/child.db b/bin/tests/system/metadata/child.db
index e74bda904b..84e229ffd3 100644
--- a/bin/tests/system/metadata/child.db
+++ b/bin/tests/system/metadata/child.db
@@ -1,3 +1,19 @@
+; Copyright (C) 2009  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.
+
+; $Id: child.db,v 1.3 2009/11/30 23:48:02 tbox Exp $
+
 $ORIGIN .
 $TTL 20
 child.parent.nil		IN SOA	ns.child.parent.nil. hostmaster.parent.nil. (
diff --git a/bin/tests/system/metadata/clean.sh b/bin/tests/system/metadata/clean.sh
index edc2ab0e46..c77b7e6a7d 100644
--- a/bin/tests/system/metadata/clean.sh
+++ b/bin/tests/system/metadata/clean.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007-2009  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 2000-2002  Internet Software Consortium.
+# Copyright (C) 2009  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
@@ -15,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.2 2009/11/30 21:00:48 each Exp $
+# $Id: clean.sh,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
 rm -f K* dsset-* *.signed *.new random.data
 rm -f zsk.key ksk.key parent.ksk.key parent.zsk.key 
diff --git a/bin/tests/system/metadata/parent.db b/bin/tests/system/metadata/parent.db
index 060c0454f5..b5affab0f4 100644
--- a/bin/tests/system/metadata/parent.db
+++ b/bin/tests/system/metadata/parent.db
@@ -1,3 +1,19 @@
+; Copyright (C) 2009  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.
+
+; $Id: parent.db,v 1.3 2009/11/30 23:48:02 tbox Exp $
+
 $ORIGIN .
 $TTL 300	; 5 minutes
 parent.nil		IN SOA	ns1.parent.nil. hostmaster.parent.nil. (
diff --git a/bin/tests/system/metadata/prereq.sh b/bin/tests/system/metadata/prereq.sh
index 2b811d5402..ce60892580 100644
--- a/bin/tests/system/metadata/prereq.sh
+++ b/bin/tests/system/metadata/prereq.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2006, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 2000-2002  Internet Software Consortium.
+# Copyright (C) 2009  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
@@ -15,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: prereq.sh,v 1.2 2009/11/30 21:00:48 each Exp $
+# $Id: prereq.sh,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
 ../../../tools/genrandom 400 random.data
 
diff --git a/bin/tests/system/metadata/setup.sh b/bin/tests/system/metadata/setup.sh
index 087bb3026a..7fa6b60765 100644
--- a/bin/tests/system/metadata/setup.sh
+++ b/bin/tests/system/metadata/setup.sh
@@ -1,7 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2004, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 2000, 2001  Internet Software Consortium.
+# Copyright (C) 2009  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
@@ -15,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: setup.sh,v 1.2 2009/11/30 21:00:48 each Exp $
+# $Id: setup.sh,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/metadata/tests.sh b/bin/tests/system/metadata/tests.sh
index e67ba0eb67..0ea3fbc1a0 100644
--- a/bin/tests/system/metadata/tests.sh
+++ b/bin/tests/system/metadata/tests.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 2000-2002  Internet Software Consortium.
+# Copyright (C) 2009  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
@@ -15,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: tests.sh,v 1.2 2009/11/30 21:00:48 each Exp $
+# $Id: tests.sh,v 1.3 2009/11/30 23:48:02 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh