update copyright notice

diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index e2a6f2c06884864499154bb526a1128fd29e472b..68d3bbec066ac3840b7f1d1bd3ab6a1b90ed9ea8 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-2008  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-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.37.128.3 2009/11/18 00:08:59 marka Exp $
+# $Id: conf.sh.in,v 1.37.128.4 2009/11/18 23:46:36 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 d32be8a76ce75db33af2ad2c4836518fdf7a1a85..8ca291e6250327680830b11b5a777ee5550ab2ec 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.2 2009/11/17 23:55:18 marka Exp $
+; $Id: root.db.in,v 1.2.2.2 2009/11/18 23:46:39 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 5ed012459fad13f5410b89d5c63c5298f5b1b0b9..69b340bae16dad3104ddd186813e19069bd45c3b 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.2 2009/11/17 23:55:18 marka Exp $ */
+/* $Id: named.conf,v 1.2.2.2 2009/11/18 23:46:39 tbox Exp $ */
 
 // NS2
 

diff --git a/bin/tests/system/pending/ns2/sign.sh b/bin/tests/system/pending/ns2/sign.sh
index ea8af0a8a51cc2429bfab651bd95e3b62f3ba988..5450c59f2efd85dd2bfca5938af78fb2f3c31238 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.2 2009/11/17 23:55:18 marka Exp $
+# $Id: sign.sh,v 1.2.2.2 2009/11/18 23:46:39 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 6d39ae9b876b72e5d76f9fbe578d9af7b10d1cc1..d4a2b32313ea0bea8c1337940daa19ae1fbdcd94 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.2 2009/11/17 23:55:18 marka Exp $ */
+/* $Id: named.conf,v 1.2.2.2 2009/11/18 23:46:39 tbox Exp $ */
 
 // NS2
 

diff --git a/bin/tests/system/pending/prereq.sh b/bin/tests/system/pending/prereq.sh
index 1e1b22ad5eefa57c03861dcec4918d9a47e9795e..fc4c5babbecdea8e34d4489200dbff9a89b15a15 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.2 2009/11/17 23:55:18 marka Exp $
+# $Id: prereq.sh,v 1.2.2.2 2009/11/18 23:46:39 tbox Exp $
 
 ../../../tools/genrandom 400 random.data
 

diff --git a/bin/tests/system/pending/tests.sh b/bin/tests/system/pending/tests.sh
index 58019a9d4857c5e92c4535d0bc49a8f0cf46c556..1b91c94d8c5ff124a35d28d4e9e65f5b2e3ae32b 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.2 2009/11/17 23:55:18 marka Exp $
+# $Id: tests.sh,v 1.2.2.2 2009/11/18 23:46:39 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 34f7396d86d2bc565cc5a6014fccb3f166b4e63a..c898f244b56e4ee77fbdd6fe91fb8b1f5b85e80c 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.355.12.45 2009/11/18 00:08:59 marka Exp $ */
+/* $Id: resolver.c,v 1.355.12.46 2009/11/18 23:46:39 tbox Exp $ */
 
 /*! \file */
 
@@ -4288,14 +4288,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.