update copyright notice

diff --git a/bin/dnssec/dnssec-keyfromlabel.docbook b/bin/dnssec/dnssec-keyfromlabel.docbook
index 9f4a5238cb706c3956caa7e978a69c329db7c300..83690d5d68db02b4dc4c996fb4c0319c088e261c 100644 (file)
--- a/bin/dnssec/dnssec-keyfromlabel.docbook
+++ b/bin/dnssec/dnssec-keyfromlabel.docbook
@@ -2,7 +2,7 @@
                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
               [<!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2008-2010  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2008-2011  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
@@ -17,7 +17,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: dnssec-keyfromlabel.docbook,v 1.18.14.1 2011/02/03 11:59:29 marka Exp $ -->
+<!-- $Id: dnssec-keyfromlabel.docbook,v 1.18.14.1.2.1 2011/06/02 23:47:27 tbox Exp $ -->
 <refentry id="man.dnssec-keyfromlabel">
   <refentryinfo>
     <date>February 8, 2008</date>
@@ -39,6 +39,7 @@
       <year>2008</year>
       <year>2009</year>
       <year>2010</year>
+      <year>2011</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
   </docinfo>

diff --git a/bin/named/config.c b/bin/named/config.c
index 0e04d1877eee788a0dffb957d4c289a3d2775e6e..1fd3e57e5ff420bbdd6b361d2e3b79d9deee0bb2 100644 (file)
--- a/bin/named/config.c
+++ b/bin/named/config.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: config.c,v 1.113.16.1 2011/02/03 05:50:05 marka Exp $ */
+/* $Id: config.c,v 1.113.16.1.2.1 2011/06/02 23:47:28 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/named/query.c b/bin/named/query.c
index cc88578c6f4dff30f792e82b38a0403f66b6d054..518204b0999127204c08b3911ff2ae3d439e087f 100644 (file)
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: query.c,v 1.353.8.2.2.1 2011/04/27 17:06:27 each Exp $ */
+/* $Id: query.c,v 1.353.8.2.2.2 2011/06/02 23:47:28 tbox Exp $ */
 
 /*! \file */
 
@@ -4091,7 +4091,7 @@ rpz_find(ns_client_t *client, dns_rdatatype_t qtype, dns_name_t *qnamef,
                        if (qtype == dns_rdatatype_rrsig ||
                            qtype == dns_rdatatype_sig)
                                result = DNS_R_NXRRSET;
-                       else 
+                       else
                                result = dns_db_find(*dbp, qnamef, version,
                                                     qtype, 0, client->now,
                                                     nodep, found, *rdatasetp,

diff --git a/bin/named/update.c b/bin/named/update.c
index 54aef580f672ed29cd412a9950fa8a51a16f54cf..51b670864f16c838d0dee5636f0898f8cfdbe5bc 100644 (file)
--- a/bin/named/update.c
+++ b/bin/named/update.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: update.c,v 1.186.16.1 2011/02/03 06:18:51 marka Exp $ */
+/* $Id: update.c,v 1.186.16.1.2.1 2011/06/02 23:47:28 tbox Exp $ */
 
 #include <config.h>
 
@@ -3436,7 +3436,7 @@ add_signing_records(dns_db_t *db, dns_rdatatype_t privatetype,
         */
        for (tuple = ISC_LIST_HEAD(diff->tuples);
             tuple != NULL; tuple = next) {
-       
+
                next = ISC_LIST_NEXT(tuple, link);
 
                if (tuple->rdata.type != dns_rdatatype_dnskey)
@@ -3500,7 +3500,7 @@ add_signing_records(dns_db_t *db, dns_rdatatype_t privatetype,
             tuple = ISC_LIST_HEAD(temp_diff.tuples)) {
 
                ISC_LIST_UNLINK(temp_diff.tuples, tuple, link);
-                ISC_LIST_APPEND(diff->tuples, tuple, link);
+               ISC_LIST_APPEND(diff->tuples, tuple, link);
 
                dns_rdata_tostruct(&tuple->rdata, &dnskey, NULL);
                if ((dnskey.flags &

diff --git a/bin/rndc/rndc.c b/bin/rndc/rndc.c
index 49904e0ba5d263c432748a3a85045572c88f54eb..988acd74a6b27643cdd6aa88d17687b115e5acc1 100644 (file)
--- a/bin/rndc/rndc.c
+++ b/bin/rndc/rndc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rndc.c,v 1.131.20.1 2011/02/03 11:44:45 marka Exp $ */
+/* $Id: rndc.c,v 1.131.20.1.2.1 2011/06/02 23:47:28 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/tests/resolver/Makefile.in b/bin/tests/resolver/Makefile.in
index 31c1cbf6f649525c2997e68b3ae7ae24e6281612..3592763afe81884598faa4a68d63e7d09a2615f7 100644 (file)
--- a/bin/tests/resolver/Makefile.in
+++ b/bin/tests/resolver/Makefile.in
@@ -1,7 +1,6 @@
-# Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 1999-2002  Internet Software Consortium.
+# Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
 #
-# Permission to use, copy, modify, and distribute this software for any
+# 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.
 #
@@ -13,7 +12,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2.2.2 2011/02/03 05:50:06 marka Exp $
+# $Id: Makefile.in,v 1.2.2.2.2.1 2011/06/02 23:47:28 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/bin/tests/resolver/t_resolver.c b/bin/tests/resolver/t_resolver.c
index 317ccc2660073513130bf7a382f2821aca54a027..129f2c824e03caec09407b650e504338d45a6c09 100644 (file)
--- a/bin/tests/resolver/t_resolver.c
+++ b/bin/tests/resolver/t_resolver.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_resolver.c,v 1.2.2.2 2011/02/03 05:50:06 marka Exp $ */
+/* $Id: t_resolver.c,v 1.2.2.2.2.1 2011/06/02 23:47:28 tbox Exp $ */
 
 #include <config.h>
 
@@ -52,7 +52,7 @@ setup_create_dispatch_v4(void)
 {
        isc_sockaddr_t local_address;
        isc_sockaddr_any(&local_address);
-       
+
        CHECK(dns_dispatch_getudp(dispatch_manager, socket_manager, task_manager,
                                  &local_address, 4096, 100, 100, 100, 500,
                                  0, 0, /* unsigned int attributes, unsigned int mask, */
@@ -83,7 +83,7 @@ teardown(void) {
 static isc_result_t
 make_resolver(dns_resolver_t **resolverp) {
        isc_result_t result;
-       
+
        result = dns_resolver_create(view,
                            task_manager, 1,
                            socket_manager,
@@ -128,7 +128,7 @@ test_dns_resolver_gettimeout(void) {
                 "The default timeout is returned from _gettimeout()");
        setup();
        CHECK(make_resolver(&resolver));
-       
+
        timeout = dns_resolver_gettimeout(resolver);
        t_info("The default timeout is %d second%s\n", timeout, (timeout == 1 ? "" : "s"));
        test_result = (timeout > 0) ? T_PASS : T_FAIL;
@@ -149,7 +149,7 @@ test_dns_resolver_settimeout(void) {
                 "_settimeout() can change the timeout to a non-default");
        setup();
        CHECK(make_resolver(&resolver));
-       
+
        default_timeout = dns_resolver_gettimeout(resolver);
        t_info("The default timeout is %d second%s\n", default_timeout,
               (default_timeout == 1 ? "" : "s"));
@@ -162,7 +162,7 @@ test_dns_resolver_settimeout(void) {
 
        destroy_resolver(&resolver);
        teardown();
-       
+
        t_result(test_result);
 }
 
@@ -177,7 +177,7 @@ test_dns_resolver_settimeout_to_default(void) {
                 " by specifying 0 as the timeout.");
        setup();
        CHECK(make_resolver(&resolver));
-       
+
        default_timeout = dns_resolver_gettimeout(resolver);
        t_info("The default timeout is %d second%s\n", default_timeout,
               (default_timeout == 1 ? "" : "s"));
@@ -193,7 +193,7 @@ test_dns_resolver_settimeout_to_default(void) {
 
        destroy_resolver(&resolver);
        teardown();
-       
+
        t_result(test_result);
 }
 
@@ -207,7 +207,7 @@ test_dns_resolver_settimeout_over_maximum(void) {
                 "_settimeout() cannot set the value larger than the maximum.");
        setup();
        CHECK(make_resolver(&resolver));
-       
+
        dns_resolver_settimeout(resolver, 4000000);
        timeout = dns_resolver_gettimeout(resolver);
        t_info("The new timeout is %d second%s\n", timeout,
@@ -217,7 +217,7 @@ test_dns_resolver_settimeout_over_maximum(void) {
 
        destroy_resolver(&resolver);
        teardown();
-       
+
        t_result(test_result);
 }
 

diff --git a/bin/tests/system/dlv/clean.sh b/bin/tests/system/dlv/clean.sh
index 62612532801f5f625fd73a1b8d711cd2f23a6a5d..2cb3b3f2317e33efff595b4cc27aa3ec6367a771 100644 (file)
--- a/bin/tests/system/dlv/clean.sh
+++ b/bin/tests/system/dlv/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2010, 2011  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.7.242.1 2011/05/27 00:57:30 each Exp $
+# $Id: clean.sh,v 1.7.242.2 2011/06/02 23:47:29 tbox Exp $
 
 rm -f random.data
 rm -f ns*/named.run

diff --git a/bin/tests/system/dlv/ns1/named.conf b/bin/tests/system/dlv/ns1/named.conf
index 8c69a778cb04e60d6af0d9f09d373f1e1471d1fc..a41a110bfa6016273e06379ce3b3cff2797d8eed 100644 (file)
--- a/bin/tests/system/dlv/ns1/named.conf
+++ b/bin/tests/system/dlv/ns1/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2011  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.4.950.1 2011/05/27 00:57:30 each Exp $ */
+/* $Id: named.conf,v 1.4.950.2 2011/06/02 23:47:29 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/dlv/ns1/root.db.in b/bin/tests/system/dlv/ns1/root.db.in
index 00ff64ad497823e76faa32b50568117338b0aec5..c74c2da6c8aad1969ba740757d4dfc53e0fd2a3b 100644 (file)
--- a/bin/tests/system/dlv/ns1/root.db.in
+++ b/bin/tests/system/dlv/ns1/root.db.in
@@ -1,4 +1,4 @@
-; Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2011  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: root.db.in,v 1.3.8.2 2011/05/27 00:57:30 each Exp $
+; $Id: root.db.in,v 1.3.8.3 2011/06/02 23:47:29 tbox Exp $
 
 $TTL   120
 @              SOA     ns.rootservers.utld hostmaster.ns.rootservers.utld (

diff --git a/bin/tests/system/dlv/ns1/sign.sh b/bin/tests/system/dlv/ns1/sign.sh
index 1c7469035fed36f27e7d92caf27f3db6307fef71..117d53bfd01fbc575fc39832a24e430b96dcb47f 100755 (executable)
--- a/bin/tests/system/dlv/ns1/sign.sh
+++ b/bin/tests/system/dlv/ns1/sign.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2009, 2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011  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: sign.sh,v 1.3.8.2 2011/05/27 00:57:30 each Exp $
+# $Id: sign.sh,v 1.3.8.3 2011/06/02 23:47:29 tbox Exp $
 
 (cd ../ns2 && sh -e ./sign.sh || exit 1)
 

diff --git a/bin/tests/system/dlv/ns2/druz.db.in b/bin/tests/system/dlv/ns2/druz.db.in
index 3397f35f88c049810c93c825d743f381d21ad405..4621e1f5c222b5946e014366f779f50000230109 100644 (file)
--- a/bin/tests/system/dlv/ns2/druz.db.in
+++ b/bin/tests/system/dlv/ns2/druz.db.in
@@ -1,4 +1,4 @@
-; Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2011  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: druz.db.in,v 1.4.8.2 2011/05/27 00:57:30 each Exp $
+; $Id: druz.db.in,v 1.4.8.3 2011/06/02 23:47:29 tbox Exp $
 
 $TTL   120
 @              SOA     ns hostmaster.ns 1 3600 1200 604800 60

diff --git a/bin/tests/system/dlv/ns2/named.conf b/bin/tests/system/dlv/ns2/named.conf
index 702416dfefb9586655fee442eeed2cee8dbb5bbf..1f8259640955fc35f72f520445d525d97b655a2f 100644 (file)
--- a/bin/tests/system/dlv/ns2/named.conf
+++ b/bin/tests/system/dlv/ns2/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2011  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.4.950.1 2011/05/27 00:57:30 each Exp $ */
+/* $Id: named.conf,v 1.4.950.2 2011/06/02 23:47:29 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/dlv/ns2/sign.sh b/bin/tests/system/dlv/ns2/sign.sh
index 341ad85b167a4a60a948642f5874aefec9605ad4..22265db3e72c7b14a244356aa08a81566a99552e 100755 (executable)
--- a/bin/tests/system/dlv/ns2/sign.sh
+++ b/bin/tests/system/dlv/ns2/sign.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2009, 2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011  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: sign.sh,v 1.3.8.2 2011/05/27 00:57:31 each Exp $
+# $Id: sign.sh,v 1.3.8.3 2011/06/02 23:47:29 tbox Exp $
 
 (cd ../ns3 && sh -e ./sign.sh || exit 1)
 

diff --git a/bin/tests/system/dlv/ns3/named.conf b/bin/tests/system/dlv/ns3/named.conf
index 7ea4d54eac3cd0d53fb81a64fac371981798fbca..b7dd3056d9f758128d738895225cca3f873c723a 100644 (file)
--- a/bin/tests/system/dlv/ns3/named.conf
+++ b/bin/tests/system/dlv/ns3/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2011  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.4.950.1 2011/05/27 00:57:31 each Exp $ */
+/* $Id: named.conf,v 1.4.950.2 2011/06/02 23:47:29 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/dlv/ns3/sign.sh b/bin/tests/system/dlv/ns3/sign.sh
index a29114398c4d505e7055463d947263675a67baec..7f147aa536147de36aa02faa60281657c9e01223 100755 (executable)
--- a/bin/tests/system/dlv/ns3/sign.sh
+++ b/bin/tests/system/dlv/ns3/sign.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2009, 2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009-2011  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: sign.sh,v 1.9.242.1 2011/05/27 00:57:31 each Exp $
+# $Id: sign.sh,v 1.9.242.2 2011/06/02 23:47:29 tbox Exp $
 
 (cd ../ns6 && sh -e ./sign.sh)
 

diff --git a/bin/tests/system/dlv/ns5/named.conf b/bin/tests/system/dlv/ns5/named.conf
index 5265f11c4755df8b35978b801214f636acf4fbdb..d010bd136daebb5a6c541d9de58d355213ba8dd8 100644 (file)
--- a/bin/tests/system/dlv/ns5/named.conf
+++ b/bin/tests/system/dlv/ns5/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2006, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006, 2007, 2011  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.8.950.1 2011/05/27 00:57:31 each Exp $ */
+/* $Id: named.conf,v 1.8.950.2 2011/06/02 23:47:30 tbox Exp $ */
 
 /*
  * Choose a keyname that is unlikely to clash with any real key names.

diff --git a/bin/tests/system/dlv/ns6/named.conf b/bin/tests/system/dlv/ns6/named.conf
index 4cbab1e6d5bc35a1d6455778c4f0ac8baa957038..9bba09f787c577e130c5fab0da8dffb3bf34ad3d 100644 (file)
--- a/bin/tests/system/dlv/ns6/named.conf
+++ b/bin/tests/system/dlv/ns6/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2011  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.4.210.1 2011/05/27 00:57:31 each Exp $ */
+/* $Id: named.conf,v 1.4.210.2 2011/06/02 23:47:30 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/dlv/ns6/sign.sh b/bin/tests/system/dlv/ns6/sign.sh
index b7ff3be9b81ae7099d5cbf1e221015a391938726..a1a471588ac7b282111b854ccf404594b535f563 100755 (executable)
--- a/bin/tests/system/dlv/ns6/sign.sh
+++ b/bin/tests/system/dlv/ns6/sign.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2011  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: sign.sh,v 1.3.250.1 2011/05/27 00:57:31 each Exp $
+# $Id: sign.sh,v 1.3.250.2 2011/06/02 23:47:30 tbox Exp $
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/dlv/setup.sh b/bin/tests/system/dlv/setup.sh
index f5be6f444dfed1de1bbda85f2bf954746dce7bbb..c5ac61751b68ffc5c7ddd3891200e3e639a1ffff 100644 (file)
--- a/bin/tests/system/dlv/setup.sh
+++ b/bin/tests/system/dlv/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009, 2011  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.528.1 2011/05/27 00:57:30 each Exp $
+# $Id: setup.sh,v 1.6.528.2 2011/06/02 23:47:29 tbox Exp $
 
 ../../../tools/genrandom 400 random.data
 

diff --git a/bin/tests/system/dlv/tests.sh b/bin/tests/system/dlv/tests.sh
index 53f52214dd36181a3adda7589ed9878d1611288a..91370315c1a56038b438f5250049a506d856b3fb 100644 (file)
--- a/bin/tests/system/dlv/tests.sh
+++ b/bin/tests/system/dlv/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2010, 2011  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.6.242.1 2011/05/27 00:57:30 each Exp $
+# $Id: tests.sh,v 1.6.242.2 2011/06/02 23:47:29 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/dns64/ns1/example.db b/bin/tests/system/dns64/ns1/example.db
index 3f2f636f747d7b3b22f14be320212ec6ca4f12a4..05921161407e66024cc952141133002d0a3a65a4 100644 (file)
--- a/bin/tests/system/dns64/ns1/example.db
+++ b/bin/tests/system/dns64/ns1/example.db
@@ -1,4 +1,4 @@
-; Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2010, 2011  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: example.db,v 1.3.22.1 2011/02/03 07:39:02 marka Exp $
+; $Id: example.db,v 1.3.22.1.2.1 2011/06/02 23:47:30 tbox Exp $
 
 $TTL   3600
 @      SOA ns1 marka.isc.org. 0 0 0 0 1200

diff --git a/bin/tests/system/dnssec/ns2/example.db.in b/bin/tests/system/dnssec/ns2/example.db.in
index 91b6a592bfd7cf23945b22b01b041a08712d9e91..863db4b34d39141eca96078fda82c5ddfe84bd90 100644 (file)
--- a/bin/tests/system/dnssec/ns2/example.db.in
+++ b/bin/tests/system/dnssec/ns2/example.db.in
@@ -1,4 +1,4 @@
-; Copyright (C) 2004, 2007-2010  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2004, 2007-2011  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000-2002  Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
@@ -13,7 +13,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.24.162.2 2011/02/15 22:06:27 marka Exp $
+; $Id: example.db.in,v 1.24.162.2.2.1 2011/06/02 23:47:30 tbox Exp $
 
 $TTL 300       ; 5 minutes
 @                      IN SOA  mname1. . (

diff --git a/bin/tests/system/dnssec/ns2/sign.sh b/bin/tests/system/dnssec/ns2/sign.sh
index 7315884fc4ae03bfaa32d99cec7fa8633d94edcb..471fe048bc4c8893a68ef256276511741f46a6bb 100644 (file)
--- a/bin/tests/system/dnssec/ns2/sign.sh
+++ b/bin/tests/system/dnssec/ns2/sign.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2004, 2006-2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2006-2011  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2003  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: sign.sh,v 1.41.40.2 2011/02/15 22:06:27 marka Exp $
+# $Id: sign.sh,v 1.41.40.2.2.1 2011/06/02 23:47:30 tbox Exp $
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/dnssec/ns3/expired.example.db.in b/bin/tests/system/dnssec/ns3/expired.example.db.in
index 22fddbd4a2b40c6ad19b6190d83b739c2b62b08c..581a8c202c92add63c55141f5105dd3d3f628025 100644 (file)
--- a/bin/tests/system/dnssec/ns3/expired.example.db.in
+++ b/bin/tests/system/dnssec/ns3/expired.example.db.in
@@ -1,5 +1,4 @@
-; Copyright (C) 2004, 2007, 2008, 2010  Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) 2000, 2001  Internet Software Consortium.
+; Copyright (C) 2011  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: expired.example.db.in,v 1.1.2.2 2011/02/08 03:48:22 marka Exp $
+; $Id: expired.example.db.in,v 1.1.2.2.2.1 2011/06/02 23:47:30 tbox Exp $
 
 $TTL 300       ; 5 minutes
 @                      IN SOA  mname1. . (

diff --git a/bin/tests/system/dnssec/ns3/named.conf b/bin/tests/system/dnssec/ns3/named.conf
index 43e84b86bd3f5dc2bf8d380ec563c35c6b9dbec8..51e1e511438059c2115be33456dc923c3c90947f 100644 (file)
--- a/bin/tests/system/dnssec/ns3/named.conf
+++ b/bin/tests/system/dnssec/ns3/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2006-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.38.86.3 2011/02/15 22:06:27 marka Exp $ */
+/* $Id: named.conf,v 1.38.86.3.2.1 2011/06/02 23:47:33 tbox Exp $ */
 
 // NS3
 

diff --git a/bin/tests/system/dnssec/ns3/sign.sh b/bin/tests/system/dnssec/ns3/sign.sh
index 6a0a3fd62f06e8bb177c87db8aba618e23d7f92b..c80b01ce1b3032b69230657d1ddd3be2923c1db4 100644 (file)
--- a/bin/tests/system/dnssec/ns3/sign.sh
+++ b/bin/tests/system/dnssec/ns3/sign.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2004, 2006-2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2006-2011  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2002  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: sign.sh,v 1.32.162.3 2011/02/15 22:06:27 marka Exp $
+# $Id: sign.sh,v 1.32.162.3.2.1 2011/06/02 23:47:33 tbox Exp $
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/nsupdate/clean.sh b/bin/tests/system/nsupdate/clean.sh
index 5b137ea39d6e8e169a73d1570f22383c017c63ea..a7d8f38724559bec86b0b13e84c37d9632e9953d 100644 (file)
--- a/bin/tests/system/nsupdate/clean.sh
+++ b/bin/tests/system/nsupdate/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2009, 2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009-2011  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: clean.sh,v 1.20.24.1 2011/02/03 06:18:51 marka Exp $
+# $Id: clean.sh,v 1.20.24.1.2.1 2011/06/02 23:47:33 tbox Exp $
 
 #
 # Clean up after zone transfer tests.

diff --git a/bin/tests/system/nsupdate/ns3/named.conf b/bin/tests/system/nsupdate/ns3/named.conf
index b9667f87b6a797ab2e5642d8f85f6bd9b56d0fcb..4adecf52b6de28a427ee71eb11181c10e055af8f 100644 (file)
--- a/bin/tests/system/nsupdate/ns3/named.conf
+++ b/bin/tests/system/nsupdate/ns3/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2011  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.24.1 2011/02/03 06:18:51 marka Exp $ */
+/* $Id: named.conf,v 1.3.24.1.2.1 2011/06/02 23:47:34 tbox Exp $ */
 
 // NS1
 

diff --git a/bin/tests/system/nsupdate/ns3/sign.sh b/bin/tests/system/nsupdate/ns3/sign.sh
index f1f98e003ce0c7b888656564903b2d74fda5d910..e57e1218b7d82480272644509ec2ac80ecbb7246 100644 (file)
--- a/bin/tests/system/nsupdate/ns3/sign.sh
+++ b/bin/tests/system/nsupdate/ns3/sign.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2011  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: sign.sh,v 1.2.26.1 2011/02/03 06:18:51 marka Exp $
+# $Id: sign.sh,v 1.2.26.1.2.1 2011/06/02 23:47:34 tbox Exp $
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/nsupdate/tests.sh b/bin/tests/system/nsupdate/tests.sh
index ca79d46cb7487680d50085361d3cf8944ff2d1ce..2ad8e548cc8af9268cdb0ae9b762703db2593c13 100644 (file)
--- a/bin/tests/system/nsupdate/tests.sh
+++ b/bin/tests/system/nsupdate/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2009, 2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009-2011  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.32.24.1 2011/02/03 06:18:51 marka Exp $
+# $Id: tests.sh,v 1.32.24.1.2.1 2011/06/02 23:47:34 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/start.pl b/bin/tests/system/start.pl
index 96bd2fb9c958e2c8e5cb54751fe1c7458972323d..2af0a99cb0bdad29db9ae3d7a096a31febae302b 100644 (file)
--- a/bin/tests/system/start.pl
+++ b/bin/tests/system/start.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# Copyright (C) 2004-2008, 2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2008, 2010, 2011  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 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: start.pl,v 1.16.114.1 2011/04/27 17:06:27 each Exp $
+# $Id: start.pl,v 1.16.114.2 2011/06/02 23:47:28 tbox Exp $
 
 # Framework for starting test servers.
 # Based on the type of server specified, check for port availability, remove

diff --git a/bin/tests/system/xfer/tests.sh b/bin/tests/system/xfer/tests.sh
index b0fde9d3775757f0c31d9020bd39db419533125a..bb8257edd394f699b6787d0140d7b1843ce6e032 100644 (file)
--- a/bin/tests/system/xfer/tests.sh
+++ b/bin/tests/system/xfer/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2005, 2007, 2011  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.31.814.1 2011/02/19 01:21:27 each Exp $
+# $Id: tests.sh,v 1.31.814.1.2.1 2011/06/02 23:47:34 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c
index ef85214e08f895e79a7afe92499a1e9a8f682dc4..71a8f0413c2c941de9678d84233dd2dbf1f9e44e 100644 (file)
--- a/lib/dns/dispatch.c
+++ b/lib/dns/dispatch.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dispatch.c,v 1.168.248.1 2011/02/03 05:50:06 marka Exp $ */
+/* $Id: dispatch.c,v 1.168.248.1.2.1 2011/06/02 23:47:34 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/include/dns/masterdump.h b/lib/dns/include/dns/masterdump.h
index dc963d68dc8ed5e54cc8f936cef0184a51edcd9b..de1f5822b1f64eab6b67f3da49108caa28d0353a 100644 (file)
--- a/lib/dns/include/dns/masterdump.h
+++ b/lib/dns/include/dns/masterdump.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: masterdump.h,v 1.42.596.1 2011/06/02 20:08:01 each Exp $ */
+/* $Id: masterdump.h,v 1.42.596.2 2011/06/02 23:47:35 tbox Exp $ */
 
 #ifndef DNS_MASTERDUMP_H
 #define DNS_MASTERDUMP_H 1

diff --git a/lib/dns/include/dns/rdataset.h b/lib/dns/include/dns/rdataset.h
index e54d7d9d864fbe9035cc36b3d196299c27e1b029..6905233cc9b660943a6a4f90b4d893a9008e13e2 100644 (file)
--- a/lib/dns/include/dns/rdataset.h
+++ b/lib/dns/include/dns/rdataset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdataset.h,v 1.69.270.1 2011/06/02 20:08:01 each Exp $ */
+/* $Id: rdataset.h,v 1.69.270.2 2011/06/02 23:47:35 tbox Exp $ */
 
 #ifndef DNS_RDATASET_H
 #define DNS_RDATASET_H 1

diff --git a/lib/dns/include/dns/resolver.h b/lib/dns/include/dns/resolver.h
index f5037da717a2c4314407faac9ac4d8971a51c90d..efcfd3afecf2b126bddaf048b4fd5a1d21092831 100644 (file)
--- a/lib/dns/include/dns/resolver.h
+++ b/lib/dns/include/dns/resolver.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.h,v 1.67.86.1 2011/02/03 05:50:07 marka Exp $ */
+/* $Id: resolver.h,v 1.67.86.1.2.1 2011/06/02 23:47:36 tbox Exp $ */
 
 #ifndef DNS_RESOLVER_H
 #define DNS_RESOLVER_H 1

diff --git a/lib/dns/masterdump.c b/lib/dns/masterdump.c
index 6495b94e8a3c1718a58aa77391380665fff51e47..186620904316cc66b6941131c427bbb33dd89f37 100644 (file)
--- a/lib/dns/masterdump.c
+++ b/lib/dns/masterdump.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: masterdump.c,v 1.99.328.1 2011/06/02 20:08:01 each Exp $ */
+/* $Id: masterdump.c,v 1.99.328.2 2011/06/02 23:47:35 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/ncache.c b/lib/dns/ncache.c
index 3b4f6c9c36f787a62fa4e66260ec608809c5a3c8..7f6a45d3852a1efddf85ba702ef8ea5d3d1347d9 100644 (file)
--- a/lib/dns/ncache.c
+++ b/lib/dns/ncache.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2008, 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2008, 2010, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ncache.c,v 1.50.124.1.2.1 2011/05/27 00:57:31 each Exp $ */
+/* $Id: ncache.c,v 1.50.124.1.2.2 2011/06/02 23:47:35 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/rdataset.c b/lib/dns/rdataset.c
index 74a46e081a1c873271b7b90b954c1c1c1c770a43..ca37e8475f1310c7bd34eaef80284b3efc8fee9f 100644 (file)
--- a/lib/dns/rdataset.c
+++ b/lib/dns/rdataset.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdataset.c,v 1.86.220.1 2011/06/02 20:08:01 each Exp $ */
+/* $Id: rdataset.c,v 1.86.220.2 2011/06/02 23:47:35 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/rdataslab.c b/lib/dns/rdataslab.c
index bbb7e5721884959e834d081bc2a98ef9003188a8..cde056e61ee6d8c07c1fd59a46aae61bc03a3db1 100644 (file)
--- a/lib/dns/rdataslab.c
+++ b/lib/dns/rdataslab.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdataslab.c,v 1.52.148.1 2011/02/03 07:39:03 marka Exp $ */
+/* $Id: rdataslab.c,v 1.52.148.1.2.1 2011/06/02 23:47:35 tbox Exp $ */
 
 /*! \file */
 
@@ -150,7 +150,7 @@ dns_rdataslab_fromrdataset(dns_rdataset_t *rdataset, isc_mem_t *mctx,
        if (nalloc > 0xffff)
                return (ISC_R_NOSPACE);
 
-       
+
        if (nalloc != 0) {
                x = isc_mem_get(mctx, nalloc * sizeof(struct xrdata));
                if (x == NULL)

diff --git a/lib/dns/validator.c b/lib/dns/validator.c
index dc248431fd8a2e0d3baec47e5540d16859c78c73..45fe8df6141b0c4ecd73f82bf5fd65cd6dd88aca 100644 (file)
--- a/lib/dns/validator.c
+++ b/lib/dns/validator.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: validator.c,v 1.197.40.1 2011/05/27 00:57:31 each Exp $ */
+/* $Id: validator.c,v 1.197.40.2 2011/06/02 23:47:35 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c
index 1e98d7cf4c0a54bca5715c5b10ccfe19113a1f7d..333fd6c58498a37f1910032781d85bd81c6fd203 100644 (file)
--- a/lib/dns/xfrin.c
+++ b/lib/dns/xfrin.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: xfrin.c,v 1.166.522.2 2011/02/19 01:21:27 each Exp $ */
+/* $Id: xfrin.c,v 1.166.522.2.2.1 2011/06/02 23:47:35 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/include/isc/task.h b/lib/isc/include/isc/task.h
index 18ab6a1f1332e8964f970e0ea12d068e36f0ff1a..2fdd5a7a774a161fec6da9a85ade21b2440f5ee0 100644 (file)
--- a/lib/isc/include/isc/task.h
+++ b/lib/isc/include/isc/task.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007, 2009, 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2009-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: task.h,v 1.69.14.1 2011/02/03 05:50:07 marka Exp $ */
+/* $Id: task.h,v 1.69.14.1.2.1 2011/06/02 23:47:36 tbox Exp $ */
 
 #ifndef ISC_TASK_H
 #define ISC_TASK_H 1

diff --git a/lib/isc/task.c b/lib/isc/task.c
index 291a72fc2f0e6318c3b219fc2b20aae0fa72c366..61c819415a633f1248f92fea14cfc80e4122694b 100644 (file)
--- a/lib/isc/task.c
+++ b/lib/isc/task.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: task.c,v 1.115.14.1 2011/02/03 05:50:07 marka Exp $ */
+/* $Id: task.c,v 1.115.14.1.2.1 2011/06/02 23:47:36 tbox Exp $ */
 
 /*! \file
  * \author Principal Author: Bob Halley

diff --git a/lib/isc/timer.c b/lib/isc/timer.c
index c8b066b589d2b4d765b8e47c50935244765f5149..0727d42a4cadd5a72b2959d53f62ae34beccf15d 100644 (file)
--- a/lib/isc/timer.c
+++ b/lib/isc/timer.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007-2009, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: timer.c,v 1.95.302.1 2011/02/03 05:50:07 marka Exp $ */
+/* $Id: timer.c,v 1.95.302.1.2.1 2011/06/02 23:47:36 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index ac0f975044975a65120374f4a7e10c1326172f47..2fa352ccc4d8efdcd9479db2584370b924077abc 100644 (file)
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.c,v 1.333.14.2 2011/02/18 04:01:16 marka Exp $ */
+/* $Id: socket.c,v 1.333.14.2.2.1 2011/06/02 23:47:36 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/win32/include/isc/ipv6.h b/lib/isc/win32/include/isc/ipv6.h
index a96e75e32adaf149ca5e02a1ba8894ea585895ad..de9cf82ce220d43f79ee985f5e7241b736203bc6 100644 (file)
--- a/lib/isc/win32/include/isc/ipv6.h
+++ b/lib/isc/win32/include/isc/ipv6.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ipv6.h,v 1.19.814.1 2011/02/03 08:16:30 marka Exp $ */
+/* $Id: ipv6.h,v 1.19.814.1.2.1 2011/06/02 23:47:36 tbox Exp $ */
 
 #ifndef ISC_IPV6_H
 #define ISC_IPV6_H 1

diff --git a/lib/isccc/Makefile.in b/lib/isccc/Makefile.in
index 6ba3c572e2656fb8ea161779f105c21d86fa0617..59418aeb1dfdf1cffe719e61dca5ef94d2c02920 100644 (file)
--- a/lib/isccc/Makefile.in
+++ b/lib/isccc/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009, 2011  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001, 2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.12.244.1 2011/02/19 01:29:31 each Exp $
+# $Id: Makefile.in,v 1.12.244.1.2.1 2011/06/02 23:47:37 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/isccfg/Makefile.in b/lib/isccfg/Makefile.in
index a708f82373bf9dcfc69a145e42a2738cb2458da5..71a552e165afd2980e95ccbf9df4c9e42244d5be 100644 (file)
--- a/lib/isccfg/Makefile.in
+++ b/lib/isccfg/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2005, 2007, 2009, 2011  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001-2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.21.244.1 2011/02/19 01:29:31 each Exp $
+# $Id: Makefile.in,v 1.21.244.1.2.1 2011/06/02 23:47:37 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@