update copyright notice

diff --git a/Makefile.in b/Makefile.in
index 326fb78db617d701aa4ab2ea51e5207a691b9027..a895567c18303cd38db49150be876aceb8aec3a9 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-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
@@ -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.59 2011/02/26 02:26:10 each Exp $
+# $Id: Makefile.in,v 1.60 2011/03/01 23:48:05 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index 70a5862a73b1b3e186c4291679a3de6968a9a285..a974d51b75bc87bed71ce06f22bb0eae14613e03 100644 (file)
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.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: dig.c,v 1.238 2011/02/25 23:11:13 each Exp $ */
+/* $Id: dig.c,v 1.239 2011/03/01 23:48:05 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/dig/include/dig/dig.h b/bin/dig/include/dig/dig.h
index f8499e1593e5f418fb9bd93a1a2da990e4d9a585..ae769c987811e35a58955d6e5a3b816f6d055f1d 100644 (file)
--- a/bin/dig/include/dig/dig.h
+++ b/bin/dig/include/dig/dig.h
@@ -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) 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: dig.h,v 1.112 2011/02/25 23:11:13 each Exp $ */
+/* $Id: dig.h,v 1.113 2011/03/01 23:48:05 tbox Exp $ */
 
 #ifndef DIG_H
 #define DIG_H

diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
index ac2814dcad3ea614c7e79efff93fcaf8a4b1cd80..5d1bcb0a9b6e96848856aa50c05fb0da4d52c769 100644 (file)
--- a/bin/dnssec/dnssec-signzone.c
+++ b/bin/dnssec/dnssec-signzone.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -29,7 +29,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-signzone.c,v 1.263 2011/02/24 03:04:43 marka Exp $ */
+/* $Id: dnssec-signzone.c,v 1.264 2011/03/01 23:48:05 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/tests/system/autosign/tests.sh b/bin/tests/system/autosign/tests.sh
index a4d8bc6ec3cec242040298370d86e994a64990d9..ab8aaeaf1d29548bd4efbb8b262c3c57b2b6736c 100644 (file)
--- a/bin/tests/system/autosign/tests.sh
+++ b/bin/tests/system/autosign/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2009, 2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 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: tests.sh,v 1.13 2011/02/28 14:08:36 fdupont Exp $
+# $Id: tests.sh,v 1.14 2011/03/01 23:48:05 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/database/clean.sh b/bin/tests/system/database/clean.sh
index 2a619c430d16eedf707be17a64674b140fbf610e..de59e21d377668bf8b2bf2be3363f0dae089517f 100644 (file)
--- a/bin/tests/system/database/clean.sh
+++ b/bin/tests/system/database/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 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: clean.sh,v 1.2 2011/02/22 04:14:29 marka Exp $
+# $Id: clean.sh,v 1.3 2011/03/01 23:48:05 tbox Exp $
 
 rm -f ns1/named.conf ns1/named.run ns1/named.memstats
 rm -f dig.out.*

diff --git a/bin/tests/system/database/ns1/named.conf1 b/bin/tests/system/database/ns1/named.conf1
index 04d616db64186cce1c71f4f9c7737a6414eb3895..08dedc8cb73efab7e0a526d99a7532cff7f98044 100644 (file)
--- a/bin/tests/system/database/ns1/named.conf1
+++ b/bin/tests/system/database/ns1/named.conf1
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf1,v 1.2 2011/02/22 04:14:30 marka Exp $ */
+/* $Id: named.conf1,v 1.3 2011/03/01 23:48:06 tbox Exp $ */
 
 // NS1
 

diff --git a/bin/tests/system/database/ns1/named.conf2 b/bin/tests/system/database/ns1/named.conf2
index 210dd06a4c0b94f3d532ccc37a712f1383ed0b44..c79bf9b742ea0859fe88b4ef5ba23f7744c0fe3e 100644 (file)
--- a/bin/tests/system/database/ns1/named.conf2
+++ b/bin/tests/system/database/ns1/named.conf2
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf2,v 1.2 2011/02/22 04:14:30 marka Exp $ */
+/* $Id: named.conf2,v 1.3 2011/03/01 23:48:06 tbox Exp $ */
 
 // NS1
 

diff --git a/bin/tests/system/database/setup.sh b/bin/tests/system/database/setup.sh
index 49ff2591ec842686b29ae5f76930e1662bb5b916..f58fa2c3c76adfd7854aba3327e6bfc3d91ea756 100644 (file)
--- a/bin/tests/system/database/setup.sh
+++ b/bin/tests/system/database/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 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,6 +14,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: setup.sh,v 1.2 2011/02/22 04:14:29 marka Exp $
+# $Id: setup.sh,v 1.3 2011/03/01 23:48:05 tbox Exp $
 
 cp ns1/named.conf1 ns1/named.conf

diff --git a/bin/tests/system/database/tests.sh b/bin/tests/system/database/tests.sh
index 0b90f2a89b2edcbf88d36d9157e2410540a5ec40..99b94cb356466854e326ab045f5e0ea23fcce12c 100644 (file)
--- a/bin/tests/system/database/tests.sh
+++ b/bin/tests/system/database/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 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: tests.sh,v 1.2 2011/02/22 04:14:29 marka Exp $
+# $Id: tests.sh,v 1.3 2011/03/01 23:48:05 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/dnssec/ns3/insecure.below-cname.example.db b/bin/tests/system/dnssec/ns3/insecure.below-cname.example.db
index 68799230fb0a0418522f1b5baacf1df0c468fefe..22f0ffc4960b73274f972e9f8dc4fbc6b5b63b81 100644 (file)
--- a/bin/tests/system/dnssec/ns3/insecure.below-cname.example.db
+++ b/bin/tests/system/dnssec/ns3/insecure.below-cname.example.db
@@ -1,5 +1,4 @@
-; Copyright (C) 2004, 2007  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: insecure.below-cname.example.db,v 1.2 2011/02/23 11:30:35 marka Exp $
+; $Id: insecure.below-cname.example.db,v 1.3 2011/03/01 23:48:06 tbox Exp $
 
 $TTL 300       ; 5 minutes
 @                      IN SOA  mname1. . (

diff --git a/bin/tests/system/dnssec/ns3/secure.below-cname.example.db.in b/bin/tests/system/dnssec/ns3/secure.below-cname.example.db.in
index 4b487d8c5e5a564d5c8180db10b32b26c368359c..fea71b4beb71a5114bb19903b05f8ec8dab3aa10 100644 (file)
--- a/bin/tests/system/dnssec/ns3/secure.below-cname.example.db.in
+++ b/bin/tests/system/dnssec/ns3/secure.below-cname.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) 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: secure.below-cname.example.db.in,v 1.2 2011/02/23 11:30:35 marka Exp $
+; $Id: secure.below-cname.example.db.in,v 1.3 2011/03/01 23:48:06 tbox Exp $
 
 $TTL 300       ; 5 minutes
 @                      IN SOA  mname1. . (

diff --git a/bin/tests/system/ixfr/ans2/ans.pl b/bin/tests/system/ixfr/ans2/ans.pl
index 3fb9dfe832d4c67638b22c4e609c1d849eaf221e..c4460c1745387ff5d6de648e51303a3ee02bac24 100644 (file)
--- a/bin/tests/system/ixfr/ans2/ans.pl
+++ b/bin/tests/system/ixfr/ans2/ans.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 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: ans.pl,v 1.8 2011/02/22 22:57:23 smann Exp $
+# $Id: ans.pl,v 1.9 2011/03/01 23:48:06 tbox Exp $
 
 #
 # This is the name server from hell.  It provides canned

diff --git a/bin/tests/system/redirect/clean.sh b/bin/tests/system/redirect/clean.sh
index 8d2ae4787619ad120611fa166d3cc6f0d4eb83b9..6a7d66526782ce574b6d863ffb5d258c00255b77 100644 (file)
--- a/bin/tests/system/redirect/clean.sh
+++ b/bin/tests/system/redirect/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 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: clean.sh,v 1.2 2011/02/23 03:08:09 marka Exp $
+# $Id: clean.sh,v 1.3 2011/03/01 23:48:06 tbox Exp $
 
 
 rm -f ns1/K*

diff --git a/bin/tests/system/redirect/conf/bad1.conf b/bin/tests/system/redirect/conf/bad1.conf
index c92fce80e861bb8f97b6a96c3d7bd6c0783b82e3..a5f730baa3d5fb86fae129e524b1084b5defefb9 100644 (file)
--- a/bin/tests/system/redirect/conf/bad1.conf
+++ b/bin/tests/system/redirect/conf/bad1.conf
@@ -1,3 +1,21 @@
+/*
+ * 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
+ * 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: bad1.conf,v 1.3 2011/03/01 23:48:06 tbox Exp $ */
+
 zone "." {
        type hint;
        file "hint.db";

diff --git a/bin/tests/system/redirect/conf/bad2.conf b/bin/tests/system/redirect/conf/bad2.conf
index 9973ef83f50ded42d566885077be34ba6f28d82b..2f9c6888d3b182a8d6b44141a65b34ea46dec2ef 100644 (file)
--- a/bin/tests/system/redirect/conf/bad2.conf
+++ b/bin/tests/system/redirect/conf/bad2.conf
@@ -1,3 +1,21 @@
+/*
+ * 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
+ * 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: bad2.conf,v 1.3 2011/03/01 23:48:06 tbox Exp $ */
+
 zone "." {
        type hint;
        file "hint.db";

diff --git a/bin/tests/system/redirect/conf/bad3.conf b/bin/tests/system/redirect/conf/bad3.conf
index b5b56d191b037a08605385f82a2e0a18ccffa895..b37ebe91df55f6ffcca7706c4e1b2cbf09165060 100644 (file)
--- a/bin/tests/system/redirect/conf/bad3.conf
+++ b/bin/tests/system/redirect/conf/bad3.conf
@@ -1,3 +1,21 @@
+/*
+ * 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
+ * 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: bad3.conf,v 1.3 2011/03/01 23:48:06 tbox Exp $ */
+
 zone "." {
        type hint;
        file "hint.db";

diff --git a/bin/tests/system/redirect/conf/good1.conf b/bin/tests/system/redirect/conf/good1.conf
index 834c2861f8a83a9c33e2feae20561253cca5ea6d..5ed1caecf2d9ae547b9cd88f8a5417d466ea14f6 100644 (file)
--- a/bin/tests/system/redirect/conf/good1.conf
+++ b/bin/tests/system/redirect/conf/good1.conf
@@ -1,3 +1,21 @@
+/*
+ * 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
+ * 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: good1.conf,v 1.3 2011/03/01 23:48:06 tbox Exp $ */
+
 zone "." {
        type hint;
        file "hint.db";

diff --git a/bin/tests/system/redirect/conf/good2.conf b/bin/tests/system/redirect/conf/good2.conf
index d9533655304b04a4fb5302e4045761aaef6ba1b4..6a59a1405b9065eef483426b361902d4c5f9dfc7 100644 (file)
--- a/bin/tests/system/redirect/conf/good2.conf
+++ b/bin/tests/system/redirect/conf/good2.conf
@@ -1,3 +1,21 @@
+/*
+ * 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
+ * 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: good2.conf,v 1.3 2011/03/01 23:48:06 tbox Exp $ */
+
 zone "." {
        type master;
        file "master.db";

diff --git a/bin/tests/system/redirect/conf/good3.conf b/bin/tests/system/redirect/conf/good3.conf
index 897a03467dc5723607db25e9ea801afb277e6a6c..1d7ea8c6838dc0688e7408dc089a706f7c5ed98c 100644 (file)
--- a/bin/tests/system/redirect/conf/good3.conf
+++ b/bin/tests/system/redirect/conf/good3.conf
@@ -1,3 +1,21 @@
+/*
+ * 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
+ * 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: good3.conf,v 1.3 2011/03/01 23:48:06 tbox Exp $ */
+
 zone "." {
        type slave;
        file "slave.db";

diff --git a/bin/tests/system/redirect/conf/good4.conf b/bin/tests/system/redirect/conf/good4.conf
index f1095b3d387f3c431c0020e1964781c4e4bc5342..0365f2313de25344f0d6aa4238c52c9f95dfe398 100644 (file)
--- a/bin/tests/system/redirect/conf/good4.conf
+++ b/bin/tests/system/redirect/conf/good4.conf
@@ -1,3 +1,21 @@
+/*
+ * 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
+ * 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: good4.conf,v 1.3 2011/03/01 23:48:06 tbox Exp $ */
+
 zone "." {
        type hint;
        file "hint.db";

diff --git a/bin/tests/system/redirect/ns1/example.db b/bin/tests/system/redirect/ns1/example.db
index cb49045d8fdf931a2ed812f30b0e61ab542b3cd5..ea15102f3227e503ca4eb4501cc626881006bd6c 100644 (file)
--- a/bin/tests/system/redirect/ns1/example.db
+++ b/bin/tests/system/redirect/ns1/example.db
@@ -1,4 +1,4 @@
-; Copyright (C) 2010, 2011  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: example.db,v 1.2 2011/02/23 03:08:10 marka Exp $
+; $Id: example.db,v 1.3 2011/03/01 23:48:06 tbox Exp $
 
 $TTL   3600
 @      SOA ns1 marka.isc.org. 0 0 0 0 1200

diff --git a/bin/tests/system/redirect/ns1/named.conf b/bin/tests/system/redirect/ns1/named.conf
index 40dd6d33c5af5b0d2acc02ab0d6eb17c7f6a9b79..aae51a93466869bab7b7dc0b090ae8901d1883bf 100644 (file)
--- a/bin/tests/system/redirect/ns1/named.conf
+++ b/bin/tests/system/redirect/ns1/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.2 2011/02/23 03:08:10 marka Exp $ */
+/* $Id: named.conf,v 1.3 2011/03/01 23:48:06 tbox Exp $ */
 
 // NS1
 

diff --git a/bin/tests/system/redirect/ns1/redirect.db b/bin/tests/system/redirect/ns1/redirect.db
index 5b04315b8e1afedd70c21b3d949a172282d83817..6219d67d66b3038f7378a3e3ab479757711fdd39 100644 (file)
--- a/bin/tests/system/redirect/ns1/redirect.db
+++ b/bin/tests/system/redirect/ns1/redirect.db
@@ -1,5 +1,18 @@
-; Copyright
+; 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
+; 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: redirect.db,v 1.3 2011/03/01 23:48:06 tbox Exp $
 
 $TTL 300
 @ IN SOA ns.example.net hostmaster.example.net 0 0 0 0 0

diff --git a/bin/tests/system/redirect/ns1/root.db b/bin/tests/system/redirect/ns1/root.db
index 600763d6a403e98bbc7cd777052f9528da7eb4ee..09b137c2fef4e4a8d1781f9bf8a4de1f05f85be6 100644 (file)
--- a/bin/tests/system/redirect/ns1/root.db
+++ b/bin/tests/system/redirect/ns1/root.db
@@ -1,4 +1,4 @@
-; Copyright (C) 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
@@ -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,v 1.2 2011/02/23 03:08:10 marka Exp $
+; $Id: root.db,v 1.3 2011/03/01 23:48:06 tbox Exp $
 
 $TTL 3600
 @              SOA     a.root-servers.nil. marka.isc.org. 0 0 0 0 0

diff --git a/bin/tests/system/redirect/ns1/sign.sh b/bin/tests/system/redirect/ns1/sign.sh
index 4c19b07f9e2c2b8e454015566c375501ffcc53e6..a66441ccc81c12f073917be7c2ce6bf8fc550fbe 100644 (file)
--- a/bin/tests/system/redirect/ns1/sign.sh
+++ b/bin/tests/system/redirect/ns1/sign.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 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.2 2011/02/23 03:08:10 marka Exp $
+# $Id: sign.sh,v 1.3 2011/03/01 23:48:06 tbox Exp $
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/redirect/ns2/named.conf b/bin/tests/system/redirect/ns2/named.conf
index a2c9a4c21e5e86d75b3eb3486625548ef8f2478a..e1d5334e838dbe67b364b6693c7be5a345c913af 100644 (file)
--- a/bin/tests/system/redirect/ns2/named.conf
+++ b/bin/tests/system/redirect/ns2/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2011  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.2 2011/02/23 03:08:10 marka Exp $ */
+/* $Id: named.conf,v 1.3 2011/03/01 23:48:07 tbox Exp $ */
 
 // NS2
 

diff --git a/bin/tests/system/redirect/ns2/redirect.db b/bin/tests/system/redirect/ns2/redirect.db
index 12997dc9c073864335ed655d01eb2e532c9f828c..23f21ea2ca499582b5a9f7bd026ad5b2bf2eaf43 100644 (file)
--- a/bin/tests/system/redirect/ns2/redirect.db
+++ b/bin/tests/system/redirect/ns2/redirect.db
@@ -1,5 +1,18 @@
-; Copyright
+; 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
+; 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: redirect.db,v 1.3 2011/03/01 23:48:07 tbox Exp $
 
 $TTL 300
 @ IN SOA ns.example.net hostmaster.example.net 0 0 0 0 0

diff --git a/bin/tests/system/redirect/setup.sh b/bin/tests/system/redirect/setup.sh
index 7ec058c3c176d3bbee633144077b0d489ad45f59..0f832bfcb214162083edb0d8f46f3f6914943492 100644 (file)
--- a/bin/tests/system/redirect/setup.sh
+++ b/bin/tests/system/redirect/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 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: setup.sh,v 1.2 2011/02/23 03:08:09 marka Exp $
+# $Id: setup.sh,v 1.3 2011/03/01 23:48:06 tbox Exp $
 
 sh clean.sh
 

diff --git a/bin/tests/system/redirect/tests.sh b/bin/tests/system/redirect/tests.sh
index d426e370b0cb67d63c7dc739f579b9847ce33c49..6fae4c427bb088c4442846e19966cf7a10de3d6a 100644 (file)
--- a/bin/tests/system/redirect/tests.sh
+++ b/bin/tests/system/redirect/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2011  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: tests.sh,v 1.2 2011/02/23 03:08:09 marka Exp $
+# $Id: tests.sh,v 1.3 2011/03/01 23:48:06 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/testsock.pl b/bin/tests/system/testsock.pl
index 0c7fb008f1255d769114452d618385d46afc850f..b8a867749b1a8a6743c7aa405b36fc5c9bf3adc6 100644 (file)
--- a/bin/tests/system/testsock.pl
+++ b/bin/tests/system/testsock.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2004, 2007, 2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2010, 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: testsock.pl,v 1.19 2011/02/28 14:08:36 fdupont Exp $
+# $Id: testsock.pl,v 1.20 2011/03/01 23:48:05 tbox Exp $
 
 # Test whether the interfaces on 10.53.0.* are up.
 

diff --git a/lib/dns/include/dns/Makefile.in b/lib/dns/include/dns/Makefile.in
index 9839fb15503aee60959aff6f34c41e7d7f6c1da4..46a8a82d2bc08c64f32d3516214927a9b4a2b774 100644 (file)
--- a/lib/dns/include/dns/Makefile.in
+++ b/lib/dns/include/dns/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) 1998-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.58 2011/02/22 11:48:02 marka Exp $
+# $Id: Makefile.in,v 1.59 2011/03/01 23:48:07 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/dns/include/dns/zone.h b/lib/dns/include/dns/zone.h
index 6c5927421e1af47df6a03279175d9c4995761298..d3709ac423b27518ca4f55de029555e400ab1802 100644 (file)
--- a/lib/dns/include/dns/zone.h
+++ b/lib/dns/include/dns/zone.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: zone.h,v 1.183 2011/02/23 03:08:11 marka Exp $ */
+/* $Id: zone.h,v 1.184 2011/03/01 23:48:07 tbox Exp $ */
 
 #ifndef DNS_ZONE_H
 #define DNS_ZONE_H 1

diff --git a/lib/dns/tests/dnstest.c b/lib/dns/tests/dnstest.c
index 8b573e0f1de6ab22d2fd0ae0359b4934ec71dd91..a20f32230fedc883104bd441e328a361c7a2726f 100644 (file)
--- a/lib/dns/tests/dnstest.c
+++ b/lib/dns/tests/dnstest.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnstest.c,v 1.2 2011/02/26 02:26:11 each Exp $ */
+/* $Id: dnstest.c,v 1.3 2011/03/01 23:48:07 tbox Exp $ */
 
 /*! \file */
 
@@ -46,12 +46,12 @@ static isc_boolean_t hash_active = ISC_FALSE, dst_active = ISC_FALSE;
  * Logging categories: this needs to match the list in bin/named/log.c.
  */
 static isc_logcategory_t categories[] = {
-               { "",                0 },
-               { "client",          0 },
-               { "network",         0 },
-               { "update",          0 },
-               { "queries",         0 },
-               { "unmatched",       0 },
+               { "",                0 },
+               { "client",          0 },
+               { "network",         0 },
+               { "update",          0 },
+               { "queries",         0 },
+               { "unmatched",       0 },
                { "update-security", 0 },
                { "query-errors",    0 },
                { NULL,              0 }

diff --git a/lib/dns/tests/master_test.c b/lib/dns/tests/master_test.c
index eca3f805586fbda0ceed9467580e7fc9e4c11a95..ba08a1c01c5c7586df8f1a7faa6dda785d72353f 100644 (file)
--- a/lib/dns/tests/master_test.c
+++ b/lib/dns/tests/master_test.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: master_test.c,v 1.2 2011/02/26 02:26:11 each Exp $ */
+/* $Id: master_test.c,v 1.3 2011/03/01 23:48:07 tbox Exp $ */
 
 /*! \file */
 
@@ -107,7 +107,7 @@ test_master(const char *testfile) {
 ATF_TC(master_load);
 ATF_TC_HEAD(master_load, tc) {
        atf_tc_set_md_var(tc, "descr", "dns_master_loadfile() loads a "
-                                      "valid master file and returns success");
+                                      "valid master file and returns success");
 }
 ATF_TC_BODY(master_load, tc) {
        isc_result_t result;
@@ -128,7 +128,7 @@ ATF_TC_BODY(master_load, tc) {
 ATF_TC(master_unexpected);
 ATF_TC_HEAD(master_unexpected, tc) {
        atf_tc_set_md_var(tc, "descr", "dns_master_loadfile() returns "
-                                      "DNS_R_UNEXPECTED when file ends "
+                                      "DNS_R_UNEXPECTED when file ends "
                                       "too soon");
 }
 ATF_TC_BODY(master_unexpected, tc) {
@@ -150,7 +150,7 @@ ATF_TC_BODY(master_unexpected, tc) {
 ATF_TC(master_noowner);
 ATF_TC_HEAD(master_noowner, tc) {
        atf_tc_set_md_var(tc, "descr", "dns_master_loadfile() accepts broken "
-                                      "zones with no TTL for first record "
+                                      "zones with no TTL for first record "
                                       "if it is an SOA");
 }
 ATF_TC_BODY(master_noowner, tc) {
@@ -172,7 +172,7 @@ ATF_TC_BODY(master_noowner, tc) {
 ATF_TC(master_nottl);
 ATF_TC_HEAD(master_nottl, tc) {
        atf_tc_set_md_var(tc, "descr", "dns_master_loadfile() returns "
-                                      "DNS_R_NOOWNER when no owner name "
+                                      "DNS_R_NOOWNER when no owner name "
                                       "is specified");
 }
 
@@ -195,7 +195,7 @@ ATF_TC_BODY(master_nottl, tc) {
 ATF_TC(master_badclass);
 ATF_TC_HEAD(master_badclass, tc) {
        atf_tc_set_md_var(tc, "descr", "dns_master_loadfile() returns "
-                                      "DNS_R_BADCLASS when record class "
+                                      "DNS_R_BADCLASS when record class "
                                       "doesn't match zone class");
 }
 ATF_TC_BODY(master_badclass, tc) {
@@ -216,7 +216,7 @@ ATF_TC_BODY(master_badclass, tc) {
 ATF_TC(master_dnskey);
 ATF_TC_HEAD(master_dnskey, tc) {
        atf_tc_set_md_var(tc, "descr", "dns_master_loadfile() understands "
-                                      "DNSKEY with key material");
+                                      "DNSKEY with key material");
 }
 ATF_TC_BODY(master_dnskey, tc) {
        isc_result_t result;
@@ -237,7 +237,7 @@ ATF_TC_BODY(master_dnskey, tc) {
 ATF_TC(master_dnsnokey);
 ATF_TC_HEAD(master_dnsnokey, tc) {
        atf_tc_set_md_var(tc, "descr", "dns_master_loadfile() understands "
-                                      "DNSKEY with no key material");
+                                      "DNSKEY with no key material");
 }
 ATF_TC_BODY(master_dnsnokey, tc) {
        isc_result_t result;
@@ -257,7 +257,7 @@ ATF_TC_BODY(master_dnsnokey, tc) {
 ATF_TC(master_include);
 ATF_TC_HEAD(master_include, tc) {
        atf_tc_set_md_var(tc, "descr", "dns_master_loadfile() understands "
-                                      "$INCLUDE");
+                                      "$INCLUDE");
 }
 ATF_TC_BODY(master_include, tc) {
        isc_result_t result;
@@ -277,7 +277,7 @@ ATF_TC_BODY(master_include, tc) {
 ATF_TC(master_includefail);
 ATF_TC_HEAD(master_includefail, tc) {
        atf_tc_set_md_var(tc, "descr", "dns_master_loadfile() understands "
-                                      "$INCLUDE failures");
+                                      "$INCLUDE failures");
 }
 ATF_TC_BODY(master_includefail, tc) {
        isc_result_t result;
@@ -298,7 +298,7 @@ ATF_TC_BODY(master_includefail, tc) {
 ATF_TC(master_blanklines);
 ATF_TC_HEAD(master_blanklines, tc) {
        atf_tc_set_md_var(tc, "descr", "dns_master_loadfile() handles "
-                                      "non-empty blank lines");
+                                      "non-empty blank lines");
 }
 ATF_TC_BODY(master_blanklines, tc) {
        isc_result_t result;
@@ -318,7 +318,7 @@ ATF_TC_BODY(master_blanklines, tc) {
 ATF_TC(master_leadingzero);
 ATF_TC_HEAD(master_leadingzero, tc) {
        atf_tc_set_md_var(tc, "descr", "dns_master_loadfile() allows "
-                                      "leading zeroes in SOA");
+                                      "leading zeroes in SOA");
 }
 ATF_TC_BODY(master_leadingzero, tc) {
        isc_result_t result;

diff --git a/lib/dns/validator.c b/lib/dns/validator.c
index 7c50af35e91cca4552016341f490be84ee591fbb..899af5661ae617ad360d0d615e1312c0bfda58b8 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.200 2011/03/01 14:40:39 smann Exp $ */
+/* $Id: validator.c,v 1.201 2011/03/01 23:48:07 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index b4fd080e0aa3e65fee070187bf6407c59b4684fd..f10311c5fd6265580bc3e3cbb869280c502bc869 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.593 2011/03/01 22:44:04 marka Exp $ */
+/* $Id: zone.c,v 1.594 2011/03/01 23:48:07 tbox Exp $ */
 
 /*! \file */
 
@@ -2853,7 +2853,7 @@ compute_tag(dns_name_t *name, dns_rdata_dnskey_t *dnskey, isc_mem_t *mctx,
 }
 
 /*
- * Add key to the security roots. 
+ * Add key to the security roots.
  */
 static void
 trust_key(dns_zone_t *zone, dns_name_t *keyname,

diff --git a/make/rules.in b/make/rules.in
index d5217236b098cba5160efe2b2f1141957ff7a708..ed8b84303d310c60ab0bf76dfa2ed2d50e715373 100644 (file)
--- a/make/rules.in
+++ b/make/rules.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2009, 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
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: rules.in,v 1.69 2011/02/26 02:26:11 each Exp $
+# $Id: rules.in,v 1.70 2011/03/01 23:48:07 tbox Exp $
 
 ###
 ### Common Makefile rules for BIND 9.

diff --git a/util/merge_copyrights b/util/merge_copyrights
index 563a2d82beb1b6099967ba87372bf712e3acd1d0..fb3096280fdf7b4fb2d2f37d6a09ba00a132e1f4 100644 (file)
--- a/util/merge_copyrights
+++ b/util/merge_copyrights
@@ -1,6 +1,6 @@
 #!/usr/local/bin/perl -w
 #
-# 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 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: merge_copyrights,v 1.40 2011/02/28 01:09:45 marka Exp $
+# $Id: merge_copyrights,v 1.41 2011/03/01 23:48:07 tbox Exp $
 
 %file_types = ();
 %file_years = ();