update copyright notice

diff --git a/bin/named/bind.keys.h b/bin/named/bind.keys.h
index 1b287a5184b9bf0863747da14cf749d35c08cf95..2cc11a376253ba9f5ce56e6c101fb3273004bff6 100644 (file)
--- a/bin/named/bind.keys.h
+++ b/bin/named/bind.keys.h
@@ -1,7 +1,25 @@
+/*
+ * 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
+ * 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: bind.keys.h,v 1.5 2009/05/29 23:47:48 tbox Exp $ */
+
 #define TRUSTED_KEYS "\
 trusted-keys {\n\
-        # NOTE: This key expires September 2009 \n\
-        # Go to https://www.isc.org/solutions/dlv to download a replacement\n\
+       # NOTE: This key expires September 2009 \n\
+       # Go to https://www.isc.org/solutions/dlv to download a replacement\n\
        dlv.isc.org. 257 3 5 \"BEAAAAPHMu/5onzrEE7z1egmhg/WPO0+juoZrW3euWEn4MxDCE1+lLy2 brhQv5rN32RKtMzX6Mj70jdzeND4XknW58dnJNPCxn8+jAGl2FZLK8t+ 1uq4W+nnA3qO2+DL+k6BD4mewMLbIYFwe0PG73Te9fZ2kJb56dhgMde5 ymX4BI/oQ+cAK50/xvJv00Frf8kw6ucMTwFlgPe+jnGxPPEmHAte/URk Y62ZfkLoBAADLHQ9IrS2tryAe7mbBZVcOwIeU/Rw/mRx/vwwMCTgNboM QKtUdvNXDrYJDSHZws3xiRXF1Rf+al9UmZfSav/4NWLKjHzpT59k/VSt TDN0YUuWrBNh\";\n\
 };\n\
 "

diff --git a/bin/named/server.c b/bin/named/server.c
index 0e25f9beb718115199b78a695c1fb25835830ed7..672c8b3f3c0b2f7d2561f7faebf3822655d56d97 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: server.c,v 1.531 2009/05/29 22:22:35 jinmei Exp $ */
+/* $Id: server.c,v 1.532 2009/05/29 23:47:48 tbox Exp $ */
 
 /*! \file */
 
@@ -434,7 +434,7 @@ configure_view_nametable(const cfg_obj_t *vconfig, const cfg_obj_t *config,
   cleanup:
        dns_rbt_destroy(rbtp);
        return (result);
-       
+
 }
 
 static isc_result_t

diff --git a/bin/tests/system/resolver/ans2/ans.pl b/bin/tests/system/resolver/ans2/ans.pl
index acfe4e1a3581fda213c39e5c514b80a4477b7aac..2d49de836f5e27c1a39fd40870e8db3732deea66 100644 (file)
--- a/bin/tests/system/resolver/ans2/ans.pl
+++ b/bin/tests/system/resolver/ans2/ans.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009  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: ans.pl,v 1.11 2009/05/29 22:22:36 jinmei Exp $
+# $Id: ans.pl,v 1.12 2009/05/29 23:47:49 tbox Exp $
 
 #
 # Ad hoc name server

diff --git a/bin/tests/system/resolver/ans3/ans.pl b/bin/tests/system/resolver/ans3/ans.pl
index 3cc7f6858b043151000675c8dd9b7474229e410d..30cc3ff6c3f897355f23e8c2bedbcb88a3962c6e 100644 (file)
--- a/bin/tests/system/resolver/ans3/ans.pl
+++ b/bin/tests/system/resolver/ans3/ans.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009  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: ans.pl,v 1.10 2009/05/29 22:22:36 jinmei Exp $
+# $Id: ans.pl,v 1.11 2009/05/29 23:47:49 tbox Exp $
 
 #
 # Ad hoc name server

diff --git a/bin/tests/system/resolver/clean.sh b/bin/tests/system/resolver/clean.sh
index 8cc1b3b6723d5640be65dc16283b1ac8c46535d3..8589a61d43a347b55ff98fc067b6a2e818de0478 100644 (file)
--- a/bin/tests/system/resolver/clean.sh
+++ b/bin/tests/system/resolver/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2008  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2008, 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
@@ -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 2009/05/29 22:22:36 jinmei Exp $
+# $Id: clean.sh,v 1.3 2009/05/29 23:47:49 tbox Exp $
 
 #
 # Clean up after resolver tests.

diff --git a/bin/tests/system/resolver/ns1/named.conf b/bin/tests/system/resolver/ns1/named.conf
index 8cc21e525f736fb92a922abc39bcea7c577fd201..65068655ea28b824ab69783161096a0fb17cd995 100644 (file)
--- a/bin/tests/system/resolver/ns1/named.conf
+++ b/bin/tests/system/resolver/ns1/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2009  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.14 2009/05/29 22:22:36 jinmei Exp $ */
+/* $Id: named.conf,v 1.15 2009/05/29 23:47:49 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/resolver/tests.sh b/bin/tests/system/resolver/tests.sh
index a30e8e47752ec0cc76ce2de458af66562c3c9ce7..98c3fc63e6d0c7bbd24ab6ea4347b22b95b94b76 100644 (file)
--- a/bin/tests/system/resolver/tests.sh
+++ b/bin/tests/system/resolver/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009  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.10 2009/05/29 22:22:36 jinmei Exp $
+# $Id: tests.sh,v 1.11 2009/05/29 23:47:49 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index a1b12d388db45552f251ef71814439f416d3bd8f..ef522b119450ab91a78b2ecbdca334d22de5f6ac 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.399 2009/05/29 22:22:36 jinmei Exp $ */
+/* $Id: resolver.c,v 1.400 2009/05/29 23:47:49 tbox Exp $ */
 
 /*! \file */
 
@@ -4865,7 +4865,7 @@ is_answeraddress_allowed(dns_view_t *view, dns_name_t *name,
 
                result = dns_rbt_findnode(view->answeracl_exclude, name, NULL,
                                          &node, NULL, 0, NULL, NULL);
-                                         
+
                if (result == ISC_R_SUCCESS || result == DNS_R_PARTIALMATCH)
                        return (ISC_TRUE);
        }