update copyright notice

diff --git a/lib/dns/include/dns/iptable.h b/lib/dns/include/dns/iptable.h
index 59c00bdffaaf6bd4a7d8a0e3de5721f9a02b7001..30feee8441bfc85434a01cc52343eea591c75244 100644 (file)
--- a/lib/dns/include/dns/iptable.h
+++ b/lib/dns/include/dns/iptable.h
@@ -1,8 +1,7 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 1999-2002  Internet Software Consortium.
+ * Copyright (C) 2007  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.
  *
@@ -15,6 +14,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+/* $Id: iptable.h,v 1.3 2007/09/12 23:46:47 tbox Exp $ */
+
 #ifndef DNS_IPTABLE_H
 #define DNS_IPTABLE_H 1
 

diff --git a/lib/dns/iptable.c b/lib/dns/iptable.c
index b8da53109ee330e4516249f4e47f2e2b51a1efe0..5ea749782ea896b62ce6dd319c6c7bc25451f621 100644 (file)
--- a/lib/dns/iptable.c
+++ b/lib/dns/iptable.c
@@ -1,8 +1,7 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 1999-2002  Internet Software Consortium.
+ * Copyright (C) 2007  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.
  *
@@ -15,6 +14,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+/* $Id: iptable.c,v 1.3 2007/09/12 23:46:47 tbox Exp $ */
+
 #include <isc/mem.h>
 #include <isc/radix.h>
 

diff --git a/lib/isc/include/isc/radix.h b/lib/isc/include/isc/radix.h
index 48fdcd955e8b0cb3d4df4a1c3ee7a09dc3728f9c..2f2be5436ef561d0130356bcda408de10fa582a8 100644 (file)
--- a/lib/isc/include/isc/radix.h
+++ b/lib/isc/include/isc/radix.h
@@ -1,45 +1,21 @@
 /*
- * Copyright (c) 1999-2000
- * 
- * The Regents of the University of Michigan ("The Regents") and
- * Merit Network, Inc. All rights reserved.  Redistribution and use
- * in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- * 
- * 1. Redistributions of source code must retain the above 
- * copyright notice, this list of conditions and the 
- * following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above 
- * copyright notice, this list of conditions and the 
- * following disclaimer in the documentation and/or other 
- * materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of 
- * this software must display the following acknowledgement:
- * 
- *   This product includes software developed by the University of
- *   Michigan, Merit Network, Inc., and their contributors.
- * 
- * 4. Neither the name of the University, Merit Network, nor the
- * names of their contributors may be used to endorse or 
- * promote products derived from this software without 
- * specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL TH E REGENTS
- * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HO WEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
+ * Copyright (C) 2007  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: radix.h,v 1.3 2007/09/12 23:46:47 tbox Exp $ */
+
 /*
  * This source was adapted from MRT's RCS Ids:
  * Id: radix.h,v 1.6 1999/08/03 03:32:53 masaki Exp

diff --git a/lib/isc/radix.c b/lib/isc/radix.c
index 01a28c1d95a86a5f22ea93f9d0eb725cb2d7a000..eb318cd9148bd77c583bd23a36db488d8245c6b2 100644 (file)
--- a/lib/isc/radix.c
+++ b/lib/isc/radix.c
@@ -1,45 +1,21 @@
 /*
- * Copyright (c) 1999-2000
- * 
- * The Regents of the University of Michigan ("The Regents") and
- * Merit Network, Inc. All rights reserved.  Redistribution and use
- * in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- * 
- * 1. Redistributions of source code must retain the above 
- * copyright notice, this list of conditions and the 
- * following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above 
- * copyright notice, this list of conditions and the 
- * following disclaimer in the documentation and/or other 
- * materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of 
- * this software must display the following acknowledgement:
- * 
- *   This product includes software developed by the University of
- *   Michigan, Merit Network, Inc., and their contributors.
- * 
- * 4. Neither the name of the University, Merit Network, nor the
- * names of their contributors may be used to endorse or 
- * promote products derived from this software without 
- * specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL TH E REGENTS
- * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HO WEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
+ * Copyright (C) 2007  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: radix.c,v 1.3 2007/09/12 23:46:47 tbox Exp $ */
+
 /*
  * This source was adapted from MRT's RCS Ids:
  * Id: radix.c,v 1.10.2.1 1999/11/29 05:16:24 masaki Exp