update copyright notice

diff --git a/bin/confgen/keygen.c b/bin/confgen/keygen.c
index 32e5b595e42fb197040449976b6e9636c727d9a8..787a93f1a7d818fda7f70f5d34ac692309fa0cdf 100644 (file)
--- a/bin/confgen/keygen.c
+++ b/bin/confgen/keygen.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 2012  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

diff --git a/bin/named/win32/dlz_dlopen_driver.c b/bin/named/win32/dlz_dlopen_driver.c
index 051d511f0987ac839f9dc66a77bbf42128a78102..6c9ecb811665ca06f508ce0354a93c33969f5de9 100644 (file)
--- a/bin/named/win32/dlz_dlopen_driver.c
+++ b/bin/named/win32/dlz_dlopen_driver.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2012  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

diff --git a/bin/tests/system/checkconf/dlz-bad.conf b/bin/tests/system/checkconf/dlz-bad.conf
index ed5c6b2c90895548567b482e46181b8b7257cd9e..f6f8d9b1f61df196279c58bd89f3efac7a7004bd 100644 (file)
--- a/bin/tests/system/checkconf/dlz-bad.conf
+++ b/bin/tests/system/checkconf/dlz-bad.conf
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2012  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.
+ */
 
 dlz one {
         database "one";

diff --git a/bin/tests/system/dlz/ns1/named.conf b/bin/tests/system/dlz/ns1/named.conf
index 4eceb35d65962c916323d425b9ce851a03ba9cd0..130f2039173eb5acdc0f09bc059f5335030dcd08 100644 (file)
--- a/bin/tests/system/dlz/ns1/named.conf
+++ b/bin/tests/system/dlz/ns1/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2012  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

diff --git a/bin/tests/system/dlzexternal/ns1/named.conf.in b/bin/tests/system/dlzexternal/ns1/named.conf.in
index 5cd4792aa9051c1cbdc4070467fb6d7744a3fe70..4239658d6d9fbc3f61fadafefcf9b8ad1fbdbf9b 100644 (file)
--- a/bin/tests/system/dlzexternal/ns1/named.conf.in
+++ b/bin/tests/system/dlzexternal/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2012  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

diff --git a/bin/tests/system/dlzredir/clean.sh b/bin/tests/system/dlzredir/clean.sh
index f7dbaad94f4e47e79adcde76fc8dd0de385b00c0..5ae63e8fda82437a053aca323bbb5b7db58cf3f1 100644 (file)
--- a/bin/tests/system/dlzredir/clean.sh
+++ b/bin/tests/system/dlzredir/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012  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

diff --git a/bin/tests/system/dlzredir/ns1/named.conf b/bin/tests/system/dlzredir/ns1/named.conf
index 08ffe57c440e9cd310f00a0b0bed323110a85c26..0ad1ffa47b1e4644b8f90af57c450c38da458590 100644 (file)
--- a/bin/tests/system/dlzredir/ns1/named.conf
+++ b/bin/tests/system/dlzredir/ns1/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012  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

diff --git a/bin/tests/system/dlzredir/ns1/root.db b/bin/tests/system/dlzredir/ns1/root.db
index 6cdaea0c3ce3886d155fa7f6148639fef0b7de0f..3213e44070cbc835daaa09da94d977baf1014459 100644 (file)
--- a/bin/tests/system/dlzredir/ns1/root.db
+++ b/bin/tests/system/dlzredir/ns1/root.db
@@ -1,5 +1,4 @@
-; Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) 2000, 2001  Internet Software Consortium.
+; Copyright (C) 2012  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

diff --git a/bin/tests/system/dlzredir/prereq.sh.in b/bin/tests/system/dlzredir/prereq.sh.in
index 3e608985b86869d939ef94590de17e908e93723a..5b8f89f0e36a1a59a85402797096123ac46f5161 100644 (file)
--- a/bin/tests/system/dlzredir/prereq.sh.in
+++ b/bin/tests/system/dlzredir/prereq.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012  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

diff --git a/bin/tests/system/dlzredir/tests.sh b/bin/tests/system/dlzredir/tests.sh
index 420eb093df9b220eb4dffcc7b3a5675f20957ac1..49ef316a38a81f3de26c7ba658be45e84b286bda 100644 (file)
--- a/bin/tests/system/dlzredir/tests.sh
+++ b/bin/tests/system/dlzredir/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2011  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012  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

diff --git a/bin/tests/system/nsupdate/ns1/named.conf b/bin/tests/system/nsupdate/ns1/named.conf
index 9722be814bb0c99d21f0a92464e798aef362c8f3..e4a95cd0e7fbec9406d8e7e84742a471203ee451 100644 (file)
--- a/bin/tests/system/nsupdate/ns1/named.conf
+++ b/bin/tests/system/nsupdate/ns1/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2009, 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2009, 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/dns/spnego_asn1.c b/lib/dns/spnego_asn1.c
index efc4b0c30efddc06f02d823eae8a9056eeee0b59..f7d761ae6164ee27173cfddeb1e8e505308cd208 100644 (file)
--- a/lib/dns/spnego_asn1.c
+++ b/lib/dns/spnego_asn1.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2006, 2007, 2012  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
@@ -53,10 +53,10 @@ typedef struct oid {
       (R) = ENOMEM;                                            \
     } else {                                                   \
       (R) = encode_##T(((unsigned char*)(B)) + (BL) - 1, (BL), \
-                       (S), (L));                              \
+                      (S), (L));                              \
       if((R) != 0) {                                           \
-        free((B));                                             \
-        (B) = NULL;                                            \
+       free((B));                                             \
+       (B) = NULL;                                            \
       }                                                        \
     }                                                          \
   } while (0)

diff --git a/util/xc b/util/xc
index 6f4b037450e0d89065819fdfe322d6521a63a7ec..66246d41ee126254c8af8a238ab797fa8375ba95 100755 (executable)
--- a/util/xc
+++ b/util/xc
@@ -1,12 +1,12 @@
 # Copyright (C) 2012  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,
+# 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