update copyright notice

diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index efa09bcc80b5ad7f579e3afbbaef88c3bff98cd9..672230f3ff3ff255a57696365aacd50e46d8a53b 100644 (file)
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004-2006, 2008  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2006, 2008, 2009  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: conf.sh.in,v 1.27.18.11 2009/11/25 04:50:24 marka Exp $
+# $Id: conf.sh.in,v 1.27.18.12 2009/11/25 23:46:51 tbox Exp $
 
 #
 # Common configuration data for system tests, to be sourced into

diff --git a/bin/tests/system/pending/ns1/root.db.in b/bin/tests/system/pending/ns1/root.db.in
index 7ebb8869af44de97849dd13e72cb856895535747..abd4749655383e70788849da202a65c56adb9377 100644 (file)
--- a/bin/tests/system/pending/ns1/root.db.in
+++ b/bin/tests/system/pending/ns1/root.db.in
@@ -1,4 +1,4 @@
-; Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2009  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: root.db.in,v 1.3.8.1 2009/11/25 04:50:24 marka Exp $
+; $Id: root.db.in,v 1.3.8.2 2009/11/25 23:46:52 tbox Exp $
 
 $TTL 30
 .                      IN SOA  marka.isc.org. a.root.servers.nil. (

diff --git a/bin/tests/system/pending/ns2/named.conf b/bin/tests/system/pending/ns2/named.conf
index fb9b17285f3ba7c06a6afc2023c7b2775ba0c1b4..cbfb5936ed2a3ed6f3bae215af697351d8adf425 100644 (file)
--- a/bin/tests/system/pending/ns2/named.conf
+++ b/bin/tests/system/pending/ns2/named.conf
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2006-2008  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2000-2002  Internet Software Consortium.
+ * Copyright (C) 2009  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -15,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.3.8.1 2009/11/25 04:50:24 marka Exp $ */
+/* $Id: named.conf,v 1.3.8.2 2009/11/25 23:46:52 tbox Exp $ */
 
 // NS2
 

diff --git a/bin/tests/system/pending/ns2/sign.sh b/bin/tests/system/pending/ns2/sign.sh
index 6f743d3bc7b74557e979e00debd2694cbd04e2b1..62d102c7bcaaa44adcb45bb9af5ed06aeb456e3c 100644 (file)
--- a/bin/tests/system/pending/ns2/sign.sh
+++ b/bin/tests/system/pending/ns2/sign.sh
@@ -1,7 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2004, 2006-2009  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 2000-2003  Internet Software Consortium.
+# Copyright (C) 2009  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -15,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: sign.sh,v 1.3.8.2 2009/11/25 20:56:08 marka Exp $
+# $Id: sign.sh,v 1.3.8.3 2009/11/25 23:46:52 tbox Exp $
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/pending/ns3/named.conf b/bin/tests/system/pending/ns3/named.conf
index ddbf2a8aeb03ffae91ceb6d993d4a63abc5f9015..f4945f8b41f67837919ef901639a95ab9fe5b2f2 100644 (file)
--- a/bin/tests/system/pending/ns3/named.conf
+++ b/bin/tests/system/pending/ns3/named.conf
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2004, 2006-2008  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2000-2002  Internet Software Consortium.
+ * Copyright (C) 2009  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -15,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.3.8.1 2009/11/25 04:50:24 marka Exp $ */
+/* $Id: named.conf,v 1.3.8.2 2009/11/25 23:46:52 tbox Exp $ */
 
 // NS2
 

diff --git a/bin/tests/system/pending/prereq.sh b/bin/tests/system/pending/prereq.sh
index b3e9b67a9ef4a3806ce40043da9cbcd12ddd130d..c9fe3ea9a7aae856f1878adaad37278e8ef1a22d 100644 (file)
--- a/bin/tests/system/pending/prereq.sh
+++ b/bin/tests/system/pending/prereq.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2006, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 2000-2002  Internet Software Consortium.
+# Copyright (C) 2009  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -15,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: prereq.sh,v 1.3.8.3 2009/11/25 20:56:08 marka Exp $
+# $Id: prereq.sh,v 1.3.8.4 2009/11/25 23:46:52 tbox Exp $
 
 ../../genrandom 400 random.data
 if $KEYGEN -a RSAMD5 -b 512 -n zone -r random.data foo > /dev/null 2>&1

diff --git a/bin/tests/system/pending/tests.sh b/bin/tests/system/pending/tests.sh
index d3dd8e688b05bdc8ba732653985a698edc5d7320..2fff7e8d4a357cc52c07b5aeb2a051d33769e687 100644 (file)
--- a/bin/tests/system/pending/tests.sh
+++ b/bin/tests/system/pending/tests.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 2000-2002  Internet Software Consortium.
+# Copyright (C) 2009  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -15,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: tests.sh,v 1.3.8.1 2009/11/25 04:50:24 marka Exp $
+# $Id: tests.sh,v 1.3.8.2 2009/11/25 23:46:52 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 37b35ce0ac0edf22957a64224b89749ff638931e..911cd3c5fe979fd35f8e7fcec984eece276cc4e9 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.c,v 1.284.18.96 2009/11/25 04:50:25 marka Exp $ */
+/* $Id: resolver.c,v 1.284.18.97 2009/11/25 23:46:52 tbox Exp $ */
 
 /*! \file */
 
@@ -4174,14 +4174,14 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adbaddrinfo_t *addrinfo,
                        if (rdataset->trust == dns_trust_additional &&
                            sigrdataset == NULL && EXTERNAL(rdataset))
                                continue;
-                               
+
                        /*
-                         * XXXMPA: If we store as "answer" after validating
-                         * then we need to do bailiwick processing and
-                         * also need to track whether RRsets are in or
-                         * out of bailiwick.  This will require a another 
-                         * pending trust level.
-                         *
+                        * XXXMPA: If we store as "answer" after validating
+                        * then we need to do bailiwick processing and
+                        * also need to track whether RRsets are in or
+                        * out of bailiwick.  This will require a another
+                        * pending trust level.
+                        *
                         * Cache this rdataset/sigrdataset pair as
                         * pending data.  Track whether it was additional
                         * or not.