update copyright notice

diff --git a/bin/tests/system/masterformat/clean.sh b/bin/tests/system/masterformat/clean.sh
index 8bf14ca4bf83ef99e1f878a523f2007d5aab0c3b..b8c3809d24c960606df55429152dc2c3bbce7978 100755 (executable)
--- a/bin/tests/system/masterformat/clean.sh
+++ b/bin/tests/system/masterformat/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2005, 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 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.6 2011/10/26 15:23:36 each Exp $
+# $Id: clean.sh,v 1.7 2011/10/26 23:46:14 tbox Exp $
 
 rm -f named-compilezone
 rm -f ns1/example.db.raw

diff --git a/bin/tests/system/masterformat/ns1/named.conf b/bin/tests/system/masterformat/ns1/named.conf
index 52575dc555f395d9afec246950239a085e4dd604..1243a3aec16eeb72b9d2fd3328171078eb57731c 100644 (file)
--- a/bin/tests/system/masterformat/ns1/named.conf
+++ b/bin/tests/system/masterformat/ns1/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2005, 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.5 2011/10/26 15:23:36 each Exp $ */
+/* $Id: named.conf,v 1.6 2011/10/26 23:46:15 tbox Exp $ */
 
 // NS1
 

diff --git a/bin/tests/system/masterformat/ns2/formerly-text.db.in b/bin/tests/system/masterformat/ns2/formerly-text.db.in
index 98b83b4a1a8331ef7d635806bba88df1553475bb..b10963bf0e0f9424d8652c3be0390c50c2cff70f 100644 (file)
--- a/bin/tests/system/masterformat/ns2/formerly-text.db.in
+++ b/bin/tests/system/masterformat/ns2/formerly-text.db.in
@@ -1,3 +1,19 @@
+; 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: formerly-text.db.in,v 1.3 2011/10/26 23:46:15 tbox Exp $
+
 $ORIGIN .
 $TTL 86400     ; 1 day
 transfer3              IN SOA  ns.transfer3. hostmaster.transfer3. (

diff --git a/bin/tests/system/masterformat/ns2/named.conf b/bin/tests/system/masterformat/ns2/named.conf
index 2ff19c08c1dacb4285b38b91051206ff558af5d2..6f2c0d2756a345605cd115c9a3e0e70773f32865 100644 (file)
--- a/bin/tests/system/masterformat/ns2/named.conf
+++ b/bin/tests/system/masterformat/ns2/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2005, 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.5 2011/10/26 15:23:37 each Exp $ */
+/* $Id: named.conf,v 1.6 2011/10/26 23:46:15 tbox Exp $ */
 
 // NS2
 

diff --git a/bin/tests/system/masterformat/setup.sh b/bin/tests/system/masterformat/setup.sh
index 1406c35ec83c72f2bd62ebad4925c22c9e19d99e..31a6ef07944ce35d9388045f484ee753492a9270 100755 (executable)
--- a/bin/tests/system/masterformat/setup.sh
+++ b/bin/tests/system/masterformat/setup.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2007  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2005-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
@@ -12,7 +12,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: setup.sh,v 1.7 2011/10/26 15:23:36 each Exp $
+# $Id: setup.sh,v 1.8 2011/10/26 23:46:14 tbox Exp $
 
 ln -s $CHECKZONE named-compilezone
 rm -f ns1/example.db.raw

diff --git a/bin/tests/system/masterformat/tests.sh b/bin/tests/system/masterformat/tests.sh
index f86fde66c946a99eac2118e706ea4235bc2692c1..d35322664947c0e3c60aa6342f48dcf252a774bf 100755 (executable)
--- a/bin/tests/system/masterformat/tests.sh
+++ b/bin/tests/system/masterformat/tests.sh
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2005, 2007, 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.
 #
@@ -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.5 2011/10/26 15:23:36 each Exp $
+# $Id: tests.sh,v 1.6 2011/10/26 23:46:14 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/xferquota/setup.pl b/bin/tests/system/xferquota/setup.pl
index cc6da1839b363391309ffea3344fafe84d1bfade..45b9d2b8e5c3355982bd01d6bdf6eb1200368a05 100644 (file)
--- a/bin/tests/system/xferquota/setup.pl
+++ b/bin/tests/system/xferquota/setup.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) 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: setup.pl,v 1.15 2011/10/26 15:23:37 each Exp $
+# $Id: setup.pl,v 1.16 2011/10/26 23:46:15 tbox Exp $
 
 #
 # Set up test data for zone transfer quota tests.

diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index c8bcd93a9ba7302e2cdc0d629ce2a02ef091aaf4..2ea6307febb7e57ba0ff6604549fe9f4c44bb7ff 100644 (file)
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: check.c,v 1.135 2011/10/26 20:56:45 marka Exp $ */
+/* $Id: check.c,v 1.136 2011/10/26 23:46:15 tbox Exp $ */
 
 /*! \file */
 
@@ -1498,7 +1498,7 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions,
                           check_update_policy(obj, logctx) != ISC_R_SUCCESS)
                        result = ISC_R_FAILURE;
                ddns = ISC_TF(res1 == ISC_R_SUCCESS || res2 == ISC_R_SUCCESS);
-       
+
                obj = NULL;
                res1 = cfg_map_get(zoptions, "inline-signing", &obj);
                if (res1 == ISC_R_SUCCESS)