update copyright notice

diff --git a/bin/tests/system/resolver/clean.sh b/bin/tests/system/resolver/clean.sh
index 6a4296861041358375021580fe4f82b4c51dc50e..6fbc8442e70dd3dca8a6668bad77f8e8ab60fd87 100644 (file)
--- a/bin/tests/system/resolver/clean.sh
+++ b/bin/tests/system/resolver/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2008-2011  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2008-2012  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
@@ -14,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.9 2012/02/09 20:54:45 marka Exp $
+# $Id: clean.sh,v 1.10 2012/02/09 23:47:17 tbox Exp $
 
 #
 # Clean up after resolver tests.

diff --git a/bin/tests/system/resolver/ns4/named.conf b/bin/tests/system/resolver/ns4/named.conf
index 69433daa0c5bc45c3dcdf4da250e9055b459e537..c7a7d6107fda23fe6ea73fe957be5febdb2ea9fa 100644 (file)
--- a/bin/tests/system/resolver/ns4/named.conf
+++ b/bin/tests/system/resolver/ns4/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010-2012  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
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.5 2012/02/09 20:54:45 marka Exp $ */
+/* $Id: named.conf,v 1.6 2012/02/09 23:47:18 tbox Exp $ */
 
 // NS4
 

diff --git a/bin/tests/system/resolver/ns4/tld1.db b/bin/tests/system/resolver/ns4/tld1.db
index 1dadbd2af16f3d4737f26d781c156dbd497d72a8..a2f55984d9bdf631705d0408d3c1788597a3496d 100644 (file)
--- a/bin/tests/system/resolver/ns4/tld1.db
+++ b/bin/tests/system/resolver/ns4/tld1.db
@@ -1,4 +1,4 @@
-; Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2012  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: tld1.db,v 1.2 2012/02/09 20:54:46 marka Exp $ 
+; $Id: tld1.db,v 1.3 2012/02/09 23:47:18 tbox Exp $ 
 
 $TTL 300
 @                      IN SOA  marka.isc.org. ns.server. (

diff --git a/bin/tests/system/resolver/ns4/tld2.db b/bin/tests/system/resolver/ns4/tld2.db
index 783b283c2cff39e3904a0c6608c237108d8f833e..6bd751438f37310e8bf4643eb09e5e80c5163cd7 100644 (file)
--- a/bin/tests/system/resolver/ns4/tld2.db
+++ b/bin/tests/system/resolver/ns4/tld2.db
@@ -1,4 +1,4 @@
-; Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2012  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: tld2.db,v 1.2 2012/02/09 20:54:46 marka Exp $ 
+; $Id: tld2.db,v 1.3 2012/02/09 23:47:18 tbox Exp $ 
 
 $TTL 300
 @                      IN SOA  marka.isc.org. ns.server. (

diff --git a/bin/tests/system/resolver/ns6/named.conf b/bin/tests/system/resolver/ns6/named.conf
index 759cb6256556e03535ef6dc1db4313b4864ae91a..c721d4673a9b741645ff26534649fef0a0123654 100644 (file)
--- a/bin/tests/system/resolver/ns6/named.conf
+++ b/bin/tests/system/resolver/ns6/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2012  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
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.3 2012/02/09 20:54:46 marka Exp $ */
+/* $Id: named.conf,v 1.4 2012/02/09 23:47:18 tbox Exp $ */
 
 // NS4
 

diff --git a/bin/tests/system/resolver/ns6/to-be-removed.tld.db.in b/bin/tests/system/resolver/ns6/to-be-removed.tld.db.in
index fcb868873a3d39b5301e64a3f0f5a49b371552ee..e7f994a5eb3fdbdbfd53112eb4a4fdf6cb1b0135 100644 (file)
--- a/bin/tests/system/resolver/ns6/to-be-removed.tld.db.in
+++ b/bin/tests/system/resolver/ns6/to-be-removed.tld.db.in
@@ -1,4 +1,4 @@
-; Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2012  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: to-be-removed.tld.db.in,v 1.2 2012/02/09 20:54:46 marka Exp $
+; $Id: to-be-removed.tld.db.in,v 1.3 2012/02/09 23:47:18 tbox Exp $
 
 $TTL 600
 @      IN SOA  ns hostmaster 1 1800 900 604800 600

diff --git a/bin/tests/system/resolver/setup.sh b/bin/tests/system/resolver/setup.sh
index a81e40757ebb41170e29132d9cd04790c2b53054..b1493a001901a0f265a3be8fa9b5c5eb577634a7 100644 (file)
--- a/bin/tests/system/resolver/setup.sh
+++ b/bin/tests/system/resolver/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2010, 2011  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010-2012  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
@@ -14,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.6 2012/02/09 20:54:45 marka Exp $
+# $Id: setup.sh,v 1.7 2012/02/09 23:47:17 tbox Exp $
 
 ../../../tools/genrandom 400 random.data
 

diff --git a/bin/tests/system/resolver/tests.sh b/bin/tests/system/resolver/tests.sh
index 765a265f6f4e77f67dd9f35ff06042f789760785..92834fdce2ca33fa9afdaeb520253dcc1221e2d9 100644 (file)
--- a/bin/tests/system/resolver/tests.sh
+++ b/bin/tests/system/resolver/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2009-2011  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009-2012  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: tests.sh,v 1.21 2012/02/09 20:54:45 marka Exp $
+# $Id: tests.sh,v 1.22 2012/02/09 23:47:18 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/smartsign/tests.sh b/bin/tests/system/smartsign/tests.sh
index 8a6fa230ba353adca2f9cef08af1181385265032..e0e2244d4a9e805cc07f30316bfd6a96c4e8886d 100644 (file)
--- a/bin/tests/system/smartsign/tests.sh
+++ b/bin/tests/system/smartsign/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2011  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010-2012  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
@@ -14,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.20 2012/02/09 21:10:45 marka Exp $
+# $Id: tests.sh,v 1.21 2012/02/09 23:47:18 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index f7bd233bc9146bcc97086fca3268600fe9783142..ca4d727669382975dae82eedbc513542c498c70a 100644 (file)
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rbtdb.c,v 1.327 2012/02/09 20:54:46 marka Exp $ */
+/* $Id: rbtdb.c,v 1.328 2012/02/09 23:47:18 tbox Exp $ */
 
 /*! \file */
 
@@ -6130,7 +6130,7 @@ add(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion,
                 * If we have will be replacing a NS RRset force its TTL
                 * to be no more than the current NS RRset's TTL.  This
                 * ensures the delegations that are withdrawn are honoured.
-                */ 
+                */
                if (IS_CACHE(rbtdb) && header->rdh_ttl > now &&
                    header->type == dns_rdatatype_ns &&
                    !header_nx && !newheader_nx &&