update copyright notice

diff --git a/FAQ.xml b/FAQ.xml
index e9a600fe0e4e314fcb14b639591a4b5686634e2f..c29c55ead7e93559eb2133f0a464d3d40f7108aa 100644 (file)
--- a/FAQ.xml
+++ b/FAQ.xml
@@ -5,7 +5,7 @@
  - Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2003  Internet Software Consortium.
  -
- - 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.
  -
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: FAQ.xml,v 1.18 2007/02/05 05:18:22 marka Exp $ -->
+<!-- $Id: FAQ.xml,v 1.19 2007/06/18 23:47:16 tbox Exp $ -->
 
 <article class="faq">
   <title>Frequently Asked Questions about BIND 9</title>

diff --git a/Makefile.in b/Makefile.in
index 4f3b62a098d29b68760d8ce7c94b007042607d23..9a5fb875430a1340c1ea90a15f7852046d529e85 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2002  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.47 2006/05/19 00:04:02 marka Exp $
+# $Id: Makefile.in,v 1.48 2007/06/18 23:47:16 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/acconfig.h b/acconfig.h
index 21178a80ddebce5e1728dbf807ea00193f77dae8..c883183c20acae4ea1ea0bc99262c583836fa38a 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: acconfig.h,v 1.49 2005/04/29 00:22:24 marka Exp $ */
+/* $Id: acconfig.h,v 1.50 2007/06/18 23:47:16 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/Makefile.in b/bin/Makefile.in
index 2e29f94fabd4fea8f0162b6db4bcb819661535e1..2beee82687e9ec4b9aa5633faf4870a822b2ef71 100644 (file)
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.23 2004/03/05 04:57:10 marka Exp $
+# $Id: Makefile.in,v 1.24 2007/06/18 23:47:16 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/bin/check/Makefile.in b/bin/check/Makefile.in
index 328e8f4d3f5b8e45f44186685b4d2143a5838bd2..08aa08b01bd32480781273b921c8fb4330b3ade4 100644 (file)
--- a/bin/check/Makefile.in
+++ b/bin/check/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2003  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.30 2006/06/09 00:54:09 marka Exp $
+# $Id: Makefile.in,v 1.31 2007/06/18 23:47:16 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/bin/check/check-tool.c b/bin/check/check-tool.c
index fe49fd93b95f51bcdb682a534794f8759a22af84..8d9f8caef3e37ddefbef291c245910e15ff46628 100644 (file)
--- a/bin/check/check-tool.c
+++ b/bin/check/check-tool.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: check-tool.c,v 1.28 2007/05/21 03:46:41 tbox Exp $ */
+/* $Id: check-tool.c,v 1.29 2007/06/18 23:47:16 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/check/check-tool.h b/bin/check/check-tool.h
index 98df869dd9b50023bd09590bff69dc721b932959..b0ba7e06ef446be64583b721fb3f1438c0e023f5 100644 (file)
--- a/bin/check/check-tool.h
+++ b/bin/check/check-tool.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: check-tool.h,v 1.13 2007/05/21 03:46:41 tbox Exp $ */
+/* $Id: check-tool.h,v 1.14 2007/06/18 23:47:17 tbox Exp $ */
 
 #ifndef CHECK_TOOL_H
 #define CHECK_TOOL_H

diff --git a/bin/check/named-checkconf.c b/bin/check/named-checkconf.c
index 7f95cf0f78950d83e58162f9a3f9ef9d47a1a4ce..eb703e2663eebba977fd561a2a93b16c05a32de3 100644 (file)
--- a/bin/check/named-checkconf.c
+++ b/bin/check/named-checkconf.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named-checkconf.c,v 1.44 2007/05/21 03:46:41 tbox Exp $ */
+/* $Id: named-checkconf.c,v 1.45 2007/06/18 23:47:17 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/check/named-checkconf.docbook b/bin/check/named-checkconf.docbook
index f3f88efa6416c82b2e215ea8bbf18545509983a3..665348e4a5cbb1a40b74330752ebe33dda852b08 100644 (file)
--- a/bin/check/named-checkconf.docbook
+++ b/bin/check/named-checkconf.docbook
@@ -5,7 +5,7 @@
  - Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2002  Internet Software Consortium.
  -
- - 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.
  -
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: named-checkconf.docbook,v 1.17 2007/05/21 02:47:25 marka Exp $ -->
+<!-- $Id: named-checkconf.docbook,v 1.18 2007/06/18 23:47:17 tbox Exp $ -->
 <refentry id="man.named-checkconf">
   <refentryinfo>
     <date>June 14, 2000</date>

diff --git a/bin/check/named-checkzone.c b/bin/check/named-checkzone.c
index 36f38e5ad4640c5693bf29978284466f52765e25..b3afd8dd73e0b70018b681ad60bf2d8cff4259f9 100644 (file)
--- a/bin/check/named-checkzone.c
+++ b/bin/check/named-checkzone.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named-checkzone.c,v 1.48 2007/05/21 02:47:25 marka Exp $ */
+/* $Id: named-checkzone.c,v 1.49 2007/06/18 23:47:17 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/check/named-checkzone.docbook b/bin/check/named-checkzone.docbook
index 486a4cdbef9fee9bee229ccedced13cf26c70cab..e0fc8ae1f6e36aa7e2e9cc7f57b9a13738298d05 100644 (file)
--- a/bin/check/named-checkzone.docbook
+++ b/bin/check/named-checkzone.docbook
@@ -5,7 +5,7 @@
  - Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2002  Internet Software Consortium.
  -
- - 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.
  -
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: named-checkzone.docbook,v 1.32 2007/05/21 02:47:25 marka Exp $ -->
+<!-- $Id: named-checkzone.docbook,v 1.33 2007/06/18 23:47:17 tbox Exp $ -->
 <refentry id="man.named-checkzone">
   <refentryinfo>
     <date>June 13, 2000</date>

diff --git a/bin/dig/Makefile.in b/bin/dig/Makefile.in
index 6ea396447df4022753c071398df318731a51b591..42a965ce3a56ff082a4cbc54e2d738bd5f1607d0 100644 (file)
--- a/bin/dig/Makefile.in
+++ b/bin/dig/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2002  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.39 2005/09/09 14:11:37 marka Exp $
+# $Id: Makefile.in,v 1.40 2007/06/18 23:47:17 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index 2d69c449562bbb0336393f407dd5ef7c15d29347..c2e8293da6b217b0589543b97cd83c986f8561d2 100644 (file)
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dig.c,v 1.216 2007/04/03 23:06:39 marka Exp $ */
+/* $Id: dig.c,v 1.217 2007/06/18 23:47:17 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/dig/dig.docbook b/bin/dig/dig.docbook
index d4c5b8b7f87f82ba97cbc02391b792404e624e60..bb469619bdafd187e46df342be4f05de1c1f976d 100644 (file)
--- a/bin/dig/dig.docbook
+++ b/bin/dig/dig.docbook
@@ -5,7 +5,7 @@
  - Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2003  Internet Software Consortium.
  -
- - 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.
  -
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: dig.docbook,v 1.37 2007/05/16 01:42:26 marka Exp $ -->
+<!-- $Id: dig.docbook,v 1.38 2007/06/18 23:47:17 tbox Exp $ -->
 <refentry id="man.dig">
 
   <refentryinfo>

diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index 986a6774ec8aba022295bad6bbf8fc345f17583a..bf0ea7adcbfb3923d39948b884742050cab8e54a 100644 (file)
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dighost.c,v 1.302 2007/04/03 23:06:39 marka Exp $ */
+/* $Id: dighost.c,v 1.303 2007/06/18 23:47:17 tbox Exp $ */
 
 /*! \file
  *  \note

diff --git a/bin/dig/host.c b/bin/dig/host.c
index b7ccf40add342b1b3a961b06449a43955f31c884..aafd5c5059f9a3c1836523c1557ac46f2d5ff09a 100644 (file)
--- a/bin/dig/host.c
+++ b/bin/dig/host.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: host.c,v 1.113 2007/04/24 07:20:45 marka Exp $ */
+/* $Id: host.c,v 1.114 2007/06/18 23:47:17 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/dig/host.docbook b/bin/dig/host.docbook
index f3b93e09a146ded67d3f3a7b5a80e06b3275df22..ffdec1bceaf30d365fdc7b1da6ff6615a0ca9d73 100644 (file)
--- a/bin/dig/host.docbook
+++ b/bin/dig/host.docbook
@@ -5,7 +5,7 @@
  - Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2002  Internet Software Consortium.
  -
- - 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.
  -
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: host.docbook,v 1.15 2007/05/09 01:32:08 marka Exp $ -->
+<!-- $Id: host.docbook,v 1.16 2007/06/18 23:47:17 tbox Exp $ -->
 <refentry id="man.host">
 
   <refentryinfo>

diff --git a/bin/dig/include/dig/dig.h b/bin/dig/include/dig/dig.h
index f63fa2f03245148354bc14be3258d6c33bfa8f4f..4c4608dff69260494ec7faf4bbaef4bb9e2fdb20 100644 (file)
--- a/bin/dig/include/dig/dig.h
+++ b/bin/dig/include/dig/dig.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dig.h,v 1.104 2007/04/03 23:06:39 marka Exp $ */
+/* $Id: dig.h,v 1.105 2007/06/18 23:47:17 tbox Exp $ */
 
 #ifndef DIG_H
 #define DIG_H

diff --git a/bin/dig/nslookup.c b/bin/dig/nslookup.c
index 34fcdef922768ac14d4d7c8158f5b5bd77e38fd5..31be0183fd3d7477eaf0fbf92227ca122afc0923 100644 (file)
--- a/bin/dig/nslookup.c
+++ b/bin/dig/nslookup.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nslookup.c,v 1.116 2007/04/24 23:46:56 tbox Exp $ */
+/* $Id: nslookup.c,v 1.117 2007/06/18 23:47:17 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/dig/nslookup.docbook b/bin/dig/nslookup.docbook
index cb794127277fa92615131829d712afc1f89bcb3a..6c9480968365dc3bff2c76f22774cfe43a8dd01a 100644 (file)
--- a/bin/dig/nslookup.docbook
+++ b/bin/dig/nslookup.docbook
@@ -4,7 +4,7 @@
 <!--
  - Copyright (C) 2004-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.
  -
@@ -17,7 +17,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: nslookup.docbook,v 1.15 2007/05/16 01:42:26 marka Exp $ -->
+<!-- $Id: nslookup.docbook,v 1.16 2007/06/18 23:47:17 tbox Exp $ -->
 <!--
  - Copyright (c) 1985, 1989
  -    The Regents of the University of California.  All rights reserved.

diff --git a/bin/dnssec/Makefile.in b/bin/dnssec/Makefile.in
index abaeefc4500d01fbd4d11adf666697d2818ce169..1732fe20648dd5dad528bf314a355ae29be819a0 100644 (file)
--- a/bin/dnssec/Makefile.in
+++ b/bin/dnssec/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2002  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.30 2005/05/02 00:26:28 marka Exp $
+# $Id: Makefile.in,v 1.31 2007/06/18 23:47:17 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/bin/dnssec/dnssec-keygen.c b/bin/dnssec/dnssec-keygen.c
index 81243999d3a1ed394953b76d10ffdf73b661a79a..7a6c809af74a98407645c64077f822d1a757a890 100644 (file)
--- a/bin/dnssec/dnssec-keygen.c
+++ b/bin/dnssec/dnssec-keygen.c
@@ -1,6 +1,19 @@
 /*
  * Portions Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2003  Internet Software Consortium.
+ *
+ * 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 AND NETWORK ASSOCIATES 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.
+ *
  * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -16,7 +29,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-keygen.c,v 1.77 2007/06/18 01:03:13 marka Exp $ */
+/* $Id: dnssec-keygen.c,v 1.78 2007/06/18 23:47:17 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/dnssec/dnssec-keygen.docbook b/bin/dnssec/dnssec-keygen.docbook
index ba8d1ae53dfc97d9edfc2ac36571b077cd98f086..0414da76f9f593b81a20dcd22ea3b05cd11090b5 100644 (file)
--- a/bin/dnssec/dnssec-keygen.docbook
+++ b/bin/dnssec/dnssec-keygen.docbook
@@ -5,7 +5,7 @@
  - Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2003  Internet Software Consortium.
  -
- - 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.
  -
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: dnssec-keygen.docbook,v 1.18 2007/06/18 01:03:13 marka Exp $ -->
+<!-- $Id: dnssec-keygen.docbook,v 1.19 2007/06/18 23:47:17 tbox Exp $ -->
 <refentry id="man.dnssec-keygen">
   <refentryinfo>
     <date>June 30, 2000</date>

diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
index b3313683139f1583f13c139e5f5c6db036ea1348..f914fd92baa078e873be0ff63f32b7d180211339 100644 (file)
--- a/bin/dnssec/dnssec-signzone.c
+++ b/bin/dnssec/dnssec-signzone.c
@@ -1,6 +1,19 @@
 /*
  * Portions Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2003  Internet Software Consortium.
+ *
+ * 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 AND NETWORK ASSOCIATES 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.
+ *
  * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -16,7 +29,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-signzone.c,v 1.202 2007/05/21 02:47:25 marka Exp $ */
+/* $Id: dnssec-signzone.c,v 1.203 2007/06/18 23:47:18 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/dnssec/dnssec-signzone.docbook b/bin/dnssec/dnssec-signzone.docbook
index 5dfa7d82597f416beba56fd7e5db02a3d1fdbae6..9bd7c966246df24b6fe9bab1cf6ec9a489b9e745 100644 (file)
--- a/bin/dnssec/dnssec-signzone.docbook
+++ b/bin/dnssec/dnssec-signzone.docbook
@@ -5,7 +5,7 @@
  - Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2003  Internet Software Consortium.
  -
- - 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.
  -
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: dnssec-signzone.docbook,v 1.26 2007/05/09 01:32:08 marka Exp $ -->
+<!-- $Id: dnssec-signzone.docbook,v 1.27 2007/06/18 23:47:18 tbox Exp $ -->
 <refentry id="man.dnssec-signzone">
   <refentryinfo>
     <date>June 30, 2000</date>

diff --git a/bin/dnssec/dnssectool.c b/bin/dnssec/dnssectool.c
index 18022c03c268919d21de5800a96c63d07896cd47..85277c9dd17ca4f971d3d12f9ad2f1887eb62917 100644 (file)
--- a/bin/dnssec/dnssectool.c
+++ b/bin/dnssec/dnssectool.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssectool.c,v 1.43 2005/07/01 03:28:42 marka Exp $ */
+/* $Id: dnssectool.c,v 1.44 2007/06/18 23:47:18 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/dnssec/dnssectool.h b/bin/dnssec/dnssectool.h
index c5f364813d4ddfe804c49f40d95178c90b5433f8..001699529b3615ac42902924f2c2cb45965d54b3 100644 (file)
--- a/bin/dnssec/dnssectool.h
+++ b/bin/dnssec/dnssectool.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssectool.h,v 1.18 2004/03/05 04:57:41 marka Exp $ */
+/* $Id: dnssectool.h,v 1.19 2007/06/18 23:47:18 tbox Exp $ */
 
 #ifndef DNSSECTOOL_H
 #define DNSSECTOOL_H 1

diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
index 35521ee31d7a34ceb54d5f1a74355b39ee286a55..d207333020d4686c61cbf5f0eff8513a5ed98216 100644 (file)
--- a/bin/named/Makefile.in
+++ b/bin/named/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2002  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.94 2007/05/18 06:12:51 marka Exp $
+# $Id: Makefile.in,v 1.95 2007/06/18 23:47:18 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/bin/named/bind9.xsl b/bin/named/bind9.xsl
index 21ae97c43c107725d6c7c11603aaf6a85a29b0c6..25f727384f606967e2278e8a5dc312b0ab7efe7c 100644 (file)
--- a/bin/named/bind9.xsl
+++ b/bin/named/bind9.xsl
@@ -2,7 +2,7 @@
 <!--
  - Copyright (C) 2006, 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,7 +15,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: bind9.xsl,v 1.12 2007/02/13 02:49:08 marka Exp $ -->
+<!-- $Id: bind9.xsl,v 1.13 2007/06/18 23:47:18 tbox Exp $ -->
 
 <xsl:stylesheet version="1.0"
    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"

diff --git a/bin/named/builtin.c b/bin/named/builtin.c
index 5b03f98e91e7d858e49c895791cd604fd7b6176c..93dd3ff1649bf6e4dcfd9d883ebd7f316fe6ae80 100644 (file)
--- a/bin/named/builtin.c
+++ b/bin/named/builtin.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: builtin.c,v 1.10 2005/08/23 04:07:57 marka Exp $ */
+/* $Id: builtin.c,v 1.11 2007/06/18 23:47:18 tbox Exp $ */
 
 /*! \file
  * \brief

diff --git a/bin/named/client.c b/bin/named/client.c
index 7d6d0b6a0e1b2fdac369f4b06c8b4f2c0fb5904d..409478e0f4092c425c9ae5230a68baba5ae3c6be 100644 (file)
--- a/bin/named/client.c
+++ b/bin/named/client.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: client.c,v 1.246 2007/05/15 21:54:08 marka Exp $ */
+/* $Id: client.c,v 1.247 2007/06/18 23:47:18 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/named/config.c b/bin/named/config.c
index b2e43366a2e98ef8dda3e5658b952d0a6add55e0..993c948f3e7a43021241d23c7022408661d31674 100644 (file)
--- a/bin/named/config.c
+++ b/bin/named/config.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: config.c,v 1.78 2007/06/17 23:52:28 marka Exp $ */
+/* $Id: config.c,v 1.79 2007/06/18 23:47:18 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/named/control.c b/bin/named/control.c
index 0b4165f368d923a8261042e774eb433dceb60f2c..3567a1c59d6554159689dd3a6f8b69d57fe517d3 100644 (file)
--- a/bin/named/control.c
+++ b/bin/named/control.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: control.c,v 1.31 2007/02/26 23:46:54 tbox Exp $ */
+/* $Id: control.c,v 1.32 2007/06/18 23:47:18 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/named/controlconf.c b/bin/named/controlconf.c
index dc65ddb0cf31687fe5d21867e26419964a126366..30cde422a90e8ea5660592d683bfdbd9dc41df98 100644 (file)
--- a/bin/named/controlconf.c
+++ b/bin/named/controlconf.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: controlconf.c,v 1.53 2007/02/14 00:27:26 marka Exp $ */
+/* $Id: controlconf.c,v 1.54 2007/06/18 23:47:18 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/named/convertxsl.pl b/bin/named/convertxsl.pl
index 162d3d8c1a6a50d249738b64bc6ec0995d5156bc..e6ccf492062ebaed4cfe2ef9f5b8794e7a5ebeee 100755 (executable)
--- a/bin/named/convertxsl.pl
+++ b/bin/named/convertxsl.pl
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2006  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: convertxsl.pl,v 1.6 2006/12/22 01:59:43 marka Exp $
+# $Id: convertxsl.pl,v 1.7 2007/06/18 23:47:18 tbox Exp $
 
 use strict;
 use warnings;

diff --git a/bin/named/include/named/builtin.h b/bin/named/include/named/builtin.h
index cd43714ee614d2cf5d735867f07899e394963d9f..9263b5fb49d8766998113b5bc89900f61fd7dc1b 100644 (file)
--- a/bin/named/include/named/builtin.h
+++ b/bin/named/include/named/builtin.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: builtin.h,v 1.4 2005/04/29 00:22:29 marka Exp $ */
+/* $Id: builtin.h,v 1.5 2007/06/18 23:47:19 tbox Exp $ */
 
 #ifndef NAMED_BUILTIN_H
 #define NAMED_BUILTIN_H 1

diff --git a/bin/named/include/named/client.h b/bin/named/include/named/client.h
index 18000ccbfbb4626928f5102dcfdd72d0e50e640a..44c800d174cbf94970701aa69437dee1dfd6fb3b 100644 (file)
--- a/bin/named/include/named/client.h
+++ b/bin/named/include/named/client.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: client.h,v 1.81 2007/03/29 23:47:04 tbox Exp $ */
+/* $Id: client.h,v 1.82 2007/06/18 23:47:19 tbox Exp $ */
 
 #ifndef NAMED_CLIENT_H
 #define NAMED_CLIENT_H 1

diff --git a/bin/named/include/named/config.h b/bin/named/include/named/config.h
index 8c3fe202d50583ddf64c9eae7db4e558c68440d1..011d0157bbd2d31c88596160c52104712f23a7ad 100644 (file)
--- a/bin/named/include/named/config.h
+++ b/bin/named/include/named/config.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001, 2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: config.h,v 1.12 2006/02/28 02:39:51 marka Exp $ */
+/* $Id: config.h,v 1.13 2007/06/18 23:47:19 tbox Exp $ */
 
 #ifndef NAMED_CONFIG_H
 #define NAMED_CONFIG_H 1

diff --git a/bin/named/include/named/control.h b/bin/named/include/named/control.h
index e5c11d26338c1194e18bb96d178885f7403b1ac0..e79cbc04b23bb4b2a4397f9595d4119d82a27319 100644 (file)
--- a/bin/named/include/named/control.h
+++ b/bin/named/include/named/control.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: control.h,v 1.23 2006/12/04 01:52:45 marka Exp $ */
+/* $Id: control.h,v 1.24 2007/06/18 23:47:19 tbox Exp $ */
 
 #ifndef NAMED_CONTROL_H
 #define NAMED_CONTROL_H 1

diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h
index 888b11b864f7292ab01524f009bfcfe53cbb39e7..20e94400bfed041ecc1b63241678e5aad30195dd 100644 (file)
--- a/bin/named/include/named/globals.h
+++ b/bin/named/include/named/globals.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: globals.h,v 1.70 2006/12/22 03:07:57 explorer Exp $ */
+/* $Id: globals.h,v 1.71 2007/06/18 23:47:19 tbox Exp $ */
 
 #ifndef NAMED_GLOBALS_H
 #define NAMED_GLOBALS_H 1

diff --git a/bin/named/include/named/interfacemgr.h b/bin/named/include/named/interfacemgr.h
index 20ff60f21c1b5eb62e1fc799796b70680598dd5e..9008af5d433198c96d891cddfc6e1bc054bc6fba 100644 (file)
--- a/bin/named/include/named/interfacemgr.h
+++ b/bin/named/include/named/interfacemgr.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: interfacemgr.h,v 1.31 2005/07/18 05:58:57 marka Exp $ */
+/* $Id: interfacemgr.h,v 1.32 2007/06/18 23:47:19 tbox Exp $ */
 
 #ifndef NAMED_INTERFACEMGR_H
 #define NAMED_INTERFACEMGR_H 1

diff --git a/bin/named/include/named/listenlist.h b/bin/named/include/named/listenlist.h
index ee22f3197e18e477c06b108502d9e8905b003cb8..ffd55ab98f1135f8272c0d56fdaa91c5a2697818 100644 (file)
--- a/bin/named/include/named/listenlist.h
+++ b/bin/named/include/named/listenlist.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: listenlist.h,v 1.13 2005/04/29 00:22:30 marka Exp $ */
+/* $Id: listenlist.h,v 1.14 2007/06/18 23:47:19 tbox Exp $ */
 
 #ifndef NAMED_LISTENLIST_H
 #define NAMED_LISTENLIST_H 1

diff --git a/bin/named/include/named/log.h b/bin/named/include/named/log.h
index 68978ec7487a9d1c4b79a4070e012a58a200e2fa..b7eea87f9eead1a76a25e50dead9d479c6618335 100644 (file)
--- a/bin/named/include/named/log.h
+++ b/bin/named/include/named/log.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: log.h,v 1.23 2005/04/29 00:22:30 marka Exp $ */
+/* $Id: log.h,v 1.24 2007/06/18 23:47:19 tbox Exp $ */
 
 #ifndef NAMED_LOG_H
 #define NAMED_LOG_H 1

diff --git a/bin/named/include/named/logconf.h b/bin/named/include/named/logconf.h
index 98e6ac0a2a779c474a5911a0676f5e225a107be4..99ab59e18b4e0669f232b7b92f42033887e8e321 100644 (file)
--- a/bin/named/include/named/logconf.h
+++ b/bin/named/include/named/logconf.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: logconf.h,v 1.15 2006/03/02 00:37:23 marka Exp $ */
+/* $Id: logconf.h,v 1.16 2007/06/18 23:47:19 tbox Exp $ */
 
 #ifndef NAMED_LOGCONF_H
 #define NAMED_LOGCONF_H 1

diff --git a/bin/named/include/named/lwaddr.h b/bin/named/include/named/lwaddr.h
index 8c8fe641b131a050b7f3033b22abaa36ba0f0577..3ae2cfbd484aa4d2e5c481eb564f7e60d048a67a 100644 (file)
--- a/bin/named/include/named/lwaddr.h
+++ b/bin/named/include/named/lwaddr.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwaddr.h,v 1.6 2005/04/29 00:22:31 marka Exp $ */
+/* $Id: lwaddr.h,v 1.7 2007/06/18 23:47:19 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/named/include/named/lwdclient.h b/bin/named/include/named/lwdclient.h
index e77b3e274856dc62f88efdf77fd4b914341f6bce..0f0867ddc208a45146efdcd0aa912e81949b8651 100644 (file)
--- a/bin/named/include/named/lwdclient.h
+++ b/bin/named/include/named/lwdclient.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwdclient.h,v 1.16 2005/04/29 00:22:31 marka Exp $ */
+/* $Id: lwdclient.h,v 1.17 2007/06/18 23:47:19 tbox Exp $ */
 
 #ifndef NAMED_LWDCLIENT_H
 #define NAMED_LWDCLIENT_H 1

diff --git a/bin/named/include/named/lwresd.h b/bin/named/include/named/lwresd.h
index 6f62ed51ae9d03e0b8b905062f89818838381b10..210339cacc1050630518305ce0b07b0cdf5ba4d1 100644 (file)
--- a/bin/named/include/named/lwresd.h
+++ b/bin/named/include/named/lwresd.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwresd.h,v 1.17 2006/03/02 00:37:23 marka Exp $ */
+/* $Id: lwresd.h,v 1.18 2007/06/18 23:47:19 tbox Exp $ */
 
 #ifndef NAMED_LWRESD_H
 #define NAMED_LWRESD_H 1

diff --git a/bin/named/include/named/lwsearch.h b/bin/named/include/named/lwsearch.h
index dde5f629ad58a361efafa8aa0c32fcb199bdfc30..b3270677ae78db69700d1f1d7dbdf0c113537a0d 100644 (file)
--- a/bin/named/include/named/lwsearch.h
+++ b/bin/named/include/named/lwsearch.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwsearch.h,v 1.7 2005/04/29 00:22:31 marka Exp $ */
+/* $Id: lwsearch.h,v 1.8 2007/06/18 23:47:20 tbox Exp $ */
 
 #ifndef NAMED_LWSEARCH_H
 #define NAMED_LWSEARCH_H 1

diff --git a/bin/named/include/named/main.h b/bin/named/include/named/main.h
index 9630411d385a4dcb7a2ade925caa49bb6c6122f0..52edefa509874eaf244ac829bf25ef848dbd6cc6 100644 (file)
--- a/bin/named/include/named/main.h
+++ b/bin/named/include/named/main.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: main.h,v 1.13 2005/04/29 00:22:32 marka Exp $ */
+/* $Id: main.h,v 1.14 2007/06/18 23:47:21 tbox Exp $ */
 
 #ifndef NAMED_MAIN_H
 #define NAMED_MAIN_H 1

diff --git a/bin/named/include/named/notify.h b/bin/named/include/named/notify.h
index fb9cf3251bf1352056e8dca8c1bbb1c7183650a6..6642b40da54f42d183fe1d523e8edfcb685658d8 100644 (file)
--- a/bin/named/include/named/notify.h
+++ b/bin/named/include/named/notify.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: notify.h,v 1.12 2005/04/29 00:22:32 marka Exp $ */
+/* $Id: notify.h,v 1.13 2007/06/18 23:47:21 tbox Exp $ */
 
 #ifndef NAMED_NOTIFY_H
 #define NAMED_NOTIFY_H 1

diff --git a/bin/named/include/named/ns_smf_globals.h b/bin/named/include/named/ns_smf_globals.h
index f79549e9caf2745edc7037349e97bc72586ab101..760820ab74c2a1df412c63ded44cee3d4b9b7fe0 100644 (file)
--- a/bin/named/include/named/ns_smf_globals.h
+++ b/bin/named/include/named/ns_smf_globals.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2005  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ns_smf_globals.h,v 1.5 2005/05/13 01:35:41 marka Exp $ */
+/* $Id: ns_smf_globals.h,v 1.6 2007/06/18 23:47:21 tbox Exp $ */
 
 #ifndef NS_SMF_GLOBALS_H
 #define NS_SMF_GLOBALS_H 1

diff --git a/bin/named/include/named/query.h b/bin/named/include/named/query.h
index 4e0f7d105a20d6fab4b3dc179665095977bdbae6..d048f19e7b95dcbaf8057cf42e39d80296eacd49 100644 (file)
--- a/bin/named/include/named/query.h
+++ b/bin/named/include/named/query.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: query.h,v 1.38 2005/04/29 00:22:32 marka Exp $ */
+/* $Id: query.h,v 1.39 2007/06/18 23:47:21 tbox Exp $ */
 
 #ifndef NAMED_QUERY_H
 #define NAMED_QUERY_H 1

diff --git a/bin/named/include/named/server.h b/bin/named/include/named/server.h
index 8566de92a88f089575142435aa0c95be449ad3e3..1e08b3d9e19c18a1f63cbcb1850b9a0759c53b1b 100644 (file)
--- a/bin/named/include/named/server.h
+++ b/bin/named/include/named/server.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: server.h,v 1.85 2006/12/21 06:02:30 marka Exp $ */
+/* $Id: server.h,v 1.86 2007/06/18 23:47:21 tbox Exp $ */
 
 #ifndef NAMED_SERVER_H
 #define NAMED_SERVER_H 1

diff --git a/bin/named/include/named/sortlist.h b/bin/named/include/named/sortlist.h
index ea26095c1d0778a52df2fb442a89938b5af3159b..2a12462e4138fe87055fe7ca73ab87c41563dc26 100644 (file)
--- a/bin/named/include/named/sortlist.h
+++ b/bin/named/include/named/sortlist.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sortlist.h,v 1.9 2006/03/02 00:37:23 marka Exp $ */
+/* $Id: sortlist.h,v 1.10 2007/06/18 23:47:21 tbox Exp $ */
 
 #ifndef NAMED_SORTLIST_H
 #define NAMED_SORTLIST_H 1

diff --git a/bin/named/include/named/tkeyconf.h b/bin/named/include/named/tkeyconf.h
index be945b4ea65461dd0e786502d7232f954cc4f86f..1c7e3ca97a1944b911254b9324c411c27b4c4d54 100644 (file)
--- a/bin/named/include/named/tkeyconf.h
+++ b/bin/named/include/named/tkeyconf.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tkeyconf.h,v 1.14 2006/03/02 00:37:23 marka Exp $ */
+/* $Id: tkeyconf.h,v 1.15 2007/06/18 23:47:21 tbox Exp $ */
 
 #ifndef NS_TKEYCONF_H
 #define NS_TKEYCONF_H 1

diff --git a/bin/named/include/named/tsigconf.h b/bin/named/include/named/tsigconf.h
index 1fd08f11ce8b1000e859708bd674006a3bdd87a9..fe0a507b30503f08d0afd84aa3ef0d706c7f6783 100644 (file)
--- a/bin/named/include/named/tsigconf.h
+++ b/bin/named/include/named/tsigconf.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tsigconf.h,v 1.14 2006/03/02 00:37:23 marka Exp $ */
+/* $Id: tsigconf.h,v 1.15 2007/06/18 23:47:21 tbox Exp $ */
 
 #ifndef NS_TSIGCONF_H
 #define NS_TSIGCONF_H 1

diff --git a/bin/named/include/named/types.h b/bin/named/include/named/types.h
index 46821efb93b2ebe5367f4d06ba90849237c9b6c4..6dc6dfe7145d4c3abe3cc7ef6be2efac7f840ef2 100644 (file)
--- a/bin/named/include/named/types.h
+++ b/bin/named/include/named/types.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: types.h,v 1.25 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: types.h,v 1.26 2007/06/18 23:47:21 tbox Exp $ */
 
 #ifndef NAMED_TYPES_H
 #define NAMED_TYPES_H 1

diff --git a/bin/named/include/named/update.h b/bin/named/include/named/update.h
index 45451079886f0358285a89749d442e16d343b1a8..21af43448d3420618bcb026937e7d31a137f949b 100644 (file)
--- a/bin/named/include/named/update.h
+++ b/bin/named/include/named/update.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: update.h,v 1.11 2005/04/29 00:22:33 marka Exp $ */
+/* $Id: update.h,v 1.12 2007/06/18 23:47:21 tbox Exp $ */
 
 #ifndef NAMED_UPDATE_H
 #define NAMED_UPDATE_H 1

diff --git a/bin/named/include/named/xfrout.h b/bin/named/include/named/xfrout.h
index f20e50ac621412d6997c2d4c7dbd9f5e2c6970a7..b0ac3c7081b47a740cb99438de303edc37a099f9 100644 (file)
--- a/bin/named/include/named/xfrout.h
+++ b/bin/named/include/named/xfrout.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: xfrout.h,v 1.10 2005/04/29 00:22:33 marka Exp $ */
+/* $Id: xfrout.h,v 1.11 2007/06/18 23:47:21 tbox Exp $ */
 
 #ifndef NAMED_XFROUT_H
 #define NAMED_XFROUT_H 1

diff --git a/bin/named/include/named/zoneconf.h b/bin/named/include/named/zoneconf.h
index 351512f634721b21e81dd65850e1734d1e41084c..369438e69cd67d87bc5a1cb602a1163a620736c9 100644 (file)
--- a/bin/named/include/named/zoneconf.h
+++ b/bin/named/include/named/zoneconf.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zoneconf.h,v 1.24 2006/03/02 00:37:23 marka Exp $ */
+/* $Id: zoneconf.h,v 1.25 2007/06/18 23:47:21 tbox Exp $ */
 
 #ifndef NS_ZONECONF_H
 #define NS_ZONECONF_H 1

diff --git a/bin/named/interfacemgr.c b/bin/named/interfacemgr.c
index 1c04f1d879cf7093894a82850cb55f2955c8173f..9f11581e1ee9ee17e9db8682610b3c9b10952f83 100644 (file)
--- a/bin/named/interfacemgr.c
+++ b/bin/named/interfacemgr.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: interfacemgr.c,v 1.88 2007/02/13 02:49:08 marka Exp $ */
+/* $Id: interfacemgr.c,v 1.89 2007/06/18 23:47:18 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/named/listenlist.c b/bin/named/listenlist.c
index e3a69f9ce6f07ed50ffba498796a7fba06a90fc3..4cd1c1cd287492282581e7aa94c06ed0147b4c7a 100644 (file)
--- a/bin/named/listenlist.c
+++ b/bin/named/listenlist.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: listenlist.c,v 1.12 2005/04/29 00:22:27 marka Exp $ */
+/* $Id: listenlist.c,v 1.13 2007/06/18 23:47:18 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/named/log.c b/bin/named/log.c
index 35f9267d9fc6a0a16e55296da82ac5ee7c6b054d..c366f9f198be08b1117c2be06d46456d5a8304e4 100644 (file)
--- a/bin/named/log.c
+++ b/bin/named/log.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: log.c,v 1.44 2006/12/22 01:44:59 marka Exp $ */
+/* $Id: log.c,v 1.45 2007/06/18 23:47:18 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/named/logconf.c b/bin/named/logconf.c
index bbe5b1d561579896e74aa7c1bf9b3cba5692d12d..4b49b157114db28fb03b56b404771a42c8a45ec5 100644 (file)
--- a/bin/named/logconf.c
+++ b/bin/named/logconf.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: logconf.c,v 1.40 2006/03/02 00:37:23 marka Exp $ */
+/* $Id: logconf.c,v 1.41 2007/06/18 23:47:18 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/named/lwaddr.c b/bin/named/lwaddr.c
index 771954fafad8ebd6ca4bda29abde4e6916802780..53bfd9cff2d938247bc1d207e067c8dc5d83fd71 100644 (file)
--- a/bin/named/lwaddr.c
+++ b/bin/named/lwaddr.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwaddr.c,v 1.6 2005/04/29 00:22:27 marka Exp $ */
+/* $Id: lwaddr.c,v 1.7 2007/06/18 23:47:18 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/named/lwdclient.c b/bin/named/lwdclient.c
index 677b0292ff02a4d8796bc8d7caef6227a9e495cd..a8431340024ce538a1ddcab64ff0757693a121ee 100644 (file)
--- a/bin/named/lwdclient.c
+++ b/bin/named/lwdclient.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwdclient.c,v 1.21 2007/02/14 00:27:26 marka Exp $ */
+/* $Id: lwdclient.c,v 1.22 2007/06/18 23:47:18 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/named/lwderror.c b/bin/named/lwderror.c
index 04f58f9055910226409ea6551dec906aa76af684..a5bae2158f3d80e94f5d0d14d88321860d53d80e 100644 (file)
--- a/bin/named/lwderror.c
+++ b/bin/named/lwderror.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwderror.c,v 1.10 2005/04/29 00:22:28 marka Exp $ */
+/* $Id: lwderror.c,v 1.11 2007/06/18 23:47:18 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/named/lwdgabn.c b/bin/named/lwdgabn.c
index da36d2833919683231e55d6439d97e10eb2bf328..3d276dfa5d941e2f59cf14279de94a0fe35f5a7f 100644 (file)
--- a/bin/named/lwdgabn.c
+++ b/bin/named/lwdgabn.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwdgabn.c,v 1.20 2006/03/02 00:37:23 marka Exp $ */
+/* $Id: lwdgabn.c,v 1.21 2007/06/18 23:47:18 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/named/lwdgnba.c b/bin/named/lwdgnba.c
index a8669e9dd300555e2a6b4c0642d64c3f0cfc0085..458ea76d909955878a97858b9ee6376d3f53d616 100644 (file)
--- a/bin/named/lwdgnba.c
+++ b/bin/named/lwdgnba.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwdgnba.c,v 1.18 2005/04/29 00:22:28 marka Exp $ */
+/* $Id: lwdgnba.c,v 1.19 2007/06/18 23:47:18 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/named/lwdgrbn.c b/bin/named/lwdgrbn.c
index e49dfc4bd0a09f7a0ab3c76d092de07dfdff9439..2af6cc26992c044fbdb67629cf849fd3701c320b 100644 (file)
--- a/bin/named/lwdgrbn.c
+++ b/bin/named/lwdgrbn.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwdgrbn.c,v 1.18 2006/12/07 23:57:59 marka Exp $ */
+/* $Id: lwdgrbn.c,v 1.19 2007/06/18 23:47:18 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/named/lwdnoop.c b/bin/named/lwdnoop.c
index 893805ce3e38c98a7ad9c13cd229fd0bda5e74a1..9e9dadd699eeea5fa1e51e0f5a61f1a3ceff5328 100644 (file)
--- a/bin/named/lwdnoop.c
+++ b/bin/named/lwdnoop.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwdnoop.c,v 1.9 2005/04/29 00:22:28 marka Exp $ */
+/* $Id: lwdnoop.c,v 1.10 2007/06/18 23:47:18 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/named/lwresd.c b/bin/named/lwresd.c
index a3ea280656c4a6384a2dad612eb05c9de2bad130..aac3b4b105b843824300b781f71a7bd70232b715 100644 (file)
--- a/bin/named/lwresd.c
+++ b/bin/named/lwresd.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwresd.c,v 1.53 2006/03/02 00:37:23 marka Exp $ */
+/* $Id: lwresd.c,v 1.54 2007/06/18 23:47:18 tbox Exp $ */
 
 /*! \file 
  * \brief

diff --git a/bin/named/lwresd.docbook b/bin/named/lwresd.docbook
index 8a15f183dcc3708eb4696dc49ad15791216f7a10..4ff40e91cedf9e6e460e6d390de4923cf06f2055 100644 (file)
--- a/bin/named/lwresd.docbook
+++ b/bin/named/lwresd.docbook
@@ -5,7 +5,7 @@
  - Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000, 2001  Internet Software Consortium.
  -
- - 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.
  -
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: lwresd.docbook,v 1.14 2007/05/16 01:42:26 marka Exp $ -->
+<!-- $Id: lwresd.docbook,v 1.15 2007/06/18 23:47:18 tbox Exp $ -->
 <refentry>
   <refentryinfo>
     <date>June 30, 2000</date>

diff --git a/bin/named/lwsearch.c b/bin/named/lwsearch.c
index be9cc6b40fbe26e9d39f75e9b128ced48aba2da5..b32b893aaa2ff348275444d1fbac0ed134e18fac 100644 (file)
--- a/bin/named/lwsearch.c
+++ b/bin/named/lwsearch.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwsearch.c,v 1.11 2005/07/12 01:00:13 marka Exp $ */
+/* $Id: lwsearch.c,v 1.12 2007/06/18 23:47:18 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/named/main.c b/bin/named/main.c
index 3441699ac4e9d2c17b975ee0e7b9c735bf9bb2ac..1ec8b18196433cbc1963e23d992ab991b7890e79 100644 (file)
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: main.c,v 1.156 2007/05/21 03:46:41 tbox Exp $ */
+/* $Id: main.c,v 1.157 2007/06/18 23:47:18 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/named/named.conf.docbook b/bin/named/named.conf.docbook
index 27f4b5473126780272f2017050ef5cc2aa9b9593..4b804700fd3c8cc7000f61a75c4291cc77adb017 100644 (file)
--- a/bin/named/named.conf.docbook
+++ b/bin/named/named.conf.docbook
@@ -4,7 +4,7 @@
 <!--
  - Copyright (C) 2004-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.
  -
@@ -17,7 +17,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: named.conf.docbook,v 1.29 2007/05/09 01:32:08 marka Exp $ -->
+<!-- $Id: named.conf.docbook,v 1.30 2007/06/18 23:47:18 tbox Exp $ -->
 <refentry>
   <refentryinfo>
     <date>Aug 13, 2004</date>

diff --git a/bin/named/named.docbook b/bin/named/named.docbook
index 950f87382534654708779263d12b03e419f1d117..8b4fee06530c0e1d1030a9dd0b6456d301dd3e22 100644 (file)
--- a/bin/named/named.docbook
+++ b/bin/named/named.docbook
@@ -5,7 +5,7 @@
  - Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
  -
- - 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.
  -
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: named.docbook,v 1.17 2007/05/16 01:42:26 marka Exp $ -->
+<!-- $Id: named.docbook,v 1.18 2007/06/18 23:47:18 tbox Exp $ -->
 <refentry id="man.named">
   <refentryinfo>
     <date>June 30, 2000</date>

diff --git a/bin/named/notify.c b/bin/named/notify.c
index 3ca52fa81e2f16c11f53382e8a90ac0ce4a41ede..fc4d4f9851e6593b1f81860d6e1425f8d73a76e0 100644 (file)
--- a/bin/named/notify.c
+++ b/bin/named/notify.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: notify.c,v 1.35 2006/12/05 00:13:47 marka Exp $ */
+/* $Id: notify.c,v 1.36 2007/06/18 23:47:19 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/named/query.c b/bin/named/query.c
index 8e84b1515e9e89d119e68f728b97fc4c3c433240..07d66d9331a2de0df3b545eb6b6600e495df996f 100644 (file)
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: query.c,v 1.296 2007/05/18 06:53:01 marka Exp $ */
+/* $Id: query.c,v 1.297 2007/06/18 23:47:19 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/named/server.c b/bin/named/server.c
index 4bf2e5e44b4aab1de3a0d34cc9dbc247429a1df0..36b9e56e30fa88c0283b50eb9698ecb2e2033ef7 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: server.c,v 1.485 2007/05/15 02:38:34 marka Exp $ */
+/* $Id: server.c,v 1.486 2007/06/18 23:47:19 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/named/sortlist.c b/bin/named/sortlist.c
index 110afaf5d72095196f566d109cc51dd1a45ecb2b..264dea270ae528068e056370541575390b5d2e77 100644 (file)
--- a/bin/named/sortlist.c
+++ b/bin/named/sortlist.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sortlist.c,v 1.13 2006/03/02 00:37:23 marka Exp $ */
+/* $Id: sortlist.c,v 1.14 2007/06/18 23:47:19 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/named/tkeyconf.c b/bin/named/tkeyconf.c
index d972836acb29946c57f72c1fb3f24423c73b7bcc..50de103511bfd04f88a213e2639b61f7beed8332 100644 (file)
--- a/bin/named/tkeyconf.c
+++ b/bin/named/tkeyconf.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tkeyconf.c,v 1.27 2006/12/04 01:52:45 marka Exp $ */
+/* $Id: tkeyconf.c,v 1.28 2007/06/18 23:47:19 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/named/tsigconf.c b/bin/named/tsigconf.c
index 37142e1ec5ac786589bf50b18dce2f1fc0c787c1..3e7e386259df20586750faab07fc382fdd20ce2d 100644 (file)
--- a/bin/named/tsigconf.c
+++ b/bin/named/tsigconf.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tsigconf.c,v 1.28 2006/02/28 02:39:51 marka Exp $ */
+/* $Id: tsigconf.c,v 1.29 2007/06/18 23:47:19 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/named/unix/Makefile.in b/bin/named/unix/Makefile.in
index a18351a27ac05af81d39f1ff3fa204788edef28d..f8ca921c1768f1c41b59df0231b3c721f48a8aae 100644 (file)
--- a/bin/named/unix/Makefile.in
+++ b/bin/named/unix/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1999-2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.8 2004/03/05 04:58:01 marka Exp $
+# $Id: Makefile.in,v 1.9 2007/06/18 23:47:21 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/bin/named/unix/include/named/os.h b/bin/named/unix/include/named/os.h
index 54a2411d5e381f957c9ff55cde9d62e7da1d6e12..57c4b04a1d0623f8e487dad2ff60e3054ed8bdaa 100644 (file)
--- a/bin/named/unix/include/named/os.h
+++ b/bin/named/unix/include/named/os.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: os.h,v 1.25 2005/04/29 00:22:34 marka Exp $ */
+/* $Id: os.h,v 1.26 2007/06/18 23:47:21 tbox Exp $ */
 
 #ifndef NS_OS_H
 #define NS_OS_H 1

diff --git a/bin/named/unix/os.c b/bin/named/unix/os.c
index 2a2712adfeefa8a6d8845a8d446227b584321509..8a0368a86c73f5668191a4498a842927b867fb44 100644 (file)
--- a/bin/named/unix/os.c
+++ b/bin/named/unix/os.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: os.c,v 1.77 2006/02/03 23:51:39 marka Exp $ */
+/* $Id: os.c,v 1.78 2007/06/18 23:47:21 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/named/update.c b/bin/named/update.c
index 22bcf23badee96f11e5f9045cc348c0d9a77b9f6..e57f957b7739beb42423c249741a50b1cdb37c34 100644 (file)
--- a/bin/named/update.c
+++ b/bin/named/update.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: update.c,v 1.133 2007/05/18 05:50:35 marka Exp $ */
+/* $Id: update.c,v 1.134 2007/06/18 23:47:19 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/named/win32/include/named/ntservice.h b/bin/named/win32/include/named/ntservice.h
index 6ba68e010af96995990e547179923d73fc8a3e21..6afd08bc219c5acd28c9afa9ca3e5ac72b246e5d 100644 (file)
--- a/bin/named/win32/include/named/ntservice.h
+++ b/bin/named/win32/include/named/ntservice.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ntservice.h,v 1.4 2004/03/05 04:58:11 marka Exp $ */
+/* $Id: ntservice.h,v 1.5 2007/06/18 23:47:21 tbox Exp $ */
 
 #ifndef NTSERVICE_H
 #define NTSERVICE_H

diff --git a/bin/named/win32/include/named/os.h b/bin/named/win32/include/named/os.h
index 12e4ab4f6a3b0a46b8f6b46514c9085ca3503027..5993efbf1f70170e4ec4710d6c87111c03f4c340 100644 (file)
--- a/bin/named/win32/include/named/os.h
+++ b/bin/named/win32/include/named/os.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: os.h,v 1.10 2004/09/29 06:45:38 marka Exp $ */
+/* $Id: os.h,v 1.11 2007/06/18 23:47:21 tbox Exp $ */
 
 #ifndef NS_OS_H
 #define NS_OS_H 1

diff --git a/bin/named/win32/ntservice.c b/bin/named/win32/ntservice.c
index 9261ccdf6088869c487f34b320015ebd9150f37d..e86c8b94cd3b0a59c133861cb9dd8f5644bab501 100644 (file)
--- a/bin/named/win32/ntservice.c
+++ b/bin/named/win32/ntservice.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ntservice.c,v 1.10 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: ntservice.c,v 1.11 2007/06/18 23:47:21 tbox Exp $ */
 
 #include <config.h>
 #include <stdio.h>

diff --git a/bin/named/win32/os.c b/bin/named/win32/os.c
index 790241df4af97e255b9abe6a7e40b8539498caf1..b56b3db3e939df9d238c5207dec4c9a34bde848c 100644 (file)
--- a/bin/named/win32/os.c
+++ b/bin/named/win32/os.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: os.c,v 1.23 2005/03/16 00:55:15 marka Exp $ */
+/* $Id: os.c,v 1.24 2007/06/18 23:47:21 tbox Exp $ */
 
 #include <config.h>
 #include <stdarg.h>

diff --git a/bin/named/xfrout.c b/bin/named/xfrout.c
index 82fd2e3ff4b809c2dee58231317ee2124847161b..6cc8f7064ac36360de7bf3d733985bcb974515cc 100644 (file)
--- a/bin/named/xfrout.c
+++ b/bin/named/xfrout.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: xfrout.c,v 1.125 2007/03/29 23:47:04 tbox Exp $ */
+/* $Id: xfrout.c,v 1.126 2007/06/18 23:47:19 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
index c9e486658a30a43a7433c2638242c7ef9a3f463c..d49044c4f1f1d573b5af6e6c94f701946c50f5de 100644 (file)
--- a/bin/named/zoneconf.c
+++ b/bin/named/zoneconf.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zoneconf.c,v 1.135 2006/12/04 01:52:45 marka Exp $ */
+/* $Id: zoneconf.c,v 1.136 2007/06/18 23:47:19 tbox Exp $ */
 
 /*% */
 

diff --git a/bin/nsupdate/Makefile.in b/bin/nsupdate/Makefile.in
index d7fd0f6371cf6c5782b8b1c0c2e5ca082bac8a57..ed80201935bb1c507015f5d3ccd4718d9484b410 100644 (file)
--- a/bin/nsupdate/Makefile.in
+++ b/bin/nsupdate/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2002  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.25 2006/12/05 00:13:47 marka Exp $
+# $Id: Makefile.in,v 1.26 2007/06/18 23:47:21 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
index 4a00d2366571d7236d3087a7f9d41378f5c32ea7..2175abd5ac5c6f747eadc408ae2aa3030cd24753 100644 (file)
--- a/bin/nsupdate/nsupdate.c
+++ b/bin/nsupdate/nsupdate.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsupdate.c,v 1.150 2007/05/21 02:47:25 marka Exp $ */
+/* $Id: nsupdate.c,v 1.151 2007/06/18 23:47:21 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/nsupdate/nsupdate.docbook b/bin/nsupdate/nsupdate.docbook
index c77bfecbacf152d0541d919e25ea543e68b8fd0f..93d46a45b0eee7774de6f7c2bebe9ceb3bd9e59b 100644 (file)
--- a/bin/nsupdate/nsupdate.docbook
+++ b/bin/nsupdate/nsupdate.docbook
@@ -5,7 +5,7 @@
  - Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2003  Internet Software Consortium.
  -
- - 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.
  -
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: nsupdate.docbook,v 1.27 2007/05/09 01:32:08 marka Exp $ -->
+<!-- $Id: nsupdate.docbook,v 1.28 2007/06/18 23:47:21 tbox Exp $ -->
 <refentry>
   <refentryinfo>
     <date>Jun 30, 2000</date>

diff --git a/bin/rndc/Makefile.in b/bin/rndc/Makefile.in
index 5c0591646f82fc33a20a1d772daad761fce395c8..9b0e20d6974793e869cb90b0af2beef0b259e3fd 100644 (file)
--- a/bin/rndc/Makefile.in
+++ b/bin/rndc/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2002  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.43 2007/01/19 00:55:50 marka Exp $
+# $Id: Makefile.in,v 1.44 2007/06/18 23:47:22 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/bin/rndc/include/rndc/os.h b/bin/rndc/include/rndc/os.h
index ce14882d31c7f65b56f17ad1615b7caa177c23f4..fc02e7bbf0f8d014a984c0a956ab716524905588 100644 (file)
--- a/bin/rndc/include/rndc/os.h
+++ b/bin/rndc/include/rndc/os.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: os.h,v 1.7 2005/04/29 00:22:36 marka Exp $ */
+/* $Id: os.h,v 1.8 2007/06/18 23:47:26 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/rndc/rndc-confgen.c b/bin/rndc/rndc-confgen.c
index ed6d2bb083344fa584cd18f1d9f4ce8e2e84b551..bfe85f96e41d917f0e781e59fc34ffcbdd8da69a 100644 (file)
--- a/bin/rndc/rndc-confgen.c
+++ b/bin/rndc/rndc-confgen.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rndc-confgen.c,v 1.23 2007/05/21 03:46:42 tbox Exp $ */
+/* $Id: rndc-confgen.c,v 1.24 2007/06/18 23:47:25 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/rndc/rndc-confgen.docbook b/bin/rndc/rndc-confgen.docbook
index 02cbe77727cb57afb0383fdf108860c3d6979575..4c51da57a21f9ccf704c3bc05aa7a89146a63c9e 100644 (file)
--- a/bin/rndc/rndc-confgen.docbook
+++ b/bin/rndc/rndc-confgen.docbook
@@ -5,7 +5,7 @@
  - Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2001, 2003  Internet Software Consortium.
  -
- - 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.
  -
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: rndc-confgen.docbook,v 1.12 2007/01/29 23:57:22 marka Exp $ -->
+<!-- $Id: rndc-confgen.docbook,v 1.13 2007/06/18 23:47:25 tbox Exp $ -->
 <refentry id="man.rndc-confgen">
   <refentryinfo>
     <date>Aug 27, 2001</date>

diff --git a/bin/rndc/rndc.c b/bin/rndc/rndc.c
index 214c44dbee55ab984d9bbc0cdb0167bd061d9ca8..2d4d33c2ea912e38c7cdc695271c4455f7eda132 100644 (file)
--- a/bin/rndc/rndc.c
+++ b/bin/rndc/rndc.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rndc.c,v 1.117 2007/05/21 03:46:42 tbox Exp $ */
+/* $Id: rndc.c,v 1.118 2007/06/18 23:47:25 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/rndc/rndc.conf b/bin/rndc/rndc.conf
index de4235e15e35d96a7137e2603365c275f34dbdf5..e7681035ad27e5820cfb96b7762ff65ef6f88534 100644 (file)
--- a/bin/rndc/rndc.conf
+++ b/bin/rndc/rndc.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rndc.conf,v 1.9 2004/06/18 04:38:46 marka Exp $ */
+/* $Id: rndc.conf,v 1.10 2007/06/18 23:47:25 tbox Exp $ */
 
 /*
  * Sample rndc configuration file.

diff --git a/bin/rndc/rndc.conf.docbook b/bin/rndc/rndc.conf.docbook
index 4190236e304f78d7e8e415c75f1c6592ea3e143e..9de1995467fdc320f3dd3ba94e539b33005f3b55 100644 (file)
--- a/bin/rndc/rndc.conf.docbook
+++ b/bin/rndc/rndc.conf.docbook
@@ -5,7 +5,7 @@
  - Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000, 2001  Internet Software Consortium.
  -
- - 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.
  -
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: rndc.conf.docbook,v 1.16 2007/05/09 06:18:45 marka Exp $ -->
+<!-- $Id: rndc.conf.docbook,v 1.17 2007/06/18 23:47:25 tbox Exp $ -->
 <refentry id="man.rndc.conf">
   <refentryinfo>
     <date>June 30, 2000</date>

diff --git a/bin/rndc/rndc.docbook b/bin/rndc/rndc.docbook
index 35311a3b833769bfa52369040502e70e40c0165d..d6afc8dfbc2a07c3882ce4c82fde6fe0a0eea93c 100644 (file)
--- a/bin/rndc/rndc.docbook
+++ b/bin/rndc/rndc.docbook
@@ -5,7 +5,7 @@
  - Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000, 2001  Internet Software Consortium.
  -
- - 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.
  -
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: rndc.docbook,v 1.18 2007/05/31 22:28:35 marka Exp $ -->
+<!-- $Id: rndc.docbook,v 1.19 2007/06/18 23:47:26 tbox Exp $ -->
 <refentry id="man.rndc">
   <refentryinfo>
     <date>June 30, 2000</date>

diff --git a/bin/rndc/unix/Makefile.in b/bin/rndc/unix/Makefile.in
index 6696c23e305e4fb592105ff23951a3ca58f6f359..094625c06b08b930700d1facd8ca920927e8aea2 100644 (file)
--- a/bin/rndc/unix/Makefile.in
+++ b/bin/rndc/unix/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.3 2004/03/05 04:58:29 marka Exp $
+# $Id: Makefile.in,v 1.4 2007/06/18 23:47:26 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/bin/rndc/unix/os.c b/bin/rndc/unix/os.c
index b8c9b795bb2381e35556b65fd4467ec37ad4cad7..3d1f2f7ca98282f146994856020e35034ccfab21 100644 (file)
--- a/bin/rndc/unix/os.c
+++ b/bin/rndc/unix/os.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: os.c,v 1.8 2005/04/29 00:22:36 marka Exp $ */
+/* $Id: os.c,v 1.9 2007/06/18 23:47:26 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/rndc/util.c b/bin/rndc/util.c
index b34a1b9f1848faa974d10a3442a1097cacfd1d61..cbf3035bfd2513f0deafdb8be58d946b10604cdc 100644 (file)
--- a/bin/rndc/util.c
+++ b/bin/rndc/util.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: util.c,v 1.5 2005/04/29 00:22:36 marka Exp $ */
+/* $Id: util.c,v 1.6 2007/06/18 23:47:26 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/rndc/util.h b/bin/rndc/util.h
index 3a595de7e27c08dca8f6d722bc4c2e2aee285917..f9f6c170834fdf51f6584eed7c4bb887dba06ac4 100644 (file)
--- a/bin/rndc/util.h
+++ b/bin/rndc/util.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: util.h,v 1.8 2005/04/29 00:22:36 marka Exp $ */
+/* $Id: util.h,v 1.9 2007/06/18 23:47:26 tbox Exp $ */
 
 #ifndef RNDC_UTIL_H
 #define RNDC_UTIL_H 1

diff --git a/bin/rndc/win32/os.c b/bin/rndc/win32/os.c
index ec85ce7d4a7b023ab52da68d4fbbf295e296bd6b..be9314e33b820513e71a4714b73b28e0b49e8565 100644 (file)
--- a/bin/rndc/win32/os.c
+++ b/bin/rndc/win32/os.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: os.c,v 1.4 2004/03/05 04:58:32 marka Exp $ */
+/* $Id: os.c,v 1.5 2007/06/18 23:47:26 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/tests/Makefile.in b/bin/tests/Makefile.in
index f071b71a6e6a2c96cdf2e1c40d6ff235722c5650..25558f7f29ea03534233b360ee7b536e7f575464 100644 (file)
--- a/bin/tests/Makefile.in
+++ b/bin/tests/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2003  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.127 2006/07/21 02:05:58 marka Exp $
+# $Id: Makefile.in,v 1.128 2007/06/18 23:47:26 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/bin/tests/adb_test.c b/bin/tests/adb_test.c
index 6d3eb171773e933e1677c8855e0237a0338b32ff..407a9a568da1f22d646d955fe5fde0e18629575b 100644 (file)
--- a/bin/tests/adb_test.c
+++ b/bin/tests/adb_test.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: adb_test.c,v 1.66 2005/06/23 23:49:35 marka Exp $ */
+/* $Id: adb_test.c,v 1.67 2007/06/18 23:47:26 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/tests/b8t.mk b/bin/tests/b8t.mk
index 74c574b98e4018b386be49b540a28aded2534971..6b20056b04132cf9377dfc429450b888e2aa6981 100644 (file)
--- a/bin/tests/b8t.mk
+++ b/bin/tests/b8t.mk
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1999-2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: b8t.mk,v 1.9 2004/03/05 04:58:36 marka Exp $
+# $Id: b8t.mk,v 1.10 2007/06/18 23:47:26 tbox Exp $
 
 #
 # bind 8 multi-host make

diff --git a/bin/tests/b9t.mk b/bin/tests/b9t.mk
index 9dda46e01d909592440c7cb9f59120b623a38548..74ecf1272675ecc1f3b801917d425a4903428e4e 100644 (file)
--- a/bin/tests/b9t.mk
+++ b/bin/tests/b9t.mk
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1999-2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: b9t.mk,v 1.11 2004/03/05 04:58:36 marka Exp $
+# $Id: b9t.mk,v 1.12 2007/06/18 23:47:26 tbox Exp $
 
 #
 # makefile to configure, build and test bind9

diff --git a/bin/tests/byaddr_test.c b/bin/tests/byaddr_test.c
index cbf183a5a65fb0b8a32fd8d223f747da51d1ce6f..a1edb88c7ca5411d98147f9fee81f223dc5401da 100644 (file)
--- a/bin/tests/byaddr_test.c
+++ b/bin/tests/byaddr_test.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: byaddr_test.c,v 1.26 2005/04/29 00:22:37 marka Exp $ */
+/* $Id: byaddr_test.c,v 1.27 2007/06/18 23:47:26 tbox Exp $ */
 
 /*! \file
  * \author

diff --git a/bin/tests/byname_test.c b/bin/tests/byname_test.c
index 863b25a3d3d81011d706f50c2f2dececbdcb6b9c..a957822d27db2e61a47d0c89a22934cf6fcd309a 100644 (file)
--- a/bin/tests/byname_test.c
+++ b/bin/tests/byname_test.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: byname_test.c,v 1.29 2005/06/23 23:49:35 marka Exp $ */
+/* $Id: byname_test.c,v 1.30 2007/06/18 23:47:26 tbox Exp $ */
 
 /*! \file
  * \author

diff --git a/bin/tests/cfg_test.c b/bin/tests/cfg_test.c
index 6a709228f5bf715169db557ce91e107d323c9173..70a3d23f9e5414a59a6c5762d1073fcf7272f584 100644 (file)
--- a/bin/tests/cfg_test.c
+++ b/bin/tests/cfg_test.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001, 2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: cfg_test.c,v 1.17 2005/04/29 00:22:38 marka Exp $ */
+/* $Id: cfg_test.c,v 1.18 2007/06/18 23:47:26 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/tests/compress_test.c b/bin/tests/compress_test.c
index 183d82be7a3d05a8b02e57a83d074b28b0b300a5..8284dc1c1f11dc9c07b5552eef5bb0a31d76abbd 100644 (file)
--- a/bin/tests/compress_test.c
+++ b/bin/tests/compress_test.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: compress_test.c,v 1.33 2007/05/15 23:46:57 tbox Exp $ */
+/* $Id: compress_test.c,v 1.34 2007/06/18 23:47:26 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/tests/db/Makefile.in b/bin/tests/db/Makefile.in
index f8141135c844def5f9ba6e0f664c7925fe80d523..49fa65cbca0b0ffd3bbcff29cca11fb06fdd7a4f 100644 (file)
--- a/bin/tests/db/Makefile.in
+++ b/bin/tests/db/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1999-2002  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.27 2004/07/20 07:13:35 marka Exp $
+# $Id: Makefile.in,v 1.28 2007/06/18 23:47:26 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/bin/tests/db/t_db.c b/bin/tests/db/t_db.c
index 877a6ad397ef10743aa8d5f8d040d2e364564182..f860e7233c45f2404cdf0cca19ad4b10cf15cf77 100644 (file)
--- a/bin/tests/db/t_db.c
+++ b/bin/tests/db/t_db.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_db.c,v 1.34 2005/11/30 23:52:54 marka Exp $ */
+/* $Id: t_db.c,v 1.35 2007/06/18 23:47:26 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/tests/db_test.c b/bin/tests/db_test.c
index 7bbf4e565f3fa12e5f15b3a4d804314bb5311e18..87a55bbc501e39e60e6c72b663cdb436f7589c37 100644 (file)
--- a/bin/tests/db_test.c
+++ b/bin/tests/db_test.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: db_test.c,v 1.62 2005/04/27 04:56:07 sra Exp $ */
+/* $Id: db_test.c,v 1.63 2007/06/18 23:47:26 tbox Exp $ */
 
 /*! \file 
  * \author

diff --git a/bin/tests/dst/Makefile.in b/bin/tests/dst/Makefile.in
index aa801c40563515e2b6562d769d091b26d532b1e0..f4441db7c2cd7ec474f82c3de4947717c7bd5838 100644 (file)
--- a/bin/tests/dst/Makefile.in
+++ b/bin/tests/dst/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1999-2002  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.42 2006/12/05 23:12:50 marka Exp $
+# $Id: Makefile.in,v 1.43 2007/06/18 23:47:26 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/bin/tests/dst/dst_test.c b/bin/tests/dst/dst_test.c
index 2c5286c2cfcc0c0795cbf55b7de4968a1f0d8155..5ac0fa881b664b46e18861bd17f485902041467d 100644 (file)
--- a/bin/tests/dst/dst_test.c
+++ b/bin/tests/dst/dst_test.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dst_test.c,v 1.41 2005/11/30 23:52:54 marka Exp $ */
+/* $Id: dst_test.c,v 1.42 2007/06/18 23:47:26 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/tests/dst/gsstest.c b/bin/tests/dst/gsstest.c
index f6a3881f02f9e2d1143424d42b67ffe80c61e328..089cc4cf8ababa73dc2281a266d29e0138083185 100755 (executable)
--- a/bin/tests/dst/gsstest.c
+++ b/bin/tests/dst/gsstest.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2006  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: gsstest.c,v 1.4 2006/12/05 00:13:48 marka Exp $ */
+/* $Id: gsstest.c,v 1.5 2007/06/18 23:47:26 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/tests/dst/t_dst.c b/bin/tests/dst/t_dst.c
index 35ba2cace63822bb7b5618a4d4f054c36e973236..63db605d3a2c705b1082c2a969bbd5d631631b49 100644 (file)
--- a/bin/tests/dst/t_dst.c
+++ b/bin/tests/dst/t_dst.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_dst.c,v 1.51 2005/11/30 23:52:54 marka Exp $ */
+/* $Id: t_dst.c,v 1.52 2007/06/18 23:47:26 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/tests/entropy2_test.c b/bin/tests/entropy2_test.c
index 2642861b1cc016f0dc0a1923111bfd450070df05..15a1fcd89b08791814fd51bd78ee5ca61f560a1b 100644 (file)
--- a/bin/tests/entropy2_test.c
+++ b/bin/tests/entropy2_test.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: entropy2_test.c,v 1.14 2005/04/29 00:22:38 marka Exp $ */
+/* $Id: entropy2_test.c,v 1.15 2007/06/18 23:47:26 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/tests/entropy_test.c b/bin/tests/entropy_test.c
index 86c62222b85b21a7fe91871d440cca5998e842de..4e71761235557be6e35fd9561334c4d866236ccd 100644 (file)
--- a/bin/tests/entropy_test.c
+++ b/bin/tests/entropy_test.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: entropy_test.c,v 1.21 2005/04/29 00:22:38 marka Exp $ */
+/* $Id: entropy_test.c,v 1.22 2007/06/18 23:47:26 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/tests/fsaccess_test.c b/bin/tests/fsaccess_test.c
index 643ec150aa598928c8dec872a94a933fe8e820e3..84a641b34d68c7696a20de1f0b6fcb9650a3ff1d 100644 (file)
--- a/bin/tests/fsaccess_test.c
+++ b/bin/tests/fsaccess_test.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: fsaccess_test.c,v 1.11 2005/04/29 00:22:38 marka Exp $ */
+/* $Id: fsaccess_test.c,v 1.12 2007/06/18 23:47:26 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/tests/genrandom.c b/bin/tests/genrandom.c
index 54d381ddef5f53d73e352957416e1fff92abbca9..ad616d3830a2d2f774357669bc3e4f8e28ceba8c 100644 (file)
--- a/bin/tests/genrandom.c
+++ b/bin/tests/genrandom.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: genrandom.c,v 1.13 2005/04/29 00:22:40 marka Exp $ */
+/* $Id: genrandom.c,v 1.14 2007/06/18 23:47:26 tbox Exp $ */
 
 /*! \file */
 #include <config.h>

diff --git a/bin/tests/gxba_test.c b/bin/tests/gxba_test.c
index c936832e3d82a45e7a80ff71f69c14057f86e273..900c4d3f3fd8d8bfa2403ffc987a4892bcfd2a28 100644 (file)
--- a/bin/tests/gxba_test.c
+++ b/bin/tests/gxba_test.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: gxba_test.c,v 1.11 2005/04/29 00:22:40 marka Exp $ */
+/* $Id: gxba_test.c,v 1.12 2007/06/18 23:47:26 tbox Exp $ */
 
 /*! \file */
 #include <config.h>

diff --git a/bin/tests/gxbn_test.c b/bin/tests/gxbn_test.c
index e618d45d5ca10785b5779e159aef5adc181b75ea..2f6875201835878f4d497c9a1d339b8e4f8e2582 100644 (file)
--- a/bin/tests/gxbn_test.c
+++ b/bin/tests/gxbn_test.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: gxbn_test.c,v 1.14 2005/04/29 00:22:41 marka Exp $ */
+/* $Id: gxbn_test.c,v 1.15 2007/06/18 23:47:26 tbox Exp $ */
 
 /*! \file */
 #include <config.h>

diff --git a/bin/tests/hash_test.c b/bin/tests/hash_test.c
index 36dc31456bd605903bcbeb571920034a946d170e..1d8cac7306d50e7eda3e61575d85529a261d55df 100644 (file)
--- a/bin/tests/hash_test.c
+++ b/bin/tests/hash_test.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: hash_test.c,v 1.17 2006/08/16 23:54:35 marka Exp $ */
+/* $Id: hash_test.c,v 1.18 2007/06/18 23:47:26 tbox Exp $ */
 
 /*! \file */
 #include <config.h>

diff --git a/bin/tests/headerdep_test.sh.in b/bin/tests/headerdep_test.sh.in
index 4e1e9ee08398c9da5739bb233d6c46410c00868c..80f9518ec4aea8b5f125f636a1bcd3d6707d00b6 100644 (file)
--- a/bin/tests/headerdep_test.sh.in
+++ b/bin/tests/headerdep_test.sh.in
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: headerdep_test.sh.in,v 1.6 2004/03/05 04:58:37 marka Exp $
+# $Id: headerdep_test.sh.in,v 1.7 2007/06/18 23:47:26 tbox Exp $
 
 #
 # Check the installed bind9 headers to make sure that no header

diff --git a/bin/tests/inter_test.c b/bin/tests/inter_test.c
index 84b0b43249667c269e47d1265cbf6c2a9a63fc6f..62beb7d327c442d6a71c1608ac82ef465e310bbb 100644 (file)
--- a/bin/tests/inter_test.c
+++ b/bin/tests/inter_test.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: inter_test.c,v 1.12 2005/04/29 00:22:41 marka Exp $ */
+/* $Id: inter_test.c,v 1.13 2007/06/18 23:47:26 tbox Exp $ */
 
 /*! \file */
 #include <config.h>

diff --git a/bin/tests/journalprint.c b/bin/tests/journalprint.c
index ee00833ec89d9f179f5079a454948dd25a1ea060..e45470c25f0db3ad2a037ff622e7b12356f627da 100644 (file)
--- a/bin/tests/journalprint.c
+++ b/bin/tests/journalprint.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: journalprint.c,v 1.11 2007/02/27 23:46:48 tbox Exp $ */
+/* $Id: journalprint.c,v 1.12 2007/06/18 23:47:26 tbox Exp $ */
 
 /*! \file */
 #include <config.h>

diff --git a/bin/tests/keyboard_test.c b/bin/tests/keyboard_test.c
index a1f4ab92e6318d0cfb78a349ffabcf3bff0c42d7..451c4a33a79e601d1bc7db3a9f91fd5507517891 100644 (file)
--- a/bin/tests/keyboard_test.c
+++ b/bin/tests/keyboard_test.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: keyboard_test.c,v 1.11 2005/04/29 00:22:41 marka Exp $ */
+/* $Id: keyboard_test.c,v 1.12 2007/06/18 23:47:26 tbox Exp $ */
 
 /*! \file */
 #include <config.h>

diff --git a/bin/tests/lex_test.c b/bin/tests/lex_test.c
index 4bd8e8cae27846a9de8dfc3ef85b203e5bc295bd..8d9b1af3bf7425efa7c8ca93ce3e1cfbde948263 100644 (file)
--- a/bin/tests/lex_test.c
+++ b/bin/tests/lex_test.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lex_test.c,v 1.21 2005/04/29 00:22:41 marka Exp $ */
+/* $Id: lex_test.c,v 1.22 2007/06/18 23:47:26 tbox Exp $ */
 
 /*! \file */
 #include <config.h>

diff --git a/bin/tests/lfsr_test.c b/bin/tests/lfsr_test.c
index 556c8af13ae28c025033b6d1f7247bff3b58a126..ab3f910319a781327c34f434c1c809308702dec1 100644 (file)
--- a/bin/tests/lfsr_test.c
+++ b/bin/tests/lfsr_test.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lfsr_test.c,v 1.14 2005/04/29 00:22:41 marka Exp $ */
+/* $Id: lfsr_test.c,v 1.15 2007/06/18 23:47:26 tbox Exp $ */
 
 /*! \file */
 #include <config.h>

diff --git a/bin/tests/log_test.c b/bin/tests/log_test.c
index 6618295e83d3c835e9058dbb518152c076b210cf..d67f228abef2c41a8cb29f71a1ac43b97048aa8d 100644 (file)
--- a/bin/tests/log_test.c
+++ b/bin/tests/log_test.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: log_test.c,v 1.24 2004/03/05 04:58:38 marka Exp $ */
+/* $Id: log_test.c,v 1.25 2007/06/18 23:47:26 tbox Exp $ */
 
 /* Principal Authors: DCL */
 

diff --git a/bin/tests/lwres_test.c b/bin/tests/lwres_test.c
index 526288af55c39139ecbba6df5beec44e4f4a0a37..00f235e013fc24055a41aff5b9809a4f2e58015b 100644 (file)
--- a/bin/tests/lwres_test.c
+++ b/bin/tests/lwres_test.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwres_test.c,v 1.29 2005/03/17 03:56:11 marka Exp $ */
+/* $Id: lwres_test.c,v 1.30 2007/06/18 23:47:26 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/tests/lwresconf_test.c b/bin/tests/lwresconf_test.c
index 3915295cdec808066578ea739456b13fcf4a9976..e434292f0c6a82014f46082b8a322d3f250a405a 100644 (file)
--- a/bin/tests/lwresconf_test.c
+++ b/bin/tests/lwresconf_test.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwresconf_test.c,v 1.11 2004/03/05 04:58:39 marka Exp $ */
+/* $Id: lwresconf_test.c,v 1.12 2007/06/18 23:47:26 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/tests/master/Makefile.in b/bin/tests/master/Makefile.in
index 0d554501b64338206eda2683a20ff77e5b7d36c3..cf0631132e0c57b68d93ed09e100210328c1790a 100644 (file)
--- a/bin/tests/master/Makefile.in
+++ b/bin/tests/master/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1999-2002  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.26 2004/07/20 07:13:36 marka Exp $
+# $Id: Makefile.in,v 1.27 2007/06/18 23:47:26 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/bin/tests/master/t_master.c b/bin/tests/master/t_master.c
index 289310f07a19db7f05be0c48bd9dc218476d92b2..57827cb43191837b52875b7df07c502babaa9e41 100644 (file)
--- a/bin/tests/master/t_master.c
+++ b/bin/tests/master/t_master.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_master.c,v 1.34 2005/11/30 23:52:54 marka Exp $ */
+/* $Id: t_master.c,v 1.35 2007/06/18 23:47:26 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/tests/master_test.c b/bin/tests/master_test.c
index ae2a17d4a2c02bdbdb6eb66b36b587d528750f41..488cc9e208ad33a55e25359b832b94332a43cd11 100644 (file)
--- a/bin/tests/master_test.c
+++ b/bin/tests/master_test.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: master_test.c,v 1.28 2004/03/05 04:58:39 marka Exp $ */
+/* $Id: master_test.c,v 1.29 2007/06/18 23:47:26 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/tests/mem/Makefile.in b/bin/tests/mem/Makefile.in
index 4b033bd92a2459c99915367f36596180cb54d36d..5173cbc9fdf037825ecd49ee03010a55a923e9b5 100644 (file)
--- a/bin/tests/mem/Makefile.in
+++ b/bin/tests/mem/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2002  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.32 2005/06/22 00:10:30 marka Exp $
+# $Id: Makefile.in,v 1.33 2007/06/18 23:47:26 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/bin/tests/mem/t_mem.c b/bin/tests/mem/t_mem.c
index d6eeb3dd82f8c861c6d121b66960b2443fd454f1..11995f32b402e30ef21f96da3d7d0e35232a2a43 100644 (file)
--- a/bin/tests/mem/t_mem.c
+++ b/bin/tests/mem/t_mem.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_mem.c,v 1.11 2004/03/05 04:58:53 marka Exp $ */
+/* $Id: t_mem.c,v 1.12 2007/06/18 23:47:26 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/tests/mempool_test.c b/bin/tests/mempool_test.c
index e96e13ba9653916941823d3592f4be5ad0871f8b..7427016ad0f72cf2abc158de3fd7d6aa8b16a566 100644 (file)
--- a/bin/tests/mempool_test.c
+++ b/bin/tests/mempool_test.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mempool_test.c,v 1.15 2004/03/05 04:58:39 marka Exp $ */
+/* $Id: mempool_test.c,v 1.16 2007/06/18 23:47:26 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/tests/name_test.c b/bin/tests/name_test.c
index f0b8e3e8dd83c6cd89521bd512cd6f45d9307310..16563d69e80ab8dec26ff992b94107f5510eb4eb 100644 (file)
--- a/bin/tests/name_test.c
+++ b/bin/tests/name_test.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: name_test.c,v 1.39 2005/03/17 03:56:11 marka Exp $ */
+/* $Id: name_test.c,v 1.40 2007/06/18 23:47:26 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/tests/named.conf b/bin/tests/named.conf
index a3f6acada8b3891375aabc9aa5f233656c27833f..3717a96bb7224c00b3f249ee313e9f972751bcdd 100644 (file)
--- a/bin/tests/named.conf
+++ b/bin/tests/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.56 2004/03/05 04:58:39 marka Exp $ */
+/* $Id: named.conf,v 1.57 2007/06/18 23:47:26 tbox Exp $ */
 
 /*
  * This is a worthless, nonrunnable example of a named.conf file that has

diff --git a/bin/tests/names/Makefile.in b/bin/tests/names/Makefile.in
index 022cfc7dc8f57ef99e9811ac7d30ef0df176c751..39f167880dd625261c9773984763e0191b227149 100644 (file)
--- a/bin/tests/names/Makefile.in
+++ b/bin/tests/names/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1999-2002  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.26 2004/07/20 07:13:36 marka Exp $
+# $Id: Makefile.in,v 1.27 2007/06/18 23:47:27 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/bin/tests/names/t_names.c b/bin/tests/names/t_names.c
index 1ae3620fab2e4346d7d8b288c4d2a1896636a691..fd4cb8b35db4d458ba3460fea23a03cf6cbe4857 100644 (file)
--- a/bin/tests/names/t_names.c
+++ b/bin/tests/names/t_names.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_names.c,v 1.41 2006/12/07 23:57:59 marka Exp $ */
+/* $Id: t_names.c,v 1.42 2007/06/18 23:47:27 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/tests/ndc.conf b/bin/tests/ndc.conf
index a4b9a441482e50b6e42f456d4e4246fbbc8796b6..34ad89309b8002fb38695a8b5c666671413f54c6 100644 (file)
--- a/bin/tests/ndc.conf
+++ b/bin/tests/ndc.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ndc.conf,v 1.9 2004/03/05 04:58:39 marka Exp $ */
+/* $Id: ndc.conf,v 1.10 2007/06/18 23:47:26 tbox Exp $ */
 
 options {
        default-server  "velo.jab.fr" ;

diff --git a/bin/tests/ndc.conf-include b/bin/tests/ndc.conf-include
index 9b300ed48b6bef25f6c86b15134714c4a0c1e598..71c4531b8dbbd62d6636fc617ba09ebdefe3b419 100644 (file)
--- a/bin/tests/ndc.conf-include
+++ b/bin/tests/ndc.conf-include
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ndc.conf-include,v 1.4 2004/03/05 04:58:39 marka Exp $ */
+/* $Id: ndc.conf-include,v 1.5 2007/06/18 23:47:26 tbox Exp $ */
 
 key "another-key" {
         algorithm "al-gore-rhythm";

diff --git a/bin/tests/net/Makefile.in b/bin/tests/net/Makefile.in
index 15eb7d5673f0a4265b34b81096f0b2c93d5b131d..7ae672551de78ee28a8c2251842e6d5f1504392c 100644 (file)
--- a/bin/tests/net/Makefile.in
+++ b/bin/tests/net/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2002  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.14 2004/07/20 07:13:37 marka Exp $
+# $Id: Makefile.in,v 1.15 2007/06/18 23:47:27 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/bin/tests/net/driver.c b/bin/tests/net/driver.c
index 3c381cd8e4edfb5f0cbed63de606d581bd52cf06..9f941746d1bbbab0c48e9e2d9de483f105345223 100644 (file)
--- a/bin/tests/net/driver.c
+++ b/bin/tests/net/driver.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: driver.c,v 1.9 2004/03/05 04:58:59 marka Exp $ */
+/* $Id: driver.c,v 1.10 2007/06/18 23:47:27 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/tests/net/driver.h b/bin/tests/net/driver.h
index 48ef305fd655a3dc89abde4e71584799b6c0000d..e6376a4f495d42b29aed1f9ba531a7466c00d670 100644 (file)
--- a/bin/tests/net/driver.h
+++ b/bin/tests/net/driver.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: driver.h,v 1.6 2004/03/05 04:59:00 marka Exp $ */
+/* $Id: driver.h,v 1.7 2007/06/18 23:47:27 tbox Exp $ */
 
 /*
  * PASSED and FAILED mean the particular test passed or failed.

diff --git a/bin/tests/net/netaddr_multicast.c b/bin/tests/net/netaddr_multicast.c
index 59fd249be7210becd255020ab02462b2e5293dcc..d5d0f8202542a49c0f9fd2e898154a35d5046c82 100644 (file)
--- a/bin/tests/net/netaddr_multicast.c
+++ b/bin/tests/net/netaddr_multicast.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: netaddr_multicast.c,v 1.10 2004/03/05 04:59:00 marka Exp $ */
+/* $Id: netaddr_multicast.c,v 1.11 2007/06/18 23:47:27 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/tests/net/sockaddr_multicast.c b/bin/tests/net/sockaddr_multicast.c
index 1eecd6eda6ddaca802686dd43f07c92410322b60..994b7ac3709b1025ae4d71225351bdbb6a4d8477 100644 (file)
--- a/bin/tests/net/sockaddr_multicast.c
+++ b/bin/tests/net/sockaddr_multicast.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sockaddr_multicast.c,v 1.6 2004/03/05 04:59:00 marka Exp $ */
+/* $Id: sockaddr_multicast.c,v 1.7 2007/06/18 23:47:27 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/tests/net/testsuite.h b/bin/tests/net/testsuite.h
index 69a9bc4356659d8db3ceae7d266caee535eaa74e..bf153cb87b1c11136bdf574b350dc1cb1dd547fa 100644 (file)
--- a/bin/tests/net/testsuite.h
+++ b/bin/tests/net/testsuite.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: testsuite.h,v 1.5 2004/03/05 04:59:00 marka Exp $ */
+/* $Id: testsuite.h,v 1.6 2007/06/18 23:47:27 tbox Exp $ */
 
 #define SUITENAME "net"
 

diff --git a/bin/tests/nsecify.c b/bin/tests/nsecify.c
index ae4bd1cee537fa567a7395d13dafb2c1eb0ee528..0d9461bc6e29f702378651b8fd672eb9d09e1659 100644 (file)
--- a/bin/tests/nsecify.c
+++ b/bin/tests/nsecify.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsecify.c,v 1.4 2004/08/28 06:16:52 marka Exp $ */
+/* $Id: nsecify.c,v 1.5 2007/06/18 23:47:26 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/tests/printmsg.c b/bin/tests/printmsg.c
index 719ef96a0f84e5b9c4df6a64bb4d10ee1237dc4a..37635c1a811593eb1d2041bff5609a9c0ed544ee 100644 (file)
--- a/bin/tests/printmsg.c
+++ b/bin/tests/printmsg.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: printmsg.c,v 1.27 2004/03/05 04:58:39 marka Exp $ */
+/* $Id: printmsg.c,v 1.28 2007/06/18 23:47:26 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/tests/printmsg.h b/bin/tests/printmsg.h
index 8441af4fa859e4c12e888b06b94cfaabd70ad2f9..14d88688d30b90e65bb26f86d8376cd081afee1b 100644 (file)
--- a/bin/tests/printmsg.h
+++ b/bin/tests/printmsg.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: printmsg.h,v 1.10 2004/03/05 04:58:39 marka Exp $ */
+/* $Id: printmsg.h,v 1.11 2007/06/18 23:47:26 tbox Exp $ */
 
 #ifndef TEST_PRINTMSG_H
 #define TEST_PRINTMSG_H

diff --git a/bin/tests/ratelimiter_test.c b/bin/tests/ratelimiter_test.c
index 37ececf44881409fd19e508d7ca89b7cd266d72a..fd1e528e81b244b9554a69782af1a34eeb824f07 100644 (file)
--- a/bin/tests/ratelimiter_test.c
+++ b/bin/tests/ratelimiter_test.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ratelimiter_test.c,v 1.16 2004/03/05 04:58:39 marka Exp $ */
+/* $Id: ratelimiter_test.c,v 1.17 2007/06/18 23:47:26 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/tests/rbt/Makefile.in b/bin/tests/rbt/Makefile.in
index c97fee6cdc87d233b955f557e7bc19bb658c911a..834670f0f5b658d8773b5ece39ce7cec884291d2 100644 (file)
--- a/bin/tests/rbt/Makefile.in
+++ b/bin/tests/rbt/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1999-2002  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.26 2004/07/20 07:13:37 marka Exp $
+# $Id: Makefile.in,v 1.27 2007/06/18 23:47:27 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/bin/tests/rbt/t_rbt.c b/bin/tests/rbt/t_rbt.c
index 636a9cf5c9c4802e00216117901ac79ade2fcbdd..a0ad18cfa0ca731942095bb4b126d57f3716e8b6 100644 (file)
--- a/bin/tests/rbt/t_rbt.c
+++ b/bin/tests/rbt/t_rbt.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_rbt.c,v 1.28 2005/11/30 23:52:54 marka Exp $ */
+/* $Id: t_rbt.c,v 1.29 2007/06/18 23:47:27 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/tests/rbt_test.c b/bin/tests/rbt_test.c
index e6b9b4c1edb04393017d572d05c13145127c05ac..d59d0b481a2aa64db45fc953567ad5ddd74a3cca 100644 (file)
--- a/bin/tests/rbt_test.c
+++ b/bin/tests/rbt_test.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rbt_test.c,v 1.46 2005/03/17 03:56:11 marka Exp $ */
+/* $Id: rbt_test.c,v 1.47 2007/06/18 23:47:26 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/tests/rbt_test.txt b/bin/tests/rbt_test.txt
index 0cdd0013f6f9007d83929d4e067b51b92605f301..01e5d4056c5dcb1faed2a893cec3e82c5be11ccc 100644 (file)
--- a/bin/tests/rbt_test.txt
+++ b/bin/tests/rbt_test.txt
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1999-2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: rbt_test.txt,v 1.15 2004/03/16 05:52:14 marka Exp $\r
+# $Id: rbt_test.txt,v 1.16 2007/06/18 23:47:26 tbox Exp $\r
 \r
 add a.vix.com\r
 add b.vix.com\r

diff --git a/bin/tests/rdata_test.c b/bin/tests/rdata_test.c
index 6b338db1ce4249c7698ac8bdd3c941ac1a4e35e2..47b34ee26dc1f9e33d66bac80c34e98ba821513f 100644 (file)
--- a/bin/tests/rdata_test.c
+++ b/bin/tests/rdata_test.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdata_test.c,v 1.46 2006/02/26 23:49:50 marka Exp $ */
+/* $Id: rdata_test.c,v 1.47 2007/06/18 23:47:26 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/tests/resolv.conf.sample b/bin/tests/resolv.conf.sample
index 3a92681a2bffac6b91fbcb72126be252905d806d..43999b0e757ca5acb17d52d5a519fe156a824827 100644 (file)
--- a/bin/tests/resolv.conf.sample
+++ b/bin/tests/resolv.conf.sample
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: resolv.conf.sample,v 1.9 2004/03/05 04:58:39 marka Exp $
+# $Id: resolv.conf.sample,v 1.10 2007/06/18 23:47:26 tbox Exp $
 
 domain  jab.fr
 nameserver 194.150.1.2     ; ignore that

diff --git a/bin/tests/rwlock_test.c b/bin/tests/rwlock_test.c
index 34db7ed981028ab385926d2199dfc30172852d35..94771467af472388d29f11f9a1a36e702d870ac5 100644 (file)
--- a/bin/tests/rwlock_test.c
+++ b/bin/tests/rwlock_test.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rwlock_test.c,v 1.24 2005/03/17 03:56:11 marka Exp $ */
+/* $Id: rwlock_test.c,v 1.25 2007/06/18 23:47:26 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/tests/serial_test.c b/bin/tests/serial_test.c
index f919a8521c7596b3577f016c02b846d8cec4c558..40e9ad4d080d46f411b41d54432908ce7bde2f1e 100644 (file)
--- a/bin/tests/serial_test.c
+++ b/bin/tests/serial_test.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: serial_test.c,v 1.13 2004/03/05 04:58:39 marka Exp $ */
+/* $Id: serial_test.c,v 1.14 2007/06/18 23:47:26 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/tests/shutdown_test.c b/bin/tests/shutdown_test.c
index a2b478652be0c9ca3097a1fa3c769cfc920dd74a..e79ee616d163ea7194df0598da0b431cb6ae7d0c 100644 (file)
--- a/bin/tests/shutdown_test.c
+++ b/bin/tests/shutdown_test.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: shutdown_test.c,v 1.21 2004/08/28 06:16:53 marka Exp $ */
+/* $Id: shutdown_test.c,v 1.22 2007/06/18 23:47:26 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/tests/sig0_test.c b/bin/tests/sig0_test.c
index 3f15b5134a38706fec56637a6459b724ba788773..9a8f0f93529c9df8191fab8717df5fe2ec1265f9 100644 (file)
--- a/bin/tests/sig0_test.c
+++ b/bin/tests/sig0_test.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sig0_test.c,v 1.13 2005/03/17 03:56:11 marka Exp $ */
+/* $Id: sig0_test.c,v 1.14 2007/06/18 23:47:26 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/tests/sock_test.c b/bin/tests/sock_test.c
index 058b4971b1c34cfebd55745cdd9eda1a420a0725..733e5f4d9bfa128b5152a826dfa658b0ca724bd3 100644 (file)
--- a/bin/tests/sock_test.c
+++ b/bin/tests/sock_test.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sock_test.c,v 1.50 2004/08/28 06:16:54 marka Exp $ */
+/* $Id: sock_test.c,v 1.51 2007/06/18 23:47:26 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/tests/sockaddr/Makefile.in b/bin/tests/sockaddr/Makefile.in
index 79183afe51fd7c7e8e52b491fa0f06cf22013640..8ea555c589ccb9bb4dd4d85438c928382dda2356 100644 (file)
--- a/bin/tests/sockaddr/Makefile.in
+++ b/bin/tests/sockaddr/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1999-2002  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.19 2004/07/20 07:13:37 marka Exp $
+# $Id: Makefile.in,v 1.20 2007/06/18 23:47:27 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/bin/tests/sockaddr/t_sockaddr.c b/bin/tests/sockaddr/t_sockaddr.c
index f57bc7e5a8c8609bb287b70423c31aaef992a05a..d934840b71082586475d5679835da8b894c6ae57 100644 (file)
--- a/bin/tests/sockaddr/t_sockaddr.c
+++ b/bin/tests/sockaddr/t_sockaddr.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_sockaddr.c,v 1.12 2004/03/05 04:59:08 marka Exp $ */
+/* $Id: t_sockaddr.c,v 1.13 2007/06/18 23:47:27 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/tests/sym_test.c b/bin/tests/sym_test.c
index faf5495a5da50a2f39d4ea96496f31b647f49e94..8649224fd58ca30c818e71b7f7f2f575c29a46d5 100644 (file)
--- a/bin/tests/sym_test.c
+++ b/bin/tests/sym_test.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sym_test.c,v 1.26 2005/03/17 03:56:11 marka Exp $ */
+/* $Id: sym_test.c,v 1.27 2007/06/18 23:47:26 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in
index 96945199fe6084ebf40af18229233f010b217181..f72ade9f34e7d26dfa4f434ffc568efa4641c3fe 100644 (file)
--- a/bin/tests/system/Makefile.in
+++ b/bin/tests/system/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.27 2004/03/05 04:59:11 marka Exp $
+# $Id: Makefile.in,v 1.28 2007/06/18 23:47:27 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/bin/tests/system/cacheclean/clean.sh b/bin/tests/system/cacheclean/clean.sh
index e05c512dcf88004bdca58375ce54a41ed2fa6925..6c3c31f8653c906ae622d0b596205b1ea1a6c06f 100644 (file)
--- a/bin/tests/system/cacheclean/clean.sh
+++ b/bin/tests/system/cacheclean/clean.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.3 2004/03/05 04:59:16 marka Exp $
+# $Id: clean.sh,v 1.4 2007/06/18 23:47:27 tbox Exp $
 
 #
 # Clean up after cache cleaner tests.

diff --git a/bin/tests/system/cacheclean/ns1/example.db b/bin/tests/system/cacheclean/ns1/example.db
index a83dadcc2e1e87e69db98d724d3e4d25d5de02c4..28a6154f8361e3670fa1ad41aa6bd36b2419b0bd 100644 (file)
--- a/bin/tests/system/cacheclean/ns1/example.db
+++ b/bin/tests/system/cacheclean/ns1/example.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: example.db,v 1.3 2004/03/05 04:59:19 marka Exp $
+; $Id: example.db,v 1.4 2007/06/18 23:47:27 tbox Exp $
 
 $TTL 999999
 $ORIGIN .

diff --git a/bin/tests/system/cacheclean/ns1/named.conf b/bin/tests/system/cacheclean/ns1/named.conf
index 2f13e14e0ee63018804d6a3c8f3c5174685d2248..aa8facee9f72388fcc5719d8cd1864b2925cebfb 100644 (file)
--- a/bin/tests/system/cacheclean/ns1/named.conf
+++ b/bin/tests/system/cacheclean/ns1/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.7 2005/08/24 23:53:58 marka Exp $ */
+/* $Id: named.conf,v 1.8 2007/06/18 23:47:27 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/cacheclean/ns2/named.conf b/bin/tests/system/cacheclean/ns2/named.conf
index 12f54cb3b0f2677f40a53b904f4b827aa4900f7d..89b98dd744a7a83a35d90cd61151401cd018f553 100644 (file)
--- a/bin/tests/system/cacheclean/ns2/named.conf
+++ b/bin/tests/system/cacheclean/ns2/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.6 2005/09/06 03:51:34 marka Exp $ */
+/* $Id: named.conf,v 1.7 2007/06/18 23:47:27 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/cacheclean/tests.sh b/bin/tests/system/cacheclean/tests.sh
index eabd473278ca4a65e3718230b9568fa54f88658f..94714cd49b1a9da1c51188fc9b13fdb7e0fdc2a8 100644 (file)
--- a/bin/tests/system/cacheclean/tests.sh
+++ b/bin/tests/system/cacheclean/tests.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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,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.3 2004/03/05 04:59:16 marka Exp $
+# $Id: tests.sh,v 1.4 2007/06/18 23:47:27 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/checkconf/bad.conf b/bin/tests/system/checkconf/bad.conf
index c3592e84a7b1831f3e8a9e3ec0f8470a797ea7b1..684147095dfcf1d86fb77b87396b9302aff42549 100644 (file)
--- a/bin/tests/system/checkconf/bad.conf
+++ b/bin/tests/system/checkconf/bad.conf
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2005  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: bad.conf,v 1.2 2005/06/23 06:52:23 marka Exp $ */
+/* $Id: bad.conf,v 1.3 2007/06/18 23:47:27 tbox Exp $ */
 
 options {
        avoid-v4-udp-ports { 100; }

diff --git a/bin/tests/system/checkconf/good.conf b/bin/tests/system/checkconf/good.conf
index aeb30bc4db8e6adce96556107ca9351519fb90e6..369612fc5f2db05251895ab1d5bb5b4360750889 100644 (file)
--- a/bin/tests/system/checkconf/good.conf
+++ b/bin/tests/system/checkconf/good.conf
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2005  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: good.conf,v 1.2 2005/06/23 06:52:23 marka Exp $ */
+/* $Id: good.conf,v 1.3 2007/06/18 23:47:27 tbox Exp $ */
 
 /*
  * This is just a random selection of configuration options.

diff --git a/bin/tests/system/checkconf/tests.sh b/bin/tests/system/checkconf/tests.sh
index b5ebe0891c45673485b6ad8d13e886ba292dd215..c1b09fa576c4dc1ac5478cb013ff4e9dffbfd757 100644 (file)
--- a/bin/tests/system/checkconf/tests.sh
+++ b/bin/tests/system/checkconf/tests.sh
@@ -1,6 +1,6 @@
 # Copyright (C) 2005  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.
 #
@@ -12,7 +12,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: tests.sh,v 1.1 2005/06/23 06:52:23 marka Exp $
+# $Id: tests.sh,v 1.2 2007/06/18 23:47:27 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/checknames/clean.sh b/bin/tests/system/checknames/clean.sh
index e50636b6b8f5c521f480ae13e7c30141aff46ddc..15756b82d17f01d320c26fd0fd1000be5f05f11a 100644 (file)
--- a/bin/tests/system/checknames/clean.sh
+++ b/bin/tests/system/checknames/clean.sh
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2004  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: clean.sh,v 1.3 2004/03/05 04:59:26 marka Exp $
+# $Id: clean.sh,v 1.4 2007/06/18 23:47:27 tbox Exp $
 
 rm -f dig.out.ns?.test*
 rm -f nsupdate.out.test*

diff --git a/bin/tests/system/checknames/ns1/fail.example.db.in b/bin/tests/system/checknames/ns1/fail.example.db.in
index 9df458a0522473665f6972cceb3ac68e9a7b0497..db65c8571f99cb52e1bd3ed2f4e8a33eda0b356d 100644 (file)
--- a/bin/tests/system/checknames/ns1/fail.example.db.in
+++ b/bin/tests/system/checknames/ns1/fail.example.db.in
@@ -1,6 +1,6 @@
 ; Copyright (C) 2004  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.
 ;
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: fail.example.db.in,v 1.3 2004/03/05 04:59:37 marka Exp $
+; $Id: fail.example.db.in,v 1.4 2007/06/18 23:47:27 tbox Exp $
 
 $TTL 300
 @      SOA ns1.fail.example. hostmaster.fail.example. (

diff --git a/bin/tests/system/checknames/ns1/fail.update.db.in b/bin/tests/system/checknames/ns1/fail.update.db.in
index 300ff754357461427613e09707c0e13ea1badd78..cf2c704b68d2a9b5d14df49d7e23f13e5e4b205c 100644 (file)
--- a/bin/tests/system/checknames/ns1/fail.update.db.in
+++ b/bin/tests/system/checknames/ns1/fail.update.db.in
@@ -1,6 +1,6 @@
 ; Copyright (C) 2004  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.
 ;
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: fail.update.db.in,v 1.3 2004/03/05 04:59:37 marka Exp $
+; $Id: fail.update.db.in,v 1.4 2007/06/18 23:47:27 tbox Exp $
 
 $TTL 300
 @      SOA ns1.fail.update. hostmaster.fail.update. (

diff --git a/bin/tests/system/checknames/ns1/ignore.example.db.in b/bin/tests/system/checknames/ns1/ignore.example.db.in
index 20383572f5987027343f7d36e78d5144bd6fb757..5ea52a2de3cc28373f5db2b8edf8a5d61008b687 100644 (file)
--- a/bin/tests/system/checknames/ns1/ignore.example.db.in
+++ b/bin/tests/system/checknames/ns1/ignore.example.db.in
@@ -1,6 +1,6 @@
 ; Copyright (C) 2004  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.
 ;
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: ignore.example.db.in,v 1.3 2004/03/05 04:59:37 marka Exp $
+; $Id: ignore.example.db.in,v 1.4 2007/06/18 23:47:27 tbox Exp $
 
 $TTL 300
 @      SOA ns1.ignore.example. hostmaster.ignore.example. (

diff --git a/bin/tests/system/checknames/ns1/ignore.update.db.in b/bin/tests/system/checknames/ns1/ignore.update.db.in
index 697dc7ee10fee2ee801c8a71443a2ebce892ecd0..9a173909d70a1df0a8d86b0599a0244749523bf4 100644 (file)
--- a/bin/tests/system/checknames/ns1/ignore.update.db.in
+++ b/bin/tests/system/checknames/ns1/ignore.update.db.in
@@ -1,6 +1,6 @@
 ; Copyright (C) 2004  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.
 ;
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: ignore.update.db.in,v 1.3 2004/03/05 04:59:38 marka Exp $
+; $Id: ignore.update.db.in,v 1.4 2007/06/18 23:47:27 tbox Exp $
 
 $TTL 300
 @      SOA ns1.ignore.update. hostmaster.ignore.update. (

diff --git a/bin/tests/system/checknames/ns1/named.conf b/bin/tests/system/checknames/ns1/named.conf
index 5ae14cd5150104d923d8bd449c31ff1fc8adefbe..d75d8a8ac72ca45b435c649b8587411be83c0986 100644 (file)
--- a/bin/tests/system/checknames/ns1/named.conf
+++ b/bin/tests/system/checknames/ns1/named.conf
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2004, 2005  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.7 2005/08/24 23:53:58 marka Exp $ */
+/* $Id: named.conf,v 1.8 2007/06/18 23:47:27 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/checknames/ns1/root.db b/bin/tests/system/checknames/ns1/root.db
index e75064e9ed23b071659f705f52978df378dfabe7..d2644546eff98f2bb76dee9d8c69449e9b818c99 100644 (file)
--- a/bin/tests/system/checknames/ns1/root.db
+++ b/bin/tests/system/checknames/ns1/root.db
@@ -1,6 +1,6 @@
 ; Copyright (C) 2004  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.
 ;
@@ -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,v 1.3 2004/03/05 04:59:38 marka Exp $
+; $Id: root.db,v 1.4 2007/06/18 23:47:27 tbox Exp $
 
 $TTL 300
 @      SOA ns1. hostmaster.warn.example. (

diff --git a/bin/tests/system/checknames/ns1/warn.example.db.in b/bin/tests/system/checknames/ns1/warn.example.db.in
index 8e127380cc81f99a6bfe3e9b2887a9b9bf120180..e60d17bb887e31b6e16590940148617a6fd2e6e2 100644 (file)
--- a/bin/tests/system/checknames/ns1/warn.example.db.in
+++ b/bin/tests/system/checknames/ns1/warn.example.db.in
@@ -1,6 +1,6 @@
 ; Copyright (C) 2004  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.
 ;
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: warn.example.db.in,v 1.3 2004/03/05 04:59:38 marka Exp $
+; $Id: warn.example.db.in,v 1.4 2007/06/18 23:47:27 tbox Exp $
 
 $TTL 300
 @      SOA ns1.warn.example. hostmaster.warn.example. (

diff --git a/bin/tests/system/checknames/ns1/warn.update.db.in b/bin/tests/system/checknames/ns1/warn.update.db.in
index e1028a324d85602c48b7ba68b43616a77abf3c43..a796c7b140bfa0b9d6afd2ed7344a738e140f8bf 100644 (file)
--- a/bin/tests/system/checknames/ns1/warn.update.db.in
+++ b/bin/tests/system/checknames/ns1/warn.update.db.in
@@ -1,6 +1,6 @@
 ; Copyright (C) 2004  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.
 ;
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: warn.update.db.in,v 1.3 2004/03/05 04:59:38 marka Exp $
+; $Id: warn.update.db.in,v 1.4 2007/06/18 23:47:27 tbox Exp $
 
 $TTL 300
 @      SOA ns1.warn.update. hostmaster.warn.update. (

diff --git a/bin/tests/system/checknames/ns2/named.conf b/bin/tests/system/checknames/ns2/named.conf
index 32afd4480e05eeeaf00743cd6e5ddbf4e79bace9..fd22e7dffa4bbd804fc305ba0495dc817c6e82d0 100644 (file)
--- a/bin/tests/system/checknames/ns2/named.conf
+++ b/bin/tests/system/checknames/ns2/named.conf
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2004, 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.
  *
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.6 2007/04/26 23:46:51 tbox Exp $ */
+/* $Id: named.conf,v 1.7 2007/06/18 23:47:27 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/checknames/ns2/root.hints b/bin/tests/system/checknames/ns2/root.hints
index 7d5845326f934832449decbc0f31b694a6edcd5a..0f7a973b852b8698a5ea2f8cb375b0a448671584 100644 (file)
--- a/bin/tests/system/checknames/ns2/root.hints
+++ b/bin/tests/system/checknames/ns2/root.hints
@@ -1,6 +1,6 @@
 ; Copyright (C) 2004  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.
 ;
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: root.hints,v 1.3 2004/03/05 04:59:41 marka Exp $
+; $Id: root.hints,v 1.4 2007/06/18 23:47:27 tbox Exp $
 
 $TTL 300
 . NS  ns1.

diff --git a/bin/tests/system/checknames/ns3/named.conf b/bin/tests/system/checknames/ns3/named.conf
index ce4650ab37e95d987771aee2b81982eb8d4a3161..2702b5c6fe5b6c4143a1b36cfecb54a5e953f52a 100644 (file)
--- a/bin/tests/system/checknames/ns3/named.conf
+++ b/bin/tests/system/checknames/ns3/named.conf
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2004, 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.
  *
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.6 2007/04/26 23:46:51 tbox Exp $ */
+/* $Id: named.conf,v 1.7 2007/06/18 23:47:27 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/checknames/ns3/root.hints b/bin/tests/system/checknames/ns3/root.hints
index b3cf3f7126755ca6c97655bf8c98e89a42452ec0..0f7a973b852b8698a5ea2f8cb375b0a448671584 100644 (file)
--- a/bin/tests/system/checknames/ns3/root.hints
+++ b/bin/tests/system/checknames/ns3/root.hints
@@ -1,6 +1,6 @@
 ; Copyright (C) 2004  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.
 ;
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: root.hints,v 1.3 2004/03/05 04:59:45 marka Exp $
+; $Id: root.hints,v 1.4 2007/06/18 23:47:27 tbox Exp $
 
 $TTL 300
 . NS  ns1.

diff --git a/bin/tests/system/checknames/setup.sh b/bin/tests/system/checknames/setup.sh
index 9c7c1c778f14445639abe7aa1b30fce0412e6d10..7bff3423c16f68f5f70089f3bd042b5ab00775cc 100644 (file)
--- a/bin/tests/system/checknames/setup.sh
+++ b/bin/tests/system/checknames/setup.sh
@@ -1,6 +1,6 @@
 # Copyright (C) 2004  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.
 #
@@ -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.3 2004/03/05 04:59:26 marka Exp $
+# $Id: setup.sh,v 1.4 2007/06/18 23:47:27 tbox Exp $
 
 cp ns1/ignore.example.db.in ns1/ignore.example.db
 cp ns1/warn.example.db.in ns1/warn.example.db

diff --git a/bin/tests/system/checknames/tests.sh b/bin/tests/system/checknames/tests.sh
index 3884a265169c3291d56db82bcda548e9a9127353..9bda8b073538e024c5d1419a9db51476ba713b37 100644 (file)
--- a/bin/tests/system/checknames/tests.sh
+++ b/bin/tests/system/checknames/tests.sh
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2004  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.3 2004/03/05 04:59:26 marka Exp $
+# $Id: tests.sh,v 1.4 2007/06/18 23:47:27 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/cleanall.sh b/bin/tests/system/cleanall.sh
index 6e0a97f7993b47704b60042e1e657299a102783b..737775ae5ad858edb5da3de60e1149df1be22b4a 100644 (file)
--- a/bin/tests/system/cleanall.sh
+++ b/bin/tests/system/cleanall.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: cleanall.sh,v 1.9 2004/03/05 04:59:12 marka Exp $
+# $Id: cleanall.sh,v 1.10 2007/06/18 23:47:27 tbox Exp $
 
 #
 # Clean up after system tests.

diff --git a/bin/tests/system/common/controls.conf b/bin/tests/system/common/controls.conf
index c14dd19761b61c5dc0d6a64d85e001f7b6da2060..511b0762f6a65614f995968a923b53432fdc5c26 100644 (file)
--- a/bin/tests/system/common/controls.conf
+++ b/bin/tests/system/common/controls.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: controls.conf,v 1.4 2004/03/05 04:59:48 marka Exp $ */
+/* $Id: controls.conf,v 1.5 2007/06/18 23:47:27 tbox Exp $ */
 
 key rndc_key {
         secret "1234abcd8765";

diff --git a/bin/tests/system/common/rndc.conf b/bin/tests/system/common/rndc.conf
index 7bc55be6b58df46a194ea07499f467229c208609..73ccdab466ec6c1d2ed0ab9c061fcd25736ca3ee 100644 (file)
--- a/bin/tests/system/common/rndc.conf
+++ b/bin/tests/system/common/rndc.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rndc.conf,v 1.3 2004/03/05 04:59:48 marka Exp $ */
+/* $Id: rndc.conf,v 1.4 2007/06/18 23:47:27 tbox Exp $ */
 
 options {
         default-key     "rndc_key";

diff --git a/bin/tests/system/common/root.hint b/bin/tests/system/common/root.hint
index d3cdb4ce5477f00f3c052440230a64be862eaa48..8b44c7da2eab822cf274d6a17ef33d16b7df8a9e 100644 (file)
--- a/bin/tests/system/common/root.hint
+++ b/bin/tests/system/common/root.hint
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: root.hint,v 1.3 2004/03/05 04:59:48 marka Exp $
+; $Id: root.hint,v 1.4 2007/06/18 23:47:27 tbox Exp $
 
 $TTL 999999
 .                       IN NS  a.root-servers.nil.

diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index 04d0bf4bde6c3dd6f2cf407d6fecd3c2a50a8e0f..2c3ee9ce04e73d77a3ffb123cc2fd461312bb7d3 100644 (file)
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -3,7 +3,7 @@
 # Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2003  Internet Software Consortium.
 #
-# 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,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.35 2006/03/05 23:58:52 marka Exp $
+# $Id: conf.sh.in,v 1.36 2007/06/18 23:47:27 tbox Exp $
 
 #
 # Common configuration data for system tests, to be sourced into

diff --git a/bin/tests/system/dialup/ns1/example.db b/bin/tests/system/dialup/ns1/example.db
index 9f489d38f3a542d21886078e917fffb198ccfdf1..4f66aa6d22c4415595ad9236a68a654fa15fe380 100644 (file)
--- a/bin/tests/system/dialup/ns1/example.db
+++ b/bin/tests/system/dialup/ns1/example.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: example.db,v 1.4 2004/03/05 04:59:57 marka Exp $
+; $Id: example.db,v 1.5 2007/06/18 23:47:27 tbox Exp $
 
 @      3600    SOA     hostmaster.ns1 ns1 (
                        1 3600 1200 3600000 1200 )

diff --git a/bin/tests/system/dialup/ns1/named.conf b/bin/tests/system/dialup/ns1/named.conf
index 1ea41129b818712d7900dc9dff33e90e12c4c74f..95f5226d1a8956636e495e7c7ff442574f945b02 100644 (file)
--- a/bin/tests/system/dialup/ns1/named.conf
+++ b/bin/tests/system/dialup/ns1/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.6 2004/03/05 04:59:58 marka Exp $ */
+/* $Id: named.conf,v 1.7 2007/06/18 23:47:27 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/dialup/ns1/root.db b/bin/tests/system/dialup/ns1/root.db
index afa394a92bd6680cf751b4b58aadb8fc00df6a5e..fd74b46ed88db100186ca90bd06d2a99ba352716 100644 (file)
--- a/bin/tests/system/dialup/ns1/root.db
+++ b/bin/tests/system/dialup/ns1/root.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: root.db,v 1.4 2004/03/05 04:59:58 marka Exp $
+; $Id: root.db,v 1.5 2007/06/18 23:47:27 tbox Exp $
 
 @      3600    SOA     hostmaster.ns1.example ns1.example (
                        1 3600 1200 3600000 1200 )

diff --git a/bin/tests/system/dialup/ns2/hint.db b/bin/tests/system/dialup/ns2/hint.db
index d1ae590e5b11977e222f4b1d483a353346782d83..eb9d004e5e040c0cd7545c7afbe7e89feab41db6 100644 (file)
--- a/bin/tests/system/dialup/ns2/hint.db
+++ b/bin/tests/system/dialup/ns2/hint.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: hint.db,v 1.4 2004/03/05 05:00:01 marka Exp $
+; $Id: hint.db,v 1.5 2007/06/18 23:47:27 tbox Exp $
 
 .      1200    NS      ns1.example
 ns1.example    A       10.53.0.1

diff --git a/bin/tests/system/dialup/ns2/named.conf b/bin/tests/system/dialup/ns2/named.conf
index b1dacd006f10da36e079c675dc57ae18f3c7cfc0..5ba9a425817e4f9cbd63a8361dd4794ac5560795 100644 (file)
--- a/bin/tests/system/dialup/ns2/named.conf
+++ b/bin/tests/system/dialup/ns2/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.6 2004/03/05 05:00:01 marka Exp $ */
+/* $Id: named.conf,v 1.7 2007/06/18 23:47:27 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/dialup/ns3/hint.db b/bin/tests/system/dialup/ns3/hint.db
index a6c9a7a0084799becbcb9049f649af7627ff189b..eb9d004e5e040c0cd7545c7afbe7e89feab41db6 100644 (file)
--- a/bin/tests/system/dialup/ns3/hint.db
+++ b/bin/tests/system/dialup/ns3/hint.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: hint.db,v 1.4 2004/03/05 05:00:04 marka Exp $
+; $Id: hint.db,v 1.5 2007/06/18 23:47:27 tbox Exp $
 
 .      1200    NS      ns1.example
 ns1.example    A       10.53.0.1

diff --git a/bin/tests/system/dialup/ns3/named.conf b/bin/tests/system/dialup/ns3/named.conf
index 5ee2b6803b109b778c354df8c84401d791dd3853..e506ec6204df37268f80b5916bc7684a3b4a60d1 100644 (file)
--- a/bin/tests/system/dialup/ns3/named.conf
+++ b/bin/tests/system/dialup/ns3/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.6 2004/03/05 05:00:04 marka Exp $ */
+/* $Id: named.conf,v 1.7 2007/06/18 23:47:27 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/dialup/setup.sh b/bin/tests/system/dialup/setup.sh
index 4529f58b64309f19a9833104b094fb0b43c78193..b2b2a61f77b1c2c91ee3b0ede5cd207fabcc5f34 100644 (file)
--- a/bin/tests/system/dialup/setup.sh
+++ b/bin/tests/system/dialup/setup.sh
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: setup.sh,v 1.4 2004/03/05 04:59:51 marka Exp $
+# $Id: setup.sh,v 1.5 2007/06/18 23:47:27 tbox Exp $
 
 rm -f ns2/example.bk
 rm -f ns3/example.bk

diff --git a/bin/tests/system/dialup/tests.sh b/bin/tests/system/dialup/tests.sh
index 64f2dc6f325e6a62a3f2820b9b425d72914a85aa..2463a6e321cdd4f579ae718861e31ebf419905f8 100644 (file)
--- a/bin/tests/system/dialup/tests.sh
+++ b/bin/tests/system/dialup/tests.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,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.4 2004/03/05 04:59:51 marka Exp $
+# $Id: tests.sh,v 1.5 2007/06/18 23:47:27 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/digcomp.pl b/bin/tests/system/digcomp.pl
index 1873d02f312e361d3b7d92d27c98132df837fdc8..7559e639bae02fc11216a32613b3a58b6b019021 100644 (file)
--- a/bin/tests/system/digcomp.pl
+++ b/bin/tests/system/digcomp.pl
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: digcomp.pl,v 1.12 2004/03/05 04:59:12 marka Exp $
+# $Id: digcomp.pl,v 1.13 2007/06/18 23:47:27 tbox Exp $
 
 # Compare two files, each with the output from dig, for differences.
 # Ignore "unimportant" differences, like ordering of NS lines, TTL's,

diff --git a/bin/tests/system/dlv/clean.sh b/bin/tests/system/dlv/clean.sh
index 378edc8f5a52715c7c6a40b4c5625c49a724dc8f..e49c7dfb58a19f8cc1f8fb16e39e63c7329088c4 100644 (file)
--- a/bin/tests/system/dlv/clean.sh
+++ b/bin/tests/system/dlv/clean.sh
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2004  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: clean.sh,v 1.2 2004/05/14 04:58:18 marka Exp $
+# $Id: clean.sh,v 1.3 2007/06/18 23:47:28 tbox Exp $
 
 rm -f random.data
 rm -f ns*/named.run

diff --git a/bin/tests/system/dlv/ns1/named.conf b/bin/tests/system/dlv/ns1/named.conf
index eee981de2bd59a60030dc06187c50312cc992e9a..b56b8cdad87aae581597bb525094b9519a868c2e 100644 (file)
--- a/bin/tests/system/dlv/ns1/named.conf
+++ b/bin/tests/system/dlv/ns1/named.conf
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2004  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.2 2004/05/14 04:58:20 marka Exp $ */
+/* $Id: named.conf,v 1.3 2007/06/18 23:47:28 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/dlv/ns1/root.db b/bin/tests/system/dlv/ns1/root.db
index c1bc6adf7e9bfbc6c9ef6ef650c2f0a33260d4f7..ad6af2fb735303af811981722c586f007f434194 100644 (file)
--- a/bin/tests/system/dlv/ns1/root.db
+++ b/bin/tests/system/dlv/ns1/root.db
@@ -1,6 +1,6 @@
 ; Copyright (C) 2004  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.
 ;
@@ -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,v 1.2 2004/05/14 04:58:20 marka Exp $
+; $Id: root.db,v 1.3 2007/06/18 23:47:28 tbox Exp $
 
 $TTL   120
 @              SOA     ns.rootservers.utld hostmaster.ns.rootservers.utld (

diff --git a/bin/tests/system/dlv/ns1/rootservers.utld.db b/bin/tests/system/dlv/ns1/rootservers.utld.db
index e0a5f1a7489594c82b812a6e9746226e0c7b5a5a..ee33bb02c35c1bf1420acbc15d7fe5905cb476e4 100644 (file)
--- a/bin/tests/system/dlv/ns1/rootservers.utld.db
+++ b/bin/tests/system/dlv/ns1/rootservers.utld.db
@@ -1,6 +1,6 @@
 ; Copyright (C) 2004  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.
 ;
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: rootservers.utld.db,v 1.2 2004/05/14 04:58:20 marka Exp $
+; $Id: rootservers.utld.db,v 1.3 2007/06/18 23:47:28 tbox Exp $
 
 $TTL   120
 @      SOA     ns hostmaster.ns 1 3600 1200 604800 60

diff --git a/bin/tests/system/dlv/ns2/hints b/bin/tests/system/dlv/ns2/hints
index 2edca0fb839626e7234f7018a8f3a06338e8a85c..5c0428448ac91dd7b5d90e879b5cd1e58e92c2ee 100644 (file)
--- a/bin/tests/system/dlv/ns2/hints
+++ b/bin/tests/system/dlv/ns2/hints
@@ -1,6 +1,6 @@
 ; Copyright (C) 2004  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.
 ;
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: hints,v 1.2 2004/05/14 04:58:21 marka Exp $
+; $Id: hints,v 1.3 2007/06/18 23:47:28 tbox Exp $
 
 . 0 NS ns.rootservers.utld.
 ns.rootservers.utld. 0 A 10.53.0.1

diff --git a/bin/tests/system/dlv/ns2/named.conf b/bin/tests/system/dlv/ns2/named.conf
index 0b4e36b0ef250408a148aae6a3e91eb62b30c4bb..ee18a19a9af1401585498a42f6e00292eff184d9 100644 (file)
--- a/bin/tests/system/dlv/ns2/named.conf
+++ b/bin/tests/system/dlv/ns2/named.conf
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2004  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.2 2004/05/14 04:58:21 marka Exp $ */
+/* $Id: named.conf,v 1.3 2007/06/18 23:47:28 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/dlv/ns2/utld.db b/bin/tests/system/dlv/ns2/utld.db
index ab2be69fa680c0d1a5a712e6ffe44cecf03b023e..c209b7729e2d49455e83bf7560190fb27ae4f638 100644 (file)
--- a/bin/tests/system/dlv/ns2/utld.db
+++ b/bin/tests/system/dlv/ns2/utld.db
@@ -1,6 +1,6 @@
 ; Copyright (C) 2004  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.
 ;
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: utld.db,v 1.2 2004/05/14 04:58:21 marka Exp $
+; $Id: utld.db,v 1.3 2007/06/18 23:47:28 tbox Exp $
 
 $TTL   120
 @              SOA     ns hostmaster.ns 1 3600 1200 604800 60

diff --git a/bin/tests/system/dlv/ns3/child.db.in b/bin/tests/system/dlv/ns3/child.db.in
index f172b694d96eb593b73ac969bafb757d9980be71..c4d403be75f53c9d3ae510a9bb65cb8ba03edc5b 100644 (file)
--- a/bin/tests/system/dlv/ns3/child.db.in
+++ b/bin/tests/system/dlv/ns3/child.db.in
@@ -1,6 +1,6 @@
 ; Copyright (C) 2004  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.
 ;
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: child.db.in,v 1.2 2004/05/14 04:58:21 marka Exp $
+; $Id: child.db.in,v 1.3 2007/06/18 23:47:28 tbox Exp $
 
 $TTL   120
 @              SOA     ns hostmaster.ns 1 3600 1200 604800 60

diff --git a/bin/tests/system/dlv/ns3/dlv.db.in b/bin/tests/system/dlv/ns3/dlv.db.in
index 996f87c7c649030b36a7e5aa349043178ccbb4f8..580b1f2c960820a2bf0f931ebc8ce445fbb2e5ab 100644 (file)
--- a/bin/tests/system/dlv/ns3/dlv.db.in
+++ b/bin/tests/system/dlv/ns3/dlv.db.in
@@ -1,6 +1,6 @@
 ; Copyright (C) 2004  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.
 ;
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: dlv.db.in,v 1.2 2004/05/14 04:58:22 marka Exp $
+; $Id: dlv.db.in,v 1.3 2007/06/18 23:47:28 tbox Exp $
 
 $TTL   120
 @              SOA     ns hostmaster.ns 1 3600 1200 604800 60

diff --git a/bin/tests/system/dlv/ns3/hints b/bin/tests/system/dlv/ns3/hints
index ef01e029c47aa44e1db28d198270372e2b93b115..5c0428448ac91dd7b5d90e879b5cd1e58e92c2ee 100644 (file)
--- a/bin/tests/system/dlv/ns3/hints
+++ b/bin/tests/system/dlv/ns3/hints
@@ -1,6 +1,6 @@
 ; Copyright (C) 2004  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.
 ;
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: hints,v 1.2 2004/05/14 04:58:22 marka Exp $
+; $Id: hints,v 1.3 2007/06/18 23:47:28 tbox Exp $
 
 . 0 NS ns.rootservers.utld.
 ns.rootservers.utld. 0 A 10.53.0.1

diff --git a/bin/tests/system/dlv/ns3/named.conf b/bin/tests/system/dlv/ns3/named.conf
index 042dc23a30e213b847ce5ea4a9f36d2d08957fc3..777f727ecaba15dccdea1366dce1cfe61c6c83e9 100644 (file)
--- a/bin/tests/system/dlv/ns3/named.conf
+++ b/bin/tests/system/dlv/ns3/named.conf
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2004  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.2 2004/05/14 04:58:22 marka Exp $ */
+/* $Id: named.conf,v 1.3 2007/06/18 23:47:28 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/dlv/ns3/sign.sh b/bin/tests/system/dlv/ns3/sign.sh
index d1bb2c4740206654e689b781cbb05ab63e6957f0..12c68aff81e505578af3dcd62f768f674b247d51 100755 (executable)
--- a/bin/tests/system/dlv/ns3/sign.sh
+++ b/bin/tests/system/dlv/ns3/sign.sh
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2004  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: sign.sh,v 1.2 2004/05/14 04:58:22 marka Exp $
+# $Id: sign.sh,v 1.3 2007/06/18 23:47:28 tbox Exp $
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/dlv/ns4/child.db b/bin/tests/system/dlv/ns4/child.db
index 5bbd6cb85b19cd72ec72fa2be0ab3363cff4c091..09ed5e0ce8ba106512d1a112634a4428a5bdb1a8 100644 (file)
--- a/bin/tests/system/dlv/ns4/child.db
+++ b/bin/tests/system/dlv/ns4/child.db
@@ -1,6 +1,6 @@
 ; Copyright (C) 2004  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.
 ;
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: child.db,v 1.2 2004/05/14 04:58:22 marka Exp $
+; $Id: child.db,v 1.3 2007/06/18 23:47:28 tbox Exp $
 
 $TTL   120
 @              SOA     ns hostmaster.ns 1 3600 1200 604800 60

diff --git a/bin/tests/system/dlv/ns4/hints b/bin/tests/system/dlv/ns4/hints
index 982ed44e12e98f04b73beb5a9a50194f9c12970f..5c0428448ac91dd7b5d90e879b5cd1e58e92c2ee 100644 (file)
--- a/bin/tests/system/dlv/ns4/hints
+++ b/bin/tests/system/dlv/ns4/hints
@@ -1,6 +1,6 @@
 ; Copyright (C) 2004  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.
 ;
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: hints,v 1.2 2004/05/14 04:58:23 marka Exp $
+; $Id: hints,v 1.3 2007/06/18 23:47:28 tbox Exp $
 
 . 0 NS ns.rootservers.utld.
 ns.rootservers.utld. 0 A 10.53.0.1

diff --git a/bin/tests/system/dlv/ns4/named.conf b/bin/tests/system/dlv/ns4/named.conf
index b6ea3c0b34c84ef0e1387cf7e7f093cd293ab587..2dc52201296035f95a9359753f32b17934d35587 100644 (file)
--- a/bin/tests/system/dlv/ns4/named.conf
+++ b/bin/tests/system/dlv/ns4/named.conf
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2004  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.2 2004/05/14 04:58:23 marka Exp $ */
+/* $Id: named.conf,v 1.3 2007/06/18 23:47:28 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/dlv/ns5/hints b/bin/tests/system/dlv/ns5/hints
index 982ed44e12e98f04b73beb5a9a50194f9c12970f..5c0428448ac91dd7b5d90e879b5cd1e58e92c2ee 100644 (file)
--- a/bin/tests/system/dlv/ns5/hints
+++ b/bin/tests/system/dlv/ns5/hints
@@ -1,6 +1,6 @@
 ; Copyright (C) 2004  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.
 ;
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: hints,v 1.2 2004/05/14 04:58:23 marka Exp $
+; $Id: hints,v 1.3 2007/06/18 23:47:28 tbox Exp $
 
 . 0 NS ns.rootservers.utld.
 ns.rootservers.utld. 0 A 10.53.0.1

diff --git a/bin/tests/system/dlv/ns5/named.conf b/bin/tests/system/dlv/ns5/named.conf
index 39dcc358910ff3c59b46f80498367a2648033156..b35c4a77b66b8f802e5dc0a68bb731786213afe1 100644 (file)
--- a/bin/tests/system/dlv/ns5/named.conf
+++ b/bin/tests/system/dlv/ns5/named.conf
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2004, 2006, 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.
  *
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.7 2007/04/26 23:46:51 tbox Exp $ */
+/* $Id: named.conf,v 1.8 2007/06/18 23:47:28 tbox Exp $ */
 
 /*
  * Choose a keyname that is unlikely to clash with any real key names.

diff --git a/bin/tests/system/dlv/ns5/rndc.conf b/bin/tests/system/dlv/ns5/rndc.conf
index 7075070ba09ef13850e920b2adcd37e7ba80a9f4..d4e39527dc71d4e03b1972651c3a4f5bb42d637e 100644 (file)
--- a/bin/tests/system/dlv/ns5/rndc.conf
+++ b/bin/tests/system/dlv/ns5/rndc.conf
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2004  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rndc.conf,v 1.3 2004/08/19 04:43:55 marka Exp $ */
+/* $Id: rndc.conf,v 1.4 2007/06/18 23:47:28 tbox Exp $ */
 
 key "cc64b3d1db63fc88d7cb5d2f9f57d258" {
        algorithm hmac-md5;

diff --git a/bin/tests/system/dlv/setup.sh b/bin/tests/system/dlv/setup.sh
index 0e3898b125dd630451e521795b0edda6eaa41109..23d35694b286bdfdb5bb6ec2c8a670377ffa9530 100644 (file)
--- a/bin/tests/system/dlv/setup.sh
+++ b/bin/tests/system/dlv/setup.sh
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2004  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: setup.sh,v 1.2 2004/05/14 04:58:19 marka Exp $
+# $Id: setup.sh,v 1.3 2007/06/18 23:47:28 tbox Exp $
 
 ../../genrandom 400 random.data
 

diff --git a/bin/tests/system/dlv/tests.sh b/bin/tests/system/dlv/tests.sh
index d074faf711a5ecaf8348f36236c1587652d29b0f..65b2d1f78a39b908533222cc3a78fb4cc7e26265 100644 (file)
--- a/bin/tests/system/dlv/tests.sh
+++ b/bin/tests/system/dlv/tests.sh
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2004  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,6 +14,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: tests.sh,v 1.2 2004/05/14 04:58:19 marka Exp $
+# $Id: tests.sh,v 1.3 2007/06/18 23:47:28 tbox Exp $
 
 exit 0

diff --git a/bin/tests/system/dnssec/clean.sh b/bin/tests/system/dnssec/clean.sh
index 1264cb9956052186b459f185934546a394089dad..28e84047e7890045442f7c46fcd17b19a0509a2a 100644 (file)
--- a/bin/tests/system/dnssec/clean.sh
+++ b/bin/tests/system/dnssec/clean.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2002  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.17 2004/12/14 01:02:49 marka Exp $
+# $Id: clean.sh,v 1.18 2007/06/18 23:47:28 tbox Exp $
 
 rm -f */K* */keyset-* */dsset-* */dlvset-* */signedkey-* */*.signed */trusted.conf */tmp*
 rm -f ns1/root.db ns2/example.db ns3/secure.example.db

diff --git a/bin/tests/system/dnssec/dnssec_update_test.pl b/bin/tests/system/dnssec/dnssec_update_test.pl
index 41e613a9ab0653a1884dc359a562307ed8b01346..bff32f929f1373514a74f6849361fd29506daaf1 100644 (file)
--- a/bin/tests/system/dnssec/dnssec_update_test.pl
+++ b/bin/tests/system/dnssec/dnssec_update_test.pl
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2002  Internet Software Consortium.
 #
-# 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.
 #
@@ -32,7 +32,7 @@
 #
 #    perl -MCPAN -e "install Net::DNS"
 #
-# $Id: dnssec_update_test.pl,v 1.3 2004/03/05 05:00:09 marka Exp $
+# $Id: dnssec_update_test.pl,v 1.4 2007/06/18 23:47:28 tbox Exp $
 #
 
 use Getopt::Std;

diff --git a/bin/tests/system/dnssec/ns1/named.conf b/bin/tests/system/dnssec/ns1/named.conf
index aad55b6227217ff0283bd6a9fa60eb01b4bb203b..be75a7aa326db5057d9b5c4b307a8acc9ba4a3af 100644 (file)
--- a/bin/tests/system/dnssec/ns1/named.conf
+++ b/bin/tests/system/dnssec/ns1/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.22 2006/03/10 00:23:21 marka Exp $ */
+/* $Id: named.conf,v 1.23 2007/06/18 23:47:28 tbox Exp $ */
 
 // NS1
 

diff --git a/bin/tests/system/dnssec/ns1/root.db.in b/bin/tests/system/dnssec/ns1/root.db.in
index a7b7b311510ac4b3324a095a9fe61723252bb13a..e9d932f531cdb0695a7cd684de2fbc4940170c26 100644 (file)
--- a/bin/tests/system/dnssec/ns1/root.db.in
+++ b/bin/tests/system/dnssec/ns1/root.db.in
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,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.8 2004/03/10 02:19:53 marka Exp $
+; $Id: root.db.in,v 1.9 2007/06/18 23:47:28 tbox Exp $
 
 $TTL 300
 .                      IN SOA  gson.nominum.com. a.root.servers.nil. (

diff --git a/bin/tests/system/dnssec/ns1/sign.sh b/bin/tests/system/dnssec/ns1/sign.sh
index c9799c878de7ef047182bd468c169174acfd02ab..41c75646a63c75ecff9d4ac86625f38ff180fed7 100644 (file)
--- a/bin/tests/system/dnssec/ns1/sign.sh
+++ b/bin/tests/system/dnssec/ns1/sign.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2003  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: sign.sh,v 1.21 2006/01/04 00:37:24 marka Exp $
+# $Id: sign.sh,v 1.22 2007/06/18 23:47:28 tbox Exp $
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/dnssec/ns2/dlv.db.in b/bin/tests/system/dnssec/ns2/dlv.db.in
index 16f79cb32f848c0105c46204382589ff3eefb9a3..546d7bfe78f151fad167b75307500415b1919b39 100644 (file)
--- a/bin/tests/system/dnssec/ns2/dlv.db.in
+++ b/bin/tests/system/dnssec/ns2/dlv.db.in
@@ -1,6 +1,6 @@
 ; Copyright (C) 2004  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.
 ;
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: dlv.db.in,v 1.3 2004/08/19 04:44:00 marka Exp $
+; $Id: dlv.db.in,v 1.4 2007/06/18 23:47:28 tbox Exp $
 
 $TTL 300       ; 5 minutes
 @                      IN SOA  mname1. . (

diff --git a/bin/tests/system/dnssec/ns2/dst.example.db.in b/bin/tests/system/dnssec/ns2/dst.example.db.in
index 09434dc6ff0aba624848855f69d7a41e5e631bba..80e9e50457d6b1451bf58a4632d203f2733d8745 100644 (file)
--- a/bin/tests/system/dnssec/ns2/dst.example.db.in
+++ b/bin/tests/system/dnssec/ns2/dst.example.db.in
@@ -1,6 +1,6 @@
 ; Copyright (C) 2004  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.
 ;
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: dst.example.db.in,v 1.2 2004/03/05 05:00:15 marka Exp $
+; $Id: dst.example.db.in,v 1.3 2007/06/18 23:47:28 tbox Exp $
 
 $TTL 300       ; 5 minutes
 @                      IN SOA  mname1. . (

diff --git a/bin/tests/system/dnssec/ns2/example.db.in b/bin/tests/system/dnssec/ns2/example.db.in
index 761738f1c647b1ad4ddb5427667295ffcfc60b74..9f65ef9d8317831d44f51f7ee5fb7077235846ef 100644 (file)
--- a/bin/tests/system/dnssec/ns2/example.db.in
+++ b/bin/tests/system/dnssec/ns2/example.db.in
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000-2002  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: example.db.in,v 1.15 2004/05/05 01:32:57 marka Exp $
+; $Id: example.db.in,v 1.16 2007/06/18 23:47:28 tbox Exp $
 
 $TTL 300       ; 5 minutes
 @                      IN SOA  mname1. . (

diff --git a/bin/tests/system/dnssec/ns2/insecure.secure.example.db b/bin/tests/system/dnssec/ns2/insecure.secure.example.db
index 87f8e6070314cc79666c86930b7dafe40c13d3cb..e10a29bfc31104b2e4d230860090c8cee8dbd03f 100644 (file)
--- a/bin/tests/system/dnssec/ns2/insecure.secure.example.db
+++ b/bin/tests/system/dnssec/ns2/insecure.secure.example.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: insecure.secure.example.db,v 1.7 2004/03/05 05:00:15 marka Exp $
+; $Id: insecure.secure.example.db,v 1.8 2007/06/18 23:47:28 tbox Exp $
 
 $TTL 300       ; 5 minutes
 @                      IN SOA  mname1. . (

diff --git a/bin/tests/system/dnssec/ns2/named.conf b/bin/tests/system/dnssec/ns2/named.conf
index 80da8ba13372a60254869c2facacf331d3bf9cc6..bb13daaa102be5ff88c13c11f72f9e86cee8f681 100644 (file)
--- a/bin/tests/system/dnssec/ns2/named.conf
+++ b/bin/tests/system/dnssec/ns2/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.26 2006/03/10 00:23:21 marka Exp $ */
+/* $Id: named.conf,v 1.27 2007/06/18 23:47:28 tbox Exp $ */
 
 // NS2
 

diff --git a/bin/tests/system/dnssec/ns2/private.secure.example.db.in b/bin/tests/system/dnssec/ns2/private.secure.example.db.in
index 438587e424e13cae7228e29c840785b483d6a822..9c19211bd26bc1c11bb2967feb52efa10fcf38ed 100644 (file)
--- a/bin/tests/system/dnssec/ns2/private.secure.example.db.in
+++ b/bin/tests/system/dnssec/ns2/private.secure.example.db.in
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: private.secure.example.db.in,v 1.8 2004/03/05 05:00:16 marka Exp $
+; $Id: private.secure.example.db.in,v 1.9 2007/06/18 23:47:28 tbox Exp $
 
 $TTL 300       ; 5 minutes
 @                      IN SOA  mname1. . (

diff --git a/bin/tests/system/dnssec/ns2/sign.sh b/bin/tests/system/dnssec/ns2/sign.sh
index fdf2f0a419c49a0293f6f936c402dafe43849948..6030d4a76a5fca82e5f3d1c0006203ba2a85109b 100644 (file)
--- a/bin/tests/system/dnssec/ns2/sign.sh
+++ b/bin/tests/system/dnssec/ns2/sign.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2003  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: sign.sh,v 1.26 2006/01/04 00:37:24 marka Exp $
+# $Id: sign.sh,v 1.27 2007/06/18 23:47:28 tbox Exp $
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/dnssec/ns3/bogus.example.db.in b/bin/tests/system/dnssec/ns3/bogus.example.db.in
index e1c800b9112f9e1237ef72fc1f66ff525e6974f0..60bd9e0496bf5d0d3176927ffc717c9c57765ffd 100644 (file)
--- a/bin/tests/system/dnssec/ns3/bogus.example.db.in
+++ b/bin/tests/system/dnssec/ns3/bogus.example.db.in
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: bogus.example.db.in,v 1.7 2004/03/05 05:00:20 marka Exp $
+; $Id: bogus.example.db.in,v 1.8 2007/06/18 23:47:28 tbox Exp $
 
 $TTL 300       ; 5 minutes
 @                      IN SOA  mname1. . (

diff --git a/bin/tests/system/dnssec/ns3/dynamic.example.db.in b/bin/tests/system/dnssec/ns3/dynamic.example.db.in
index 5f079d9ab5713947ece534936d12b0dafd157317..18f7fe5ede8805617ac65b044f7a84860e82a4af 100644 (file)
--- a/bin/tests/system/dnssec/ns3/dynamic.example.db.in
+++ b/bin/tests/system/dnssec/ns3/dynamic.example.db.in
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2002  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: dynamic.example.db.in,v 1.3 2004/03/05 05:00:20 marka Exp $
+; $Id: dynamic.example.db.in,v 1.4 2007/06/18 23:47:28 tbox Exp $
 
 ; This has the NS and glue at the apex because testing RT #2399
 ; requires we have only one name in the zone at a certain point

diff --git a/bin/tests/system/dnssec/ns3/insecure.example.db b/bin/tests/system/dnssec/ns3/insecure.example.db
index 12027d8e6832f7e6ea56b9101c6cba469d910eab..e41007349d0a84b30ae4dc645f06e88627c7bc21 100644 (file)
--- a/bin/tests/system/dnssec/ns3/insecure.example.db
+++ b/bin/tests/system/dnssec/ns3/insecure.example.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: insecure.example.db,v 1.7 2004/03/05 05:00:20 marka Exp $
+; $Id: insecure.example.db,v 1.8 2007/06/18 23:47:28 tbox Exp $
 
 $TTL 300       ; 5 minutes
 @                      IN SOA  mname1. . (

diff --git a/bin/tests/system/dnssec/ns3/keyless.example.db.in b/bin/tests/system/dnssec/ns3/keyless.example.db.in
index 735ca394bedcc9b07c38a4873fdcdf2b1d18da2c..6519a16f98ca0dc1b66da5ccd5ac019e62ed400b 100644 (file)
--- a/bin/tests/system/dnssec/ns3/keyless.example.db.in
+++ b/bin/tests/system/dnssec/ns3/keyless.example.db.in
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2001, 2002  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: keyless.example.db.in,v 1.3 2004/03/05 05:00:20 marka Exp $
+; $Id: keyless.example.db.in,v 1.4 2007/06/18 23:47:28 tbox Exp $
 
 $TTL 300       ; 5 minutes
 @                      IN SOA  mname1. . (

diff --git a/bin/tests/system/dnssec/ns3/named.conf b/bin/tests/system/dnssec/ns3/named.conf
index e7eee8b9084d9506c9dc860433e5db57c7064b6a..c9bbcbebf9fec04cba4b6967a28039643833fe9d 100644 (file)
--- a/bin/tests/system/dnssec/ns3/named.conf
+++ b/bin/tests/system/dnssec/ns3/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.29 2006/03/10 00:23:21 marka Exp $ */
+/* $Id: named.conf,v 1.30 2007/06/18 23:47:28 tbox Exp $ */
 
 // NS3
 

diff --git a/bin/tests/system/dnssec/ns3/secure.example.db.in b/bin/tests/system/dnssec/ns3/secure.example.db.in
index f5d2ca6ef9a533cbfb138e9283bdca7a9c46a0b7..44a63bcefe9673980c4cc187a750fe533580eacc 100644 (file)
--- a/bin/tests/system/dnssec/ns3/secure.example.db.in
+++ b/bin/tests/system/dnssec/ns3/secure.example.db.in
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: secure.example.db.in,v 1.9 2004/03/05 05:00:21 marka Exp $
+; $Id: secure.example.db.in,v 1.10 2007/06/18 23:47:28 tbox Exp $
 
 $TTL 300       ; 5 minutes
 @                      IN SOA  mname1. . (

diff --git a/bin/tests/system/dnssec/ns3/sign.sh b/bin/tests/system/dnssec/ns3/sign.sh
index 68ea50997d3635dec4768c301839ba62b9cf5f1f..a3789c79efcd8756fc34fbeeb4e216f6e41d60b1 100644 (file)
--- a/bin/tests/system/dnssec/ns3/sign.sh
+++ b/bin/tests/system/dnssec/ns3/sign.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2002  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: sign.sh,v 1.21 2006/03/06 01:27:52 marka Exp $
+# $Id: sign.sh,v 1.22 2007/06/18 23:47:28 tbox Exp $
 
 RANDFILE=../random.data
 

diff --git a/bin/tests/system/dnssec/ns4/named.conf b/bin/tests/system/dnssec/ns4/named.conf
index 05d44bbe4a7bb34e04a31ca143b194af286b9712..63da89c3da58b45225697f03b892ff5bb2b8dba8 100644 (file)
--- a/bin/tests/system/dnssec/ns4/named.conf
+++ b/bin/tests/system/dnssec/ns4/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2006, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.27 2007/04/26 23:46:51 tbox Exp $ */
+/* $Id: named.conf,v 1.28 2007/06/18 23:47:28 tbox Exp $ */
 
 // NS4
 

diff --git a/bin/tests/system/dnssec/ns5/named.conf b/bin/tests/system/dnssec/ns5/named.conf
index 81705304454762e45d21849009fd6f0f7f6db891..64892ca10fbe7b76bfdc5dac74662a3b74918aad 100644 (file)
--- a/bin/tests/system/dnssec/ns5/named.conf
+++ b/bin/tests/system/dnssec/ns5/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2006, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.24 2007/04/26 23:46:51 tbox Exp $ */
+/* $Id: named.conf,v 1.25 2007/06/18 23:47:28 tbox Exp $ */
 
 // NS5
 

diff --git a/bin/tests/system/dnssec/ns5/trusted.conf.bad b/bin/tests/system/dnssec/ns5/trusted.conf.bad
index 128f994aff85ad0d51dec81794d78b2db54fb4be..9032a3ce8b6310d1f73ec32e5d66da7b6c751cdf 100644 (file)
--- a/bin/tests/system/dnssec/ns5/trusted.conf.bad
+++ b/bin/tests/system/dnssec/ns5/trusted.conf.bad
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: trusted.conf.bad,v 1.7 2004/03/05 05:00:31 marka Exp $ */
+/* $Id: trusted.conf.bad,v 1.8 2007/06/18 23:47:28 tbox Exp $ */
 
 trusted-keys {
     "." 256 3 1 "AQO6Cl+slAf+iuieDim9L3kujFHQD7s/IOj03ClMOpKYcTXtK4mRpuULVfvWxDi9Ew/gj0xLnnX7z9OJHIxLI+DSrAHd8Dm0XfBEAtVtJSn70GaPZgnLMw1rk5ap2DsEoWk=";

diff --git a/bin/tests/system/dnssec/ns6/named.conf b/bin/tests/system/dnssec/ns6/named.conf
index a52f0417cf6bd1c3ed2aff1cc82d28367f6041ba..eb35680ef2c9ab3cf4c5160f2510d49701d20679 100644 (file)
--- a/bin/tests/system/dnssec/ns6/named.conf
+++ b/bin/tests/system/dnssec/ns6/named.conf
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2004, 2006, 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.
  *
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.11 2007/04/26 23:46:51 tbox Exp $ */
+/* $Id: named.conf,v 1.12 2007/06/18 23:47:28 tbox Exp $ */
 
 // NS6
 

diff --git a/bin/tests/system/dnssec/prereq.sh b/bin/tests/system/dnssec/prereq.sh
index a7313e932b2e8d1a01feedf33d1669427312583d..ce9eb1c1674097f2a9e1fb8ff1a0811696b0e08b 100644 (file)
--- a/bin/tests/system/dnssec/prereq.sh
+++ b/bin/tests/system/dnssec/prereq.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2002  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: prereq.sh,v 1.8 2006/01/04 00:37:24 marka Exp $
+# $Id: prereq.sh,v 1.9 2007/06/18 23:47:28 tbox Exp $
 
 ../../genrandom 400 random.data
 

diff --git a/bin/tests/system/dnssec/setup.sh b/bin/tests/system/dnssec/setup.sh
index 7338f89e5c2d504d01a09da8770b3e72c519247a..72cff6aeea51df3d514130fdeb2767a404367465 100644 (file)
--- a/bin/tests/system/dnssec/setup.sh
+++ b/bin/tests/system/dnssec/setup.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: setup.sh,v 1.12 2004/03/10 01:06:04 marka Exp $
+# $Id: setup.sh,v 1.13 2007/06/18 23:47:28 tbox Exp $
 
 ../../genrandom 400 random.data
 

diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh
index d48524718ee97bd7aa228de1ed289927cbe41649..366c1c31eab317a93f18e8dfa79df66810462f4d 100644 (file)
--- a/bin/tests/system/dnssec/tests.sh
+++ b/bin/tests/system/dnssec/tests.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2002  Internet Software Consortium.
 #
-# 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,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.49 2006/02/26 23:49:50 marka Exp $
+# $Id: tests.sh,v 1.50 2007/06/18 23:47:28 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/forward/clean.sh b/bin/tests/system/forward/clean.sh
index 912fb08fa402a8a1edcaa7a5320b3a64a36c7990..c6c4021dc0337577b2e7cdac3bedbe2f39777b29 100644 (file)
--- a/bin/tests/system/forward/clean.sh
+++ b/bin/tests/system/forward/clean.sh
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.3 2004/03/05 05:00:38 marka Exp $
+# $Id: clean.sh,v 1.4 2007/06/18 23:47:28 tbox Exp $
 
 #
 # Clean up after forward tests.

diff --git a/bin/tests/system/forward/ns1/named.conf b/bin/tests/system/forward/ns1/named.conf
index f4432621a62285ec27d1e296a6562ddd37538551..fe9cebb125c69c78bf392b734c529ee0a97e67c1 100644 (file)
--- a/bin/tests/system/forward/ns1/named.conf
+++ b/bin/tests/system/forward/ns1/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.9 2004/03/05 05:00:43 marka Exp $ */
+/* $Id: named.conf,v 1.10 2007/06/18 23:47:28 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/forward/ns1/root.db b/bin/tests/system/forward/ns1/root.db
index 40e45ebcdc6094670d4a207b18b050f556acc61e..95929c80a08c6ff6f6d40d6e4341b65095ed0499 100644 (file)
--- a/bin/tests/system/forward/ns1/root.db
+++ b/bin/tests/system/forward/ns1/root.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: root.db,v 1.2 2004/03/05 12:46:13 marka Exp $
+; $Id: root.db,v 1.3 2007/06/18 23:47:28 tbox Exp $
 
 $TTL 300
 .                      IN SOA  gson.nominum.com. a.root.servers.nil. (

diff --git a/bin/tests/system/forward/ns2/named.conf b/bin/tests/system/forward/ns2/named.conf
index 452d4fe41e9be71f4d61b5bfcd09b7f2c9a1bb35..09c78c3c9dfb3e3a0969371055cf5a3963a3f96d 100644 (file)
--- a/bin/tests/system/forward/ns2/named.conf
+++ b/bin/tests/system/forward/ns2/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.9 2004/03/05 05:00:46 marka Exp $ */
+/* $Id: named.conf,v 1.10 2007/06/18 23:47:28 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/forward/ns2/root.db b/bin/tests/system/forward/ns2/root.db
index 40e45ebcdc6094670d4a207b18b050f556acc61e..95929c80a08c6ff6f6d40d6e4341b65095ed0499 100644 (file)
--- a/bin/tests/system/forward/ns2/root.db
+++ b/bin/tests/system/forward/ns2/root.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: root.db,v 1.2 2004/03/05 12:46:13 marka Exp $
+; $Id: root.db,v 1.3 2007/06/18 23:47:28 tbox Exp $
 
 $TTL 300
 .                      IN SOA  gson.nominum.com. a.root.servers.nil. (

diff --git a/bin/tests/system/forward/ns3/named.conf b/bin/tests/system/forward/ns3/named.conf
index 7ed8bd3569490ed824d4e9736a59acea66a96805..a113040cee05edb6dcbf686007cc4798a5b0153e 100644 (file)
--- a/bin/tests/system/forward/ns3/named.conf
+++ b/bin/tests/system/forward/ns3/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.9 2004/03/05 05:00:49 marka Exp $ */
+/* $Id: named.conf,v 1.10 2007/06/18 23:47:28 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/forward/ns3/root.db b/bin/tests/system/forward/ns3/root.db
index 40e45ebcdc6094670d4a207b18b050f556acc61e..95929c80a08c6ff6f6d40d6e4341b65095ed0499 100644 (file)
--- a/bin/tests/system/forward/ns3/root.db
+++ b/bin/tests/system/forward/ns3/root.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: root.db,v 1.2 2004/03/05 12:46:13 marka Exp $
+; $Id: root.db,v 1.3 2007/06/18 23:47:28 tbox Exp $
 
 $TTL 300
 .                      IN SOA  gson.nominum.com. a.root.servers.nil. (

diff --git a/bin/tests/system/forward/ns4/named.conf b/bin/tests/system/forward/ns4/named.conf
index 9a775376eecf00c4897563cce6bc5659df048c22..c9d59b0a138364b35471f04fb2d58a976846b01e 100644 (file)
--- a/bin/tests/system/forward/ns4/named.conf
+++ b/bin/tests/system/forward/ns4/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.9 2004/03/05 05:00:52 marka Exp $ */
+/* $Id: named.conf,v 1.10 2007/06/18 23:47:28 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/forward/ns4/root.db b/bin/tests/system/forward/ns4/root.db
index 1f9703ed55f2ce38330d0a0b3893a50944d0a4b4..95929c80a08c6ff6f6d40d6e4341b65095ed0499 100644 (file)
--- a/bin/tests/system/forward/ns4/root.db
+++ b/bin/tests/system/forward/ns4/root.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: root.db,v 1.2 2004/03/05 12:46:14 marka Exp $
+; $Id: root.db,v 1.3 2007/06/18 23:47:28 tbox Exp $
 
 $TTL 300
 .                      IN SOA  gson.nominum.com. a.root.servers.nil. (

diff --git a/bin/tests/system/forward/tests.sh b/bin/tests/system/forward/tests.sh
index 69442920419dae84146186ee59875bbd4b633fac..3e5b2ee4fa39eac3f180ae5a6480607d83b95fd9 100644 (file)
--- a/bin/tests/system/forward/tests.sh
+++ b/bin/tests/system/forward/tests.sh
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,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 2004/03/05 05:00:38 marka Exp $
+# $Id: tests.sh,v 1.6 2007/06/18 23:47:28 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/genzone.sh b/bin/tests/system/genzone.sh
index 8ade6c2b8c9186a8cf615a4084d35d6a328241ba..dc818d8654dc73d457f6ba89694c072d594ab3a4 100644 (file)
--- a/bin/tests/system/genzone.sh
+++ b/bin/tests/system/genzone.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001-2003  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: genzone.sh,v 1.6 2004/03/05 04:59:12 marka Exp $
+# $Id: genzone.sh,v 1.7 2007/06/18 23:47:27 tbox Exp $
 
 #
 # Set up a test zone

diff --git a/bin/tests/system/glue/clean.sh b/bin/tests/system/glue/clean.sh
index 531f31cd6c8abd1ec0536dde30d67fa1ec52631c..aeec1747fa930fe5c913066bb71f9f809165e1a4 100644 (file)
--- a/bin/tests/system/glue/clean.sh
+++ b/bin/tests/system/glue/clean.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,7 +15,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 2004/03/05 05:00:55 marka Exp $
+# $Id: clean.sh,v 1.7 2007/06/18 23:47:29 tbox Exp $
 
 #
 # Clean up after glue tests.

diff --git a/bin/tests/system/glue/ns1/cache.in b/bin/tests/system/glue/ns1/cache.in
index cc6df1ed4f360cc613f2fabae2ca516edb4d214f..f445e9af55a128c8f1cc0ccb96418bc7b60dbedf 100644 (file)
--- a/bin/tests/system/glue/ns1/cache.in
+++ b/bin/tests/system/glue/ns1/cache.in
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: cache.in,v 1.2 2004/03/05 05:00:58 marka Exp $
+; $Id: cache.in,v 1.3 2007/06/18 23:47:29 tbox Exp $
 
 ; Preloaded cache data for glue test
 

diff --git a/bin/tests/system/glue/ns1/mil.db b/bin/tests/system/glue/ns1/mil.db
index ec4a1a75ad51754159d300adbde28f73b39f910a..99ef887fc42b427aea4e447b6867b27ad75bd7bc 100644 (file)
--- a/bin/tests/system/glue/ns1/mil.db
+++ b/bin/tests/system/glue/ns1/mil.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: mil.db,v 1.6 2004/03/05 05:00:58 marka Exp $
+; $Id: mil.db,v 1.7 2007/06/18 23:47:29 tbox Exp $
 
 $ORIGIN mil.
 $TTL 300

diff --git a/bin/tests/system/glue/ns1/named.conf b/bin/tests/system/glue/ns1/named.conf
index 693e81d4bb21b19399ff4058106e99387b86514b..e0f8155a69f57ce6053c64629e5d086ddf60042a 100644 (file)
--- a/bin/tests/system/glue/ns1/named.conf
+++ b/bin/tests/system/glue/ns1/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.13 2005/08/24 23:53:59 marka Exp $ */
+/* $Id: named.conf,v 1.14 2007/06/18 23:47:29 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/glue/ns1/net.db b/bin/tests/system/glue/ns1/net.db
index 2f4e64bb0ec2a63b799219ff664b39b4542b4271..11035336abcd1dfe120cbb439e8a1fea3b397ecf 100644 (file)
--- a/bin/tests/system/glue/ns1/net.db
+++ b/bin/tests/system/glue/ns1/net.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: net.db,v 1.6 2004/03/05 05:00:58 marka Exp $
+; $Id: net.db,v 1.7 2007/06/18 23:47:29 tbox Exp $
 
 $ORIGIN net.
 $TTL 300

diff --git a/bin/tests/system/glue/ns1/root-servers.nil.db b/bin/tests/system/glue/ns1/root-servers.nil.db
index cf15581397ec808497c41f5a1053bf0c42986ad8..fb966bad6cf08bfe90a25c0690b0bd765b3993ca 100644 (file)
--- a/bin/tests/system/glue/ns1/root-servers.nil.db
+++ b/bin/tests/system/glue/ns1/root-servers.nil.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: root-servers.nil.db,v 1.5 2004/03/05 05:00:59 marka Exp $
+; $Id: root-servers.nil.db,v 1.6 2007/06/18 23:47:29 tbox Exp $
 
 $TTL 300
 @                      IN SOA  ns hostmaster (

diff --git a/bin/tests/system/glue/ns1/root.db b/bin/tests/system/glue/ns1/root.db
index 2ec17b6f208d323e96ca0e9645b9046b30e025d6..fa1af1851e34112036bd4e09033e2288f1076658 100644 (file)
--- a/bin/tests/system/glue/ns1/root.db
+++ b/bin/tests/system/glue/ns1/root.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: root.db,v 1.5 2004/03/05 05:00:59 marka Exp $
+; $Id: root.db,v 1.6 2007/06/18 23:47:29 tbox Exp $
 
 $TTL 300
 .                      IN SOA  gson.nominum.com. a.root.servers.nil. (

diff --git a/bin/tests/system/glue/setup.sh b/bin/tests/system/glue/setup.sh
index 0ab8d59af2606d724248ab7537154022906a4bb4..bc0d5c8a9148de2036d79eb38456c3f99cdbff78 100644 (file)
--- a/bin/tests/system/glue/setup.sh
+++ b/bin/tests/system/glue/setup.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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 +15,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: setup.sh,v 1.4 2004/03/10 01:06:04 marka Exp $
+# $Id: setup.sh,v 1.5 2007/06/18 23:47:29 tbox Exp $
 
 cd ns1 && cp -f cache.in cache

diff --git a/bin/tests/system/glue/tests.sh b/bin/tests/system/glue/tests.sh
index 4d1896d881d6750a8b3335655b664a16e936d316..2616677e06953484dda8b0c2de9020fbf96c5714 100644 (file)
--- a/bin/tests/system/glue/tests.sh
+++ b/bin/tests/system/glue/tests.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
 #
-# 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,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.7 2004/03/05 05:00:55 marka Exp $
+# $Id: tests.sh,v 1.8 2007/06/18 23:47:29 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/ifconfig.sh b/bin/tests/system/ifconfig.sh
index 165bda4a2b17d77b27f528a4a8442beecc4dc304..8fbaf4a7b39f04d3047c538f1edcc4364e5570e1 100644 (file)
--- a/bin/tests/system/ifconfig.sh
+++ b/bin/tests/system/ifconfig.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2003  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: ifconfig.sh,v 1.49 2004/10/05 03:17:17 marka Exp $
+# $Id: ifconfig.sh,v 1.50 2007/06/18 23:47:27 tbox Exp $
 
 #
 # Set up interface aliases for bind9 system tests.

diff --git a/bin/tests/system/ixfr/ans2/ans.pl b/bin/tests/system/ixfr/ans2/ans.pl
index 66111b0d0c4844193196048dd3898e812c9c9d8f..a5363722420e46e72d0cce24054ec31a81c69c31 100644 (file)
--- a/bin/tests/system/ixfr/ans2/ans.pl
+++ b/bin/tests/system/ixfr/ans2/ans.pl
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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,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.3 2004/03/05 05:01:06 marka Exp $
+# $Id: ans.pl,v 1.4 2007/06/18 23:47:29 tbox Exp $
 
 #
 # This is the name server from hell.  It provides canned

diff --git a/bin/tests/system/ixfr/clean.sh b/bin/tests/system/ixfr/clean.sh
index 86ee8162abd86bf82da28a1e1a6d905dda3eb9e5..4c791d689c2827f810909c4a6a0cb3da3aba053d 100644 (file)
--- a/bin/tests/system/ixfr/clean.sh
+++ b/bin/tests/system/ixfr/clean.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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 +15,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.3 2004/03/05 05:01:02 marka Exp $
+# $Id: clean.sh,v 1.4 2007/06/18 23:47:29 tbox Exp $
 
 rm -f ns1/named.conf ns1/myftp.db

diff --git a/bin/tests/system/ixfr/prereq.sh b/bin/tests/system/ixfr/prereq.sh
index bc3ef37513cfb4bdb3aa2dfa299f924e9d1152f9..02c94397812c794a3ec568ba96040dbbcbcbc4dc 100644 (file)
--- a/bin/tests/system/ixfr/prereq.sh
+++ b/bin/tests/system/ixfr/prereq.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: prereq.sh,v 1.3 2004/03/05 05:01:02 marka Exp $
+# $Id: prereq.sh,v 1.4 2007/06/18 23:47:29 tbox Exp $
 
 if $PERL -e 'use Net::DNS;' 2>/dev/null
 then

diff --git a/bin/tests/system/ixfr/setup.sh b/bin/tests/system/ixfr/setup.sh
index a130302f92a96230f6407e37c20f1967d5c6a0dc..7d0697af6206ba0d10d0529d6d3fc55675b08863 100644 (file)
--- a/bin/tests/system/ixfr/setup.sh
+++ b/bin/tests/system/ixfr/setup.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: setup.sh,v 1.2 2004/03/05 05:01:02 marka Exp $
+# $Id: setup.sh,v 1.3 2007/06/18 23:47:29 tbox Exp $
 
 rm -f ns1/*.db ns1/*.jnl
 

diff --git a/bin/tests/system/ixfr/tests.sh b/bin/tests/system/ixfr/tests.sh
index 36282a3e2ac753936bc53cfcc81382876fc5d1f6..3c3aa01b1fde0c8cb20c2fa77afaf60fd750ce72 100644 (file)
--- a/bin/tests/system/ixfr/tests.sh
+++ b/bin/tests/system/ixfr/tests.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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,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.3 2004/03/05 05:01:02 marka Exp $
+# $Id: tests.sh,v 1.4 2007/06/18 23:47:29 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/limits/clean.sh b/bin/tests/system/limits/clean.sh
index 4edbba1556c348075e69e01be165eb1855048709..741723375ae6e72cb741b390d79ffcf8fe527ae3 100644 (file)
--- a/bin/tests/system/limits/clean.sh
+++ b/bin/tests/system/limits/clean.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.8 2004/03/05 05:01:09 marka Exp $
+# $Id: clean.sh,v 1.9 2007/06/18 23:47:29 tbox Exp $
 
 #
 # Clean up after limits tests.

diff --git a/bin/tests/system/limits/ns1/example.db b/bin/tests/system/limits/ns1/example.db
index 2da00ef8285a6fe777279f4af9995248c5c82136..a8b35fbb4c97dae9371ac1428591821a5af60850 100644 (file)
--- a/bin/tests/system/limits/ns1/example.db
+++ b/bin/tests/system/limits/ns1/example.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: example.db,v 1.8 2004/03/05 05:01:13 marka Exp $
+; $Id: example.db,v 1.9 2007/06/18 23:47:29 tbox Exp $
 
 $TTL 300        ; 5 minutes
 @                 IN SOA  ns1.example. hostmaster.example. (

diff --git a/bin/tests/system/limits/ns1/named.conf b/bin/tests/system/limits/ns1/named.conf
index 6338cff21e653c3f6342beedfe838db7fec25bd6..c7ca05e269b859ca6142f0197f41c243e9cd8225 100644 (file)
--- a/bin/tests/system/limits/ns1/named.conf
+++ b/bin/tests/system/limits/ns1/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.12 2004/03/05 05:01:13 marka Exp $ */
+/* $Id: named.conf,v 1.13 2007/06/18 23:47:29 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/limits/ns1/root.db b/bin/tests/system/limits/ns1/root.db
index 26dffae2c5379db8cd3dc5e87d376045a15dac4f..da928d5a3a1158f9642f8bb07fede8ee5968e31d 100644 (file)
--- a/bin/tests/system/limits/ns1/root.db
+++ b/bin/tests/system/limits/ns1/root.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: root.db,v 1.7 2004/03/05 05:01:14 marka Exp $
+; $Id: root.db,v 1.8 2007/06/18 23:47:29 tbox Exp $
 
 $TTL 300
 .                      IN SOA  gson.nominum.com. a.root.servers.nil. (

diff --git a/bin/tests/system/limits/tests.sh b/bin/tests/system/limits/tests.sh
index 82d8c3ca8e2e1ede4487933991cd75e142eb7eee..2ca452bace63a220731f0aea8535e31e96c2f855 100644 (file)
--- a/bin/tests/system/limits/tests.sh
+++ b/bin/tests/system/limits/tests.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,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.15 2004/03/05 05:01:09 marka Exp $
+# $Id: tests.sh,v 1.16 2007/06/18 23:47:29 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/lwresd/Makefile.in b/bin/tests/system/lwresd/Makefile.in
index 7a9a6460dee8e8d6dc8882b1680afefb0a9d7b71..929266b12fc3622c83f64534daa68bcb3f8d3ef8 100644 (file)
--- a/bin/tests/system/lwresd/Makefile.in
+++ b/bin/tests/system/lwresd/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2002  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.17 2004/07/20 07:13:38 marka Exp $
+# $Id: Makefile.in,v 1.18 2007/06/18 23:47:29 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/bin/tests/system/lwresd/lwresd1/lwresd.conf b/bin/tests/system/lwresd/lwresd1/lwresd.conf
index c69bc63b45b1d364345afcf22cd1f11fd54282cc..1876f262f6a422124704c2f9ed6e003472f3047d 100644 (file)
--- a/bin/tests/system/lwresd/lwresd1/lwresd.conf
+++ b/bin/tests/system/lwresd/lwresd1/lwresd.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwresd.conf,v 1.6 2004/03/05 05:01:23 marka Exp $ */
+/* $Id: lwresd.conf,v 1.7 2007/06/18 23:47:29 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/lwresd/lwresd1/resolv.conf b/bin/tests/system/lwresd/lwresd1/resolv.conf
index 0a12f27bed7004c0bd41e077b6263e57ceef2491..681868f382ba29a8b3729dca7bab57e7c8ecc883 100644 (file)
--- a/bin/tests/system/lwresd/lwresd1/resolv.conf
+++ b/bin/tests/system/lwresd/lwresd1/resolv.conf
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: resolv.conf,v 1.9 2004/03/05 05:01:23 marka Exp $
+# $Id: resolv.conf,v 1.10 2007/06/18 23:47:29 tbox Exp $
 
 nameserver 10.53.0.1
 lwserver 10.53.0.1

diff --git a/bin/tests/system/lwresd/lwtest.c b/bin/tests/system/lwresd/lwtest.c
index 2781d7e32f03b9ceb5aa5aeae60de0bdd2b434ac..29672692afb03e4287ebf75014e39f510891b22d 100644 (file)
--- a/bin/tests/system/lwresd/lwtest.c
+++ b/bin/tests/system/lwresd/lwtest.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwtest.c,v 1.26 2004/03/05 05:01:20 marka Exp $ */
+/* $Id: lwtest.c,v 1.27 2007/06/18 23:47:29 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/tests/system/lwresd/ns1/10.10.10.in-addr.arpa.db b/bin/tests/system/lwresd/ns1/10.10.10.in-addr.arpa.db
index 84989212f60f9789676e87a094087b05d6935da5..71b4f928ef781dba222e19e4b060ecbd0d9578db 100644 (file)
--- a/bin/tests/system/lwresd/ns1/10.10.10.in-addr.arpa.db
+++ b/bin/tests/system/lwresd/ns1/10.10.10.in-addr.arpa.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: 10.10.10.in-addr.arpa.db,v 1.8 2004/03/05 05:01:26 marka Exp $
+; $Id: 10.10.10.in-addr.arpa.db,v 1.9 2007/06/18 23:47:29 tbox Exp $
 
 $TTL 300       ; 5 minutes
 @      IN SOA  mname1. . (

diff --git a/bin/tests/system/lwresd/ns1/example1.db b/bin/tests/system/lwresd/ns1/example1.db
index 3c759b03282136df200c7b745a7aee2445391f10..087d9659743cd0e9c0151af54b3e33f7addc9587 100644 (file)
--- a/bin/tests/system/lwresd/ns1/example1.db
+++ b/bin/tests/system/lwresd/ns1/example1.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000-2003  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: example1.db,v 1.15 2004/03/05 05:01:26 marka Exp $
+; $Id: example1.db,v 1.16 2007/06/18 23:47:29 tbox Exp $
 
 $TTL 300       ; 5 minutes
 @                      IN SOA  mname1. . (

diff --git a/bin/tests/system/lwresd/ns1/example2.db b/bin/tests/system/lwresd/ns1/example2.db
index 3bc1d7770b158d77231c3c350824e8bb2647a53a..bcc324fac95311e5b468b2d275127f4e575270bb 100644 (file)
--- a/bin/tests/system/lwresd/ns1/example2.db
+++ b/bin/tests/system/lwresd/ns1/example2.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000-2002  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: example2.db,v 1.8 2004/03/05 05:01:27 marka Exp $
+; $Id: example2.db,v 1.9 2007/06/18 23:47:29 tbox Exp $
 
 $TTL 300       ; 5 minutes
 @                      IN SOA  mname1. . (

diff --git a/bin/tests/system/lwresd/ns1/ip6.arpa.db b/bin/tests/system/lwresd/ns1/ip6.arpa.db
index 64b1277ba197769a2c87515ed78d3cf5bbb4cbe1..c6d0fac13090677bdb0cc93596fc85b483c93fb7 100644 (file)
--- a/bin/tests/system/lwresd/ns1/ip6.arpa.db
+++ b/bin/tests/system/lwresd/ns1/ip6.arpa.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000-2002  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: ip6.arpa.db,v 1.9 2004/03/05 05:01:27 marka Exp $
+; $Id: ip6.arpa.db,v 1.10 2007/06/18 23:47:29 tbox Exp $
 
 $TTL 300       ; 5 minutes
 @      IN SOA  mname1. . (

diff --git a/bin/tests/system/lwresd/ns1/ip6.int.db b/bin/tests/system/lwresd/ns1/ip6.int.db
index b566a5ac711797decd010120f48c91e942988b27..330fdeee647d005d97e5210c1f27639374c84a05 100644 (file)
--- a/bin/tests/system/lwresd/ns1/ip6.int.db
+++ b/bin/tests/system/lwresd/ns1/ip6.int.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000-2002  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: ip6.int.db,v 1.9 2004/03/05 05:01:27 marka Exp $
+; $Id: ip6.int.db,v 1.10 2007/06/18 23:47:29 tbox Exp $
 
 $TTL 300       ; 5 minutes
 @      IN SOA  mname1. . (

diff --git a/bin/tests/system/lwresd/ns1/named.conf b/bin/tests/system/lwresd/ns1/named.conf
index e3d9efdf23bf5a759a9d6dfea5bc77c027581acc..e29148b3ce6dd96ce089b750069a5bbdbd96b324 100644 (file)
--- a/bin/tests/system/lwresd/ns1/named.conf
+++ b/bin/tests/system/lwresd/ns1/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.17 2006/03/10 00:23:21 marka Exp $ */
+/* $Id: named.conf,v 1.18 2007/06/18 23:47:29 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/lwresd/ns1/root.db b/bin/tests/system/lwresd/ns1/root.db
index 830161e36cc5de65cbb104fbc1a899ba4effabfa..e723d7aa63f78a41814283f0a79aaacb1a8c0f43 100644 (file)
--- a/bin/tests/system/lwresd/ns1/root.db
+++ b/bin/tests/system/lwresd/ns1/root.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: root.db,v 1.7 2004/03/05 05:01:27 marka Exp $
+; $Id: root.db,v 1.8 2007/06/18 23:47:29 tbox Exp $
 
 $TTL 300
 .                      IN SOA  gson.nominum.com. a.root.servers.nil. (

diff --git a/bin/tests/system/lwresd/resolv.conf b/bin/tests/system/lwresd/resolv.conf
index 8262edc0a09e23b4943df2847ad2b9a6d4ae6328..681868f382ba29a8b3729dca7bab57e7c8ecc883 100644 (file)
--- a/bin/tests/system/lwresd/resolv.conf
+++ b/bin/tests/system/lwresd/resolv.conf
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: resolv.conf,v 1.9 2004/03/05 05:01:20 marka Exp $
+# $Id: resolv.conf,v 1.10 2007/06/18 23:47:29 tbox Exp $
 
 nameserver 10.53.0.1
 lwserver 10.53.0.1

diff --git a/bin/tests/system/lwresd/tests.sh b/bin/tests/system/lwresd/tests.sh
index 67c1946a112f240c3df618d472ff381b3cd2f3b1..c425410bdffd727910a59c2911fad03ccb26a708 100644 (file)
--- a/bin/tests/system/lwresd/tests.sh
+++ b/bin/tests/system/lwresd/tests.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,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.17 2007/03/06 02:12:39 tbox Exp $
+# $Id: tests.sh,v 1.18 2007/06/18 23:47:29 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/masterfile/clean.sh b/bin/tests/system/masterfile/clean.sh
index 894c571e92302e9df72d43ba46480903fe10f24c..76ba028183edf0a4554b88c52ade6d79854f0fc4 100644 (file)
--- a/bin/tests/system/masterfile/clean.sh
+++ b/bin/tests/system/masterfile/clean.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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 +15,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.2 2004/03/05 05:01:30 marka Exp $
+# $Id: clean.sh,v 1.3 2007/06/18 23:47:29 tbox Exp $
 
 rm -f dig.out

diff --git a/bin/tests/system/masterfile/ns1/include.db b/bin/tests/system/masterfile/ns1/include.db
index 9c80bfe0e159316436756536bef08f691b818364..efed4f72e5d8f229a0bd11f797cb5c1a6be1aa1c 100644 (file)
--- a/bin/tests/system/masterfile/ns1/include.db
+++ b/bin/tests/system/masterfile/ns1/include.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: include.db,v 1.3 2004/03/05 05:01:35 marka Exp $
+; $Id: include.db,v 1.4 2007/06/18 23:47:29 tbox Exp $
 
 ; Test $INCLUDE current domain name and origin semantics
 

diff --git a/bin/tests/system/masterfile/ns1/named.conf b/bin/tests/system/masterfile/ns1/named.conf
index 71ed13c44d78f95bcdece64d5909346e4c248ab2..70b90e302f1f86c07bbe387f79c55818e63c84d8 100644 (file)
--- a/bin/tests/system/masterfile/ns1/named.conf
+++ b/bin/tests/system/masterfile/ns1/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.4 2004/03/05 05:01:35 marka Exp $ */
+/* $Id: named.conf,v 1.5 2007/06/18 23:47:29 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/masterfile/ns1/sub.db b/bin/tests/system/masterfile/ns1/sub.db
index 41ffe8c7c048c6ac6726b69e4abe1be90ea21fe9..dcde6b081c755587b9722dd7eeee78f6128fed52 100644 (file)
--- a/bin/tests/system/masterfile/ns1/sub.db
+++ b/bin/tests/system/masterfile/ns1/sub.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: sub.db,v 1.3 2004/03/05 05:01:35 marka Exp $
+; $Id: sub.db,v 1.4 2007/06/18 23:47:29 tbox Exp $
 
 a              A       10.0.1.1
 $ORIGIN foo

diff --git a/bin/tests/system/masterfile/ns1/ttl1.db b/bin/tests/system/masterfile/ns1/ttl1.db
index 7bebcd5b0dff968efb48e7c56d6eb8726392ce94..d5f250e71d9937b346167a300d4cbc06d060ad9e 100644 (file)
--- a/bin/tests/system/masterfile/ns1/ttl1.db
+++ b/bin/tests/system/masterfile/ns1/ttl1.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: ttl1.db,v 1.4 2004/11/23 05:23:38 marka Exp $
+; $Id: ttl1.db,v 1.5 2007/06/18 23:47:29 tbox Exp $
 
 @                      IN SOA  ns hostmaster (
                                1        ; serial

diff --git a/bin/tests/system/masterfile/ns1/ttl2.db b/bin/tests/system/masterfile/ns1/ttl2.db
index 5dec8a06d6204013a602226e2d4bac6f637671de..15d7130ce85e2d2dfbe36da69619bf3ec71d97e9 100644 (file)
--- a/bin/tests/system/masterfile/ns1/ttl2.db
+++ b/bin/tests/system/masterfile/ns1/ttl2.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: ttl2.db,v 1.4 2004/11/23 05:23:38 marka Exp $
+; $Id: ttl2.db,v 1.5 2007/06/18 23:47:29 tbox Exp $
 
 @              1       IN SOA  ns hostmaster (
                                1        ; serial

diff --git a/bin/tests/system/masterfile/tests.sh b/bin/tests/system/masterfile/tests.sh
index 064013ae6d6b1009d961fd634b3304baf73ead3c..b9f03d2787c62691b615b0e29bb002598c4d636d 100644 (file)
--- a/bin/tests/system/masterfile/tests.sh
+++ b/bin/tests/system/masterfile/tests.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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,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.3 2004/03/05 05:01:30 marka Exp $
+# $Id: tests.sh,v 1.4 2007/06/18 23:47:29 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/masterformat/clean.sh b/bin/tests/system/masterformat/clean.sh
index 7aa458a42aae9f0f32706c57b42f6cb5b559fd43..fee0c1d97b95be03375290888cbeedc994b51f21 100755 (executable)
--- a/bin/tests/system/masterformat/clean.sh
+++ b/bin/tests/system/masterformat/clean.sh
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2005  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: clean.sh,v 1.2 2005/06/20 01:03:49 marka Exp $
+# $Id: clean.sh,v 1.3 2007/06/18 23:47:29 tbox Exp $
 
 rm -f named-compilezone
 rm -f ns1/example.db.raw

diff --git a/bin/tests/system/masterformat/ns1/compile.sh b/bin/tests/system/masterformat/ns1/compile.sh
index 83cef2397dc12ef22676c587e28c57ce53e130be..639626149fdc1d0d81e62aee4a5c7c1eb9ca7509 100755 (executable)
--- a/bin/tests/system/masterformat/ns1/compile.sh
+++ b/bin/tests/system/masterformat/ns1/compile.sh
@@ -1,6 +1,6 @@
 # Copyright (C) 2005, 2006  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.
 #
@@ -12,6 +12,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: compile.sh,v 1.4 2006/01/07 00:23:35 marka Exp $
+# $Id: compile.sh,v 1.5 2007/06/18 23:47:29 tbox Exp $
 
 ../named-compilezone -D -F raw -o example.db.raw example example.db

diff --git a/bin/tests/system/masterformat/ns1/example.db b/bin/tests/system/masterformat/ns1/example.db
index dfd6519a5705dcc321938c5cd413a67a200e4673..577c1940cec23339c8e8b6ece42890bed1f46ea3 100644 (file)
--- a/bin/tests/system/masterformat/ns1/example.db
+++ b/bin/tests/system/masterformat/ns1/example.db
@@ -1,6 +1,6 @@
 ; Copyright (C) 2005  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.
 ;
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: example.db,v 1.3 2005/06/22 00:10:30 marka Exp $
+; $Id: example.db,v 1.4 2007/06/18 23:47:29 tbox Exp $
 
 $TTL 1D
 

diff --git a/bin/tests/system/masterformat/ns1/named.conf b/bin/tests/system/masterformat/ns1/named.conf
index f8eec4b2cf41f9539ceb102a521ea724282f7b4c..c0b12aa3d4d5fdae1319ac49da95a771240695a7 100644 (file)
--- a/bin/tests/system/masterformat/ns1/named.conf
+++ b/bin/tests/system/masterformat/ns1/named.conf
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2005  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.2 2005/06/20 01:03:51 marka Exp $ */
+/* $Id: named.conf,v 1.3 2007/06/18 23:47:29 tbox Exp $ */
 
 // NS1
 

diff --git a/bin/tests/system/masterformat/ns2/named.conf b/bin/tests/system/masterformat/ns2/named.conf
index 759d348183d806e37c1ca27c5983f638f0c41d13..ab73dbf8abbec29e8b2c03c263eed0ae6677fed6 100644 (file)
--- a/bin/tests/system/masterformat/ns2/named.conf
+++ b/bin/tests/system/masterformat/ns2/named.conf
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2005  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.2 2005/06/20 01:03:51 marka Exp $ */
+/* $Id: named.conf,v 1.3 2007/06/18 23:47:29 tbox Exp $ */
 
 // NS2
 

diff --git a/bin/tests/system/masterformat/setup.sh b/bin/tests/system/masterformat/setup.sh
index fde41c33c702726650a86d58c37b329812b51a30..83e0bb097647a95bfc6ef0c63f2e5cdf74dd870d 100755 (executable)
--- a/bin/tests/system/masterformat/setup.sh
+++ b/bin/tests/system/masterformat/setup.sh
@@ -1,6 +1,6 @@
 # Copyright (C) 2005, 2006  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.
 #
@@ -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.4 2006/01/07 00:23:35 marka Exp $
+# $Id: setup.sh,v 1.5 2007/06/18 23:47:29 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 2b8d1dc0ead7213d5af4d7772dd7b5cacda147e5..ea14b310270dfec52a5d43dfba90b7ba4b2ec62e 100755 (executable)
--- a/bin/tests/system/masterformat/tests.sh
+++ b/bin/tests/system/masterformat/tests.sh
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2005  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.2 2005/06/20 01:03:50 marka Exp $
+# $Id: tests.sh,v 1.3 2007/06/18 23:47:29 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
@@ -54,7 +54,7 @@ exit $status
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: tests.sh,v 1.2 2005/06/20 01:03:50 marka Exp $
+# $Id: tests.sh,v 1.3 2007/06/18 23:47:29 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/notify/clean.sh b/bin/tests/system/notify/clean.sh
index fb43e470c9643c2aefd6413ded4c2c957493c2f4..4f7ef8abaa092e18cc6fc19c630d0e049dc86c01 100644 (file)
--- a/bin/tests/system/notify/clean.sh
+++ b/bin/tests/system/notify/clean.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.9 2004/03/10 01:06:04 marka Exp $
+# $Id: clean.sh,v 1.10 2007/06/18 23:47:29 tbox Exp $
 
 #
 # Clean up after zone transfer tests.

diff --git a/bin/tests/system/notify/ns1/named.conf b/bin/tests/system/notify/ns1/named.conf
index 544e86dfc82229c4df0849522466ca29d8ccbcc1..dc32f5e13e5efc8e2b4b0fd9576d13af0f56c4c5 100644 (file)
--- a/bin/tests/system/notify/ns1/named.conf
+++ b/bin/tests/system/notify/ns1/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.16 2004/03/05 05:01:43 marka Exp $ */
+/* $Id: named.conf,v 1.17 2007/06/18 23:47:29 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/notify/ns1/root.db b/bin/tests/system/notify/ns1/root.db
index db2736e28a5cda21d931d942ff52a2c8a00c73ab..4614ebffc3d77126104c324b47cc49a02a5c0ea4 100644 (file)
--- a/bin/tests/system/notify/ns1/root.db
+++ b/bin/tests/system/notify/ns1/root.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: root.db,v 1.7 2004/03/05 05:01:44 marka Exp $
+; $Id: root.db,v 1.8 2007/06/18 23:47:29 tbox Exp $
 
 $TTL 300
 .                      IN SOA  gson.nominum.com. a.root.servers.nil. (

diff --git a/bin/tests/system/notify/ns2/example1.db b/bin/tests/system/notify/ns2/example1.db
index 86a9f90b6fed3532ddb4567686157ba03dd72c70..6b8540be2dd618861e5d0ee96e655060790e1b37 100644 (file)
--- a/bin/tests/system/notify/ns2/example1.db
+++ b/bin/tests/system/notify/ns2/example1.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000-2002  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: example1.db,v 1.10 2004/03/05 05:01:47 marka Exp $
+; $Id: example1.db,v 1.11 2007/06/18 23:47:29 tbox Exp $
 
 $ORIGIN .
 $TTL 300       ; 5 minutes

diff --git a/bin/tests/system/notify/ns2/example2.db b/bin/tests/system/notify/ns2/example2.db
index 0f69b64d3f462590f2d775e9f89dadbe4441a179..98aec4c45a7e9f0d76ef5988db99178fc634c0ba 100644 (file)
--- a/bin/tests/system/notify/ns2/example2.db
+++ b/bin/tests/system/notify/ns2/example2.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000-2002  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: example2.db,v 1.10 2004/03/05 05:01:47 marka Exp $
+; $Id: example2.db,v 1.11 2007/06/18 23:47:29 tbox Exp $
 
 $ORIGIN .
 $TTL 300       ; 5 minutes

diff --git a/bin/tests/system/notify/ns2/example3.db b/bin/tests/system/notify/ns2/example3.db
index 431ccca61d6bf4c82783f0ec7ecf69de899f8708..fbc358a35e39864252edee9ae267b362b0154206 100644 (file)
--- a/bin/tests/system/notify/ns2/example3.db
+++ b/bin/tests/system/notify/ns2/example3.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000-2002  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: example3.db,v 1.10 2004/03/05 05:01:47 marka Exp $
+; $Id: example3.db,v 1.11 2007/06/18 23:47:29 tbox Exp $
 
 $ORIGIN .
 $TTL 300       ; 5 minutes

diff --git a/bin/tests/system/notify/ns2/example4.db b/bin/tests/system/notify/ns2/example4.db
index 466859ec36f476735fed5e6689e6e55c6dd40afb..c5daaea054283ccf5f1337fa248c8db463cd2050 100644 (file)
--- a/bin/tests/system/notify/ns2/example4.db
+++ b/bin/tests/system/notify/ns2/example4.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000-2002  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: example4.db,v 1.10 2004/03/05 05:01:47 marka Exp $
+; $Id: example4.db,v 1.11 2007/06/18 23:47:29 tbox Exp $
 
 $ORIGIN .
 $TTL 300       ; 5 minutes

diff --git a/bin/tests/system/notify/ns2/named.conf b/bin/tests/system/notify/ns2/named.conf
index e1dad2b073bf1725f30142e91bdd9019fdd9a613..9c02ae4eaa13cbd8dadfc5314e62cc9345ff5682 100644 (file)
--- a/bin/tests/system/notify/ns2/named.conf
+++ b/bin/tests/system/notify/ns2/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.18 2004/03/05 05:01:47 marka Exp $ */
+/* $Id: named.conf,v 1.19 2007/06/18 23:47:29 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/notify/ns3/named.conf b/bin/tests/system/notify/ns3/named.conf
index 5639fcd6ec99a602f43852ca6e8d4eb80b0e83a5..53169578b02548486accdf121ee357d6827b4e93 100644 (file)
--- a/bin/tests/system/notify/ns3/named.conf
+++ b/bin/tests/system/notify/ns3/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.23 2007/04/26 23:46:51 tbox Exp $ */
+/* $Id: named.conf,v 1.24 2007/06/18 23:47:29 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/notify/setup.sh b/bin/tests/system/notify/setup.sh
index b81d160f0637aac755260543b9e999f66007a9fa..0f5719821d3aa34a9a9599b5fb8b272cfe46848a 100644 (file)
--- a/bin/tests/system/notify/setup.sh
+++ b/bin/tests/system/notify/setup.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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 +15,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: setup.sh,v 1.8 2004/03/10 01:06:04 marka Exp $
+# $Id: setup.sh,v 1.9 2007/06/18 23:47:29 tbox Exp $
 
 cp -f ns2/example1.db ns2/example.db

diff --git a/bin/tests/system/notify/tests.sh b/bin/tests/system/notify/tests.sh
index 324d01e8128c12e3054927d0acfa6aa4a77a9365..3b2d360e0c48c3edc2264a473a13d58650648bd2 100644 (file)
--- a/bin/tests/system/notify/tests.sh
+++ b/bin/tests/system/notify/tests.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,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.31 2004/03/10 01:06:04 marka Exp $
+# $Id: tests.sh,v 1.32 2007/06/18 23:47:29 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/nsupdate/clean.sh b/bin/tests/system/nsupdate/clean.sh
index eecc625a1506af65090162aeaa5ea0ecfb33aafe..4090e4042cda84eabf1ddc50a7ab79952ca94223 100644 (file)
--- a/bin/tests/system/nsupdate/clean.sh
+++ b/bin/tests/system/nsupdate/clean.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.9 2004/03/10 01:06:05 marka Exp $
+# $Id: clean.sh,v 1.10 2007/06/18 23:47:30 tbox Exp $
 
 #
 # Clean up after zone transfer tests.

diff --git a/bin/tests/system/nsupdate/ns1/example1.db b/bin/tests/system/nsupdate/ns1/example1.db
index 63652d8924c7332a4d759876340bfd4660d48618..da4da09e079d0300eec5238eb85e2d5bbfe68ee0 100644 (file)
--- a/bin/tests/system/nsupdate/ns1/example1.db
+++ b/bin/tests/system/nsupdate/ns1/example1.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000-2002  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: example1.db,v 1.6 2004/11/23 05:23:39 marka Exp $
+; $Id: example1.db,v 1.7 2007/06/18 23:47:30 tbox Exp $
 
 $ORIGIN .
 $TTL 300       ; 5 minutes

diff --git a/bin/tests/system/nsupdate/ns1/named.conf b/bin/tests/system/nsupdate/ns1/named.conf
index 415e618a0f73b63d851761537bf748817984c2a7..f87d4c1ad3d6531152a82d528b157dd41f2faa9e 100644 (file)
--- a/bin/tests/system/nsupdate/ns1/named.conf
+++ b/bin/tests/system/nsupdate/ns1/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.15 2005/08/24 23:53:59 marka Exp $ */
+/* $Id: named.conf,v 1.16 2007/06/18 23:47:30 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/nsupdate/ns2/named.conf b/bin/tests/system/nsupdate/ns2/named.conf
index d3bff3dd67cb2f67d5f89ee614bc9436243ba77d..77e401337b88825444e9bdb783174fbaa1e8650d 100644 (file)
--- a/bin/tests/system/nsupdate/ns2/named.conf
+++ b/bin/tests/system/nsupdate/ns2/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.13 2007/04/26 23:46:51 tbox Exp $ */
+/* $Id: named.conf,v 1.14 2007/06/18 23:47:30 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/nsupdate/setup.sh b/bin/tests/system/nsupdate/setup.sh
index f545f200c123e4925b5110f6659e1b45599dff86..00e52eaa4388f006ac6cb0ea0e68db89ced95f6b 100644 (file)
--- a/bin/tests/system/nsupdate/setup.sh
+++ b/bin/tests/system/nsupdate/setup.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: setup.sh,v 1.8 2004/03/10 01:06:05 marka Exp $
+# $Id: setup.sh,v 1.9 2007/06/18 23:47:30 tbox Exp $
 
 #
 # jnl and database files MUST be removed before we start

diff --git a/bin/tests/system/nsupdate/tests.sh b/bin/tests/system/nsupdate/tests.sh
index 5ad42fbbbffe93965d444c1ab178967d82689537..38e9541d826e383a21dd122f74c686762105eb7d 100644 (file)
--- a/bin/tests/system/nsupdate/tests.sh
+++ b/bin/tests/system/nsupdate/tests.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,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.23 2004/03/05 05:01:55 marka Exp $
+# $Id: tests.sh,v 1.24 2007/06/18 23:47:30 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/nsupdate/update_test.pl b/bin/tests/system/nsupdate/update_test.pl
index e3ed7d5ee6c540877b6e4cce8a6f85b185edb680..d8f4f22243b4c472c39c7fa702fcabfd170df539 100644 (file)
--- a/bin/tests/system/nsupdate/update_test.pl
+++ b/bin/tests/system/nsupdate/update_test.pl
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -37,7 +37,7 @@
 #
 #    perl -MCPAN -e "install Net::DNS"
 #
-# $Id: update_test.pl,v 1.8 2004/03/05 05:01:55 marka Exp $
+# $Id: update_test.pl,v 1.9 2007/06/18 23:47:30 tbox Exp $
 #
 
 use Getopt::Std;

diff --git a/bin/tests/system/relay/clean.sh b/bin/tests/system/relay/clean.sh
index d6423bef92c97cb7f8d13b10b0d2d5040c9f3302..c20f78bd4c0ed4c36931086ae77ba061c2879164 100644 (file)
--- a/bin/tests/system/relay/clean.sh
+++ b/bin/tests/system/relay/clean.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.3 2004/03/05 05:02:11 marka Exp $
+# $Id: clean.sh,v 1.4 2007/06/18 23:47:30 tbox Exp $
 
 #
 # Clean up after relay transfer tests.

diff --git a/bin/tests/system/relay/ns1/named.conf b/bin/tests/system/relay/ns1/named.conf
index 918ff08ec692885e167aad76131a78aa82a6da76..eb4ebc2554e58fcab8df5af57518bee6b9138096 100644 (file)
--- a/bin/tests/system/relay/ns1/named.conf
+++ b/bin/tests/system/relay/ns1/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.8 2004/03/05 05:02:14 marka Exp $ */
+/* $Id: named.conf,v 1.9 2007/06/18 23:47:30 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/relay/ns1/root.db b/bin/tests/system/relay/ns1/root.db
index 626dd721809052c2399a630983288f30c4960831..84a7450489b446373b8b8a72f72c6432474b3a24 100644 (file)
--- a/bin/tests/system/relay/ns1/root.db
+++ b/bin/tests/system/relay/ns1/root.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: root.db,v 1.3 2004/03/05 05:02:14 marka Exp $
+; $Id: root.db,v 1.4 2007/06/18 23:47:30 tbox Exp $
 
 $TTL 300
 .                      IN SOA  a.root-servers.nil. gson.nominum.com. (

diff --git a/bin/tests/system/relay/ns2/example1.db b/bin/tests/system/relay/ns2/example1.db
index e85c769178049564080e732094dcbcf4d17be8ae..a88b0c9a2fd038121ae8289249fd83dafb8deffc 100644 (file)
--- a/bin/tests/system/relay/ns2/example1.db
+++ b/bin/tests/system/relay/ns2/example1.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000-2002  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: example1.db,v 1.5 2004/03/05 05:02:18 marka Exp $
+; $Id: example1.db,v 1.6 2007/06/18 23:47:30 tbox Exp $
 
 $ORIGIN .
 $TTL 300       ; 5 minutes

diff --git a/bin/tests/system/relay/ns2/example2.db b/bin/tests/system/relay/ns2/example2.db
index a19e1eb9b319a430afb43fb0c3e0bd405775fc9b..20cc73c3eb2d555e8560b65e80b5379042a85912 100644 (file)
--- a/bin/tests/system/relay/ns2/example2.db
+++ b/bin/tests/system/relay/ns2/example2.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000-2002  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: example2.db,v 1.5 2004/03/05 05:02:18 marka Exp $
+; $Id: example2.db,v 1.6 2007/06/18 23:47:30 tbox Exp $
 
 $ORIGIN .
 $TTL 300       ; 5 minutes

diff --git a/bin/tests/system/relay/ns2/example3.db b/bin/tests/system/relay/ns2/example3.db
index 74f92231b16067a1f7cea9e23483893da3be7748..1d08365a47920662afbab75afbbe6ccd78d1d716 100644 (file)
--- a/bin/tests/system/relay/ns2/example3.db
+++ b/bin/tests/system/relay/ns2/example3.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000-2002  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: example3.db,v 1.5 2004/03/05 05:02:18 marka Exp $
+; $Id: example3.db,v 1.6 2007/06/18 23:47:30 tbox Exp $
 
 $ORIGIN .
 $TTL 300       ; 5 minutes

diff --git a/bin/tests/system/relay/ns2/example4.db b/bin/tests/system/relay/ns2/example4.db
index 77420d2fdc16601b116e4412fd795899d7608470..b1573382e78ff8ab89d0c6cae14556a82b3fd3f2 100644 (file)
--- a/bin/tests/system/relay/ns2/example4.db
+++ b/bin/tests/system/relay/ns2/example4.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000-2002  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: example4.db,v 1.5 2004/03/05 05:02:19 marka Exp $
+; $Id: example4.db,v 1.6 2007/06/18 23:47:30 tbox Exp $
 
 $ORIGIN .
 $TTL 300       ; 5 minutes

diff --git a/bin/tests/system/relay/ns2/named.conf b/bin/tests/system/relay/ns2/named.conf
index 90abbdcb559313d03adcc8d5878d124ca85525a0..dcd3f9f12842ebbd4998657d87bd18bcf8640da4 100644 (file)
--- a/bin/tests/system/relay/ns2/named.conf
+++ b/bin/tests/system/relay/ns2/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.8 2004/03/05 05:02:19 marka Exp $ */
+/* $Id: named.conf,v 1.9 2007/06/18 23:47:30 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/relay/ns3/named.conf b/bin/tests/system/relay/ns3/named.conf
index d1dffb231b22b75cc1f30106dc1e4d2cbaaf01fc..83928f863f306c35074aa624294a1ee5d10e7bdf 100644 (file)
--- a/bin/tests/system/relay/ns3/named.conf
+++ b/bin/tests/system/relay/ns3/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.12 2007/04/26 23:46:51 tbox Exp $ */
+/* $Id: named.conf,v 1.13 2007/06/18 23:47:30 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/relay/ns4/named.conf b/bin/tests/system/relay/ns4/named.conf
index a7dd92c0f891bc628d15a803d653fe294c2be40c..3a54df8d73a2af07703b327e5bb3e0c7afbc6539 100644 (file)
--- a/bin/tests/system/relay/ns4/named.conf
+++ b/bin/tests/system/relay/ns4/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.12 2007/04/26 23:46:51 tbox Exp $ */
+/* $Id: named.conf,v 1.13 2007/06/18 23:47:30 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/relay/setup.sh b/bin/tests/system/relay/setup.sh
index 8de225e67e557113bdd058a88a5f1b92246518d1..ef6c53228b94b401d1e8c96840683bc59bc654d1 100644 (file)
--- a/bin/tests/system/relay/setup.sh
+++ b/bin/tests/system/relay/setup.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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 +15,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: setup.sh,v 1.4 2004/03/10 01:06:05 marka Exp $
+# $Id: setup.sh,v 1.5 2007/06/18 23:47:30 tbox Exp $
 
 cp -f ns2/example1.db ns2/example.db

diff --git a/bin/tests/system/relay/tests.sh b/bin/tests/system/relay/tests.sh
index 138e8b7be72033da1bafe6b264d6b0a0bd66d296..c1167f91504a384969763b10f310696339199756 100644 (file)
--- a/bin/tests/system/relay/tests.sh
+++ b/bin/tests/system/relay/tests.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,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.5 2004/03/10 01:06:05 marka Exp $
+# $Id: tests.sh,v 1.6 2007/06/18 23:47:30 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/resolver/ans2/ans.pl b/bin/tests/system/resolver/ans2/ans.pl
index 7f5881a6daeef1277c5bf71a903eef2fbd35e1b0..54dfc4edb3f184ad23a6ad391fdb764b24ac207a 100644 (file)
--- a/bin/tests/system/resolver/ans2/ans.pl
+++ b/bin/tests/system/resolver/ans2/ans.pl
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,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.7 2004/03/05 05:02:29 marka Exp $
+# $Id: ans.pl,v 1.8 2007/06/18 23:47:30 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 5821f0026526966cbc36c6ee2b9a2b6d52706248..cce0a60b30414cdc4e8587b78f07e13c885b3f18 100644 (file)
--- a/bin/tests/system/resolver/ans3/ans.pl
+++ b/bin/tests/system/resolver/ans3/ans.pl
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,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.6 2004/03/05 05:02:37 marka Exp $
+# $Id: ans.pl,v 1.7 2007/06/18 23:47:30 tbox Exp $
 
 #
 # Ad hoc name server

diff --git a/bin/tests/system/resolver/ns1/named.conf b/bin/tests/system/resolver/ns1/named.conf
index 2a364598ade5fa5eaf8c0354a3813ffcfaa0d093..4b0c80abf9389e4cc1c6bd47f137767fa1491efd 100644 (file)
--- a/bin/tests/system/resolver/ns1/named.conf
+++ b/bin/tests/system/resolver/ns1/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.12 2007/04/26 23:46:51 tbox Exp $ */
+/* $Id: named.conf,v 1.13 2007/06/18 23:47:30 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/resolver/ns1/root.hint b/bin/tests/system/resolver/ns1/root.hint
index a1da93d0eaa89bb2a2c440e9d0a0fe5ed5685b43..edaf7f6443d775ecaeb53a36ad0d64e1bb3768da 100644 (file)
--- a/bin/tests/system/resolver/ns1/root.hint
+++ b/bin/tests/system/resolver/ns1/root.hint
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: root.hint,v 1.5 2004/03/05 05:02:39 marka Exp $
+; $Id: root.hint,v 1.6 2007/06/18 23:47:30 tbox Exp $
 
 $TTL 999999
 .                       IN NS  a.root-servers.nil.

diff --git a/bin/tests/system/resolver/prereq.sh b/bin/tests/system/resolver/prereq.sh
index 7af482bb3eb6e71aa45327bd69a462ab883b0d8e..2e304c3459c38afe3bac1535344b62dd522a4da8 100644 (file)
--- a/bin/tests/system/resolver/prereq.sh
+++ b/bin/tests/system/resolver/prereq.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: prereq.sh,v 1.5 2004/03/05 05:02:27 marka Exp $
+# $Id: prereq.sh,v 1.6 2007/06/18 23:47:30 tbox Exp $
 
 if $PERL -e 'use Net::DNS;' 2>/dev/null
 then

diff --git a/bin/tests/system/resolver/tests.sh b/bin/tests/system/resolver/tests.sh
index 87ca59c47e9d0acf184a28a2ff93b9c41ace0310..d44b534f2d6cc0db9ed88e64a9d7052bf15d9337 100644 (file)
--- a/bin/tests/system/resolver/tests.sh
+++ b/bin/tests/system/resolver/tests.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,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.7 2004/03/05 05:02:27 marka Exp $
+# $Id: tests.sh,v 1.8 2007/06/18 23:47:30 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/rrsetorder/clean.sh b/bin/tests/system/rrsetorder/clean.sh
index 75b98cb848feccef4633e20e533b58393e898405..9a4c2e7c13d7189e129f3f18877edff391903ac6 100644 (file)
--- a/bin/tests/system/rrsetorder/clean.sh
+++ b/bin/tests/system/rrsetorder/clean.sh
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2006  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: clean.sh,v 1.3 2006/03/05 23:58:52 marka Exp $
+# $Id: clean.sh,v 1.4 2007/06/18 23:47:30 tbox Exp $
 
 rm -f dig.out.cyclic dig.out.fixed dig.out.random
 rm -f ns2/root.bk

diff --git a/bin/tests/system/rrsetorder/ns1/named.conf b/bin/tests/system/rrsetorder/ns1/named.conf
index a5a94fb17985fc963288192119eccc7891cdd37f..7b04a98cdddc580bb04f7f60cb0950dca4430738 100644 (file)
--- a/bin/tests/system/rrsetorder/ns1/named.conf
+++ b/bin/tests/system/rrsetorder/ns1/named.conf
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2006  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.2 2006/03/03 00:43:35 marka Exp $ */
+/* $Id: named.conf,v 1.3 2007/06/18 23:47:30 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/rrsetorder/ns1/root.db b/bin/tests/system/rrsetorder/ns1/root.db
index f3606c0457aa54ab24e2333c96e58872c6ec1a12..aaa8f50d9fc201c2bf738a7a5bc6b2f582c5a2f9 100644 (file)
--- a/bin/tests/system/rrsetorder/ns1/root.db
+++ b/bin/tests/system/rrsetorder/ns1/root.db
@@ -1,6 +1,6 @@
 ; Copyright (C) 2006  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.
 ;
@@ -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,v 1.2 2006/03/03 00:43:35 marka Exp $
+; $Id: root.db,v 1.3 2007/06/18 23:47:30 tbox Exp $
 
 $TTL 3600
 .                       SOA    hostmaster.isc.org. a.root-servers.nil. (

diff --git a/bin/tests/system/rrsetorder/ns2/named.conf b/bin/tests/system/rrsetorder/ns2/named.conf
index bf0d1c1d7bbea73e0a7f5def454fd8a4ec79ff05..006d666141d0d63398f0c222073b9563d403d3f4 100644 (file)
--- a/bin/tests/system/rrsetorder/ns2/named.conf
+++ b/bin/tests/system/rrsetorder/ns2/named.conf
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2006  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.2 2006/03/03 00:43:35 marka Exp $ */
+/* $Id: named.conf,v 1.3 2007/06/18 23:47:30 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/rrsetorder/ns3/named.conf b/bin/tests/system/rrsetorder/ns3/named.conf
index ba64eaef61fd3291b33e439661e40805684df8dc..fa8bfc9f6dc1b1200325ef520b3d740aee569649 100644 (file)
--- a/bin/tests/system/rrsetorder/ns3/named.conf
+++ b/bin/tests/system/rrsetorder/ns3/named.conf
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2006, 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.
  *
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.4 2007/04/26 23:46:51 tbox Exp $ */
+/* $Id: named.conf,v 1.5 2007/06/18 23:47:30 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/rrsetorder/tests.sh b/bin/tests/system/rrsetorder/tests.sh
index 92c73847f656b3b910c7d94cee08193d7c6845cb..1b1997b2849eaccee86f8d59281c686dd223de52 100644 (file)
--- a/bin/tests/system/rrsetorder/tests.sh
+++ b/bin/tests/system/rrsetorder/tests.sh
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2006  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.3 2006/03/05 23:58:52 marka Exp $
+# $Id: tests.sh,v 1.4 2007/06/18 23:47:30 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/run.sh b/bin/tests/system/run.sh
index dd497eddf95aec3f3772b5511fb89b5c668e4863..3ff1671a038db05da5e75c4acc861ccbe6f4e43f 100644 (file)
--- a/bin/tests/system/run.sh
+++ b/bin/tests/system/run.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: run.sh,v 1.40 2004/03/05 04:59:12 marka Exp $
+# $Id: run.sh,v 1.41 2007/06/18 23:47:27 tbox Exp $
 
 #
 # Run a system test.

diff --git a/bin/tests/system/runall.sh b/bin/tests/system/runall.sh
index ac23ce0c8b945ecd87199a2446edcfbf215742eb..bf7f99307c59b7ac9c855f79c531ccb04fbdfcc6 100644 (file)
--- a/bin/tests/system/runall.sh
+++ b/bin/tests/system/runall.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: runall.sh,v 1.6 2004/03/05 04:59:12 marka Exp $
+# $Id: runall.sh,v 1.7 2007/06/18 23:47:27 tbox Exp $
 
 #
 # Run all the system tests.

diff --git a/bin/tests/system/send.pl b/bin/tests/system/send.pl
index 5e17ab3d6ffebcd46416d4c2d7aeeef389764d87..3ab26e6ba9e8c080434aa0b1a78057884c3f6ef4 100644 (file)
--- a/bin/tests/system/send.pl
+++ b/bin/tests/system/send.pl
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: send.pl,v 1.3 2004/03/05 04:59:12 marka Exp $
+# $Id: send.pl,v 1.4 2007/06/18 23:47:27 tbox Exp $
 
 #
 # Send a file to a given address and port using TCP.  Used for

diff --git a/bin/tests/system/setup.sh b/bin/tests/system/setup.sh
index 5223e3140c38812ad6989ac9c7aea204eb0da7d8..c16e45cc06db8597d701bf3edc0691b3d1119b37 100644 (file)
--- a/bin/tests/system/setup.sh
+++ b/bin/tests/system/setup.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: setup.sh,v 1.9 2004/03/05 04:59:13 marka Exp $
+# $Id: setup.sh,v 1.10 2007/06/18 23:47:27 tbox Exp $
 
 #
 # Run a system test.

diff --git a/bin/tests/system/sortlist/clean.sh b/bin/tests/system/sortlist/clean.sh
index 5bde7d0e6ceb39bd264901e130493dbb71ce5976..bf8e493bcde9013f885ecba04e3134aed0eb0703 100644 (file)
--- a/bin/tests/system/sortlist/clean.sh
+++ b/bin/tests/system/sortlist/clean.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.4 2004/03/05 05:02:41 marka Exp $
+# $Id: clean.sh,v 1.5 2007/06/18 23:47:30 tbox Exp $
 
 rm -f *.dig *.good
 

diff --git a/bin/tests/system/sortlist/ns1/example.db b/bin/tests/system/sortlist/ns1/example.db
index dba9e4625e0ef332d85165c51f8d5fa9f3efea1f..879e187253130f0f56e2b2809ffe6bb433c20ee8 100644 (file)
--- a/bin/tests/system/sortlist/ns1/example.db
+++ b/bin/tests/system/sortlist/ns1/example.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: example.db,v 1.5 2004/11/23 05:23:40 marka Exp $
+; $Id: example.db,v 1.6 2007/06/18 23:47:30 tbox Exp $
 
 $TTL 300       ; 5 minutes
 @                      IN SOA  ns1.example. hostmaster.example. (

diff --git a/bin/tests/system/sortlist/ns1/named.conf b/bin/tests/system/sortlist/ns1/named.conf
index 6c03b1daf46b8227bb970a6bd7a7819c24b0b8b4..724749bb09b1c43586d8a242935d6640232279e8 100644 (file)
--- a/bin/tests/system/sortlist/ns1/named.conf
+++ b/bin/tests/system/sortlist/ns1/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.8 2004/03/05 05:02:44 marka Exp $ */
+/* $Id: named.conf,v 1.9 2007/06/18 23:47:30 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/sortlist/ns1/root.db b/bin/tests/system/sortlist/ns1/root.db
index 608ffd98467753c5a4e13c9687ee8c76f62edbfc..cf8068fef777778ca28c43255b22bafb2506150c 100644 (file)
--- a/bin/tests/system/sortlist/ns1/root.db
+++ b/bin/tests/system/sortlist/ns1/root.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: root.db,v 1.3 2004/03/05 05:02:44 marka Exp $
+; $Id: root.db,v 1.4 2007/06/18 23:47:30 tbox Exp $
 
 $TTL 300
 .                      IN SOA  gson.nominum.com. a.root.servers.nil. (

diff --git a/bin/tests/system/sortlist/tests.sh b/bin/tests/system/sortlist/tests.sh
index 3c95496d208ea94c4050b3e1962db236efebe8f9..31467e424a2aa83b23631a5ae0ba70f8f82d0afb 100644 (file)
--- a/bin/tests/system/sortlist/tests.sh
+++ b/bin/tests/system/sortlist/tests.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,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.6 2004/03/05 05:02:42 marka Exp $
+# $Id: tests.sh,v 1.7 2007/06/18 23:47:30 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/start.pl b/bin/tests/system/start.pl
index 69e19e5c9f2cc21328572c36e481fa5f9d86731a..d3f7275730b536b32ff3f909acc1b0c8116cb6a7 100644 (file)
--- a/bin/tests/system/start.pl
+++ b/bin/tests/system/start.pl
@@ -3,7 +3,7 @@
 # Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: start.pl,v 1.9 2006/03/05 23:58:52 marka Exp $
+# $Id: start.pl,v 1.10 2007/06/18 23:47:27 tbox Exp $
 
 # Framework for starting test servers.
 # Based on the type of server specified, check for port availability, remove

diff --git a/bin/tests/system/start.sh b/bin/tests/system/start.sh
index a0f4aacb1066634ab09aed7738c57c71e73aa252..7c128db83efaedd72ffd544046f466628cede2f4 100644 (file)
--- a/bin/tests/system/start.sh
+++ b/bin/tests/system/start.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: start.sh,v 1.41 2007/01/09 03:11:15 marka Exp $
+# $Id: start.sh,v 1.42 2007/06/18 23:47:27 tbox Exp $
 
 . ./conf.sh
 $PERL start.pl "$@"

diff --git a/bin/tests/system/stop.pl b/bin/tests/system/stop.pl
index 82954e46b70f7ad51c6cb1932dc527cb6ecafa83..e11e0bd5853ae558908ddcbe6bfebea224a042c0 100644 (file)
--- a/bin/tests/system/stop.pl
+++ b/bin/tests/system/stop.pl
@@ -3,7 +3,7 @@
 # Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: stop.pl,v 1.10 2006/03/05 23:58:52 marka Exp $
+# $Id: stop.pl,v 1.11 2007/06/18 23:47:27 tbox Exp $
 
 # Framework for stopping test servers
 # Based on the type of server specified, signal the server to stop, wait

diff --git a/bin/tests/system/stop.sh b/bin/tests/system/stop.sh
index cba9bfb5d5a6a90c25712e224efcf70f07aee0e2..5eb6cddca407f4b2e1bc50ff6cdc8b848faa722c 100644 (file)
--- a/bin/tests/system/stop.sh
+++ b/bin/tests/system/stop.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: stop.sh,v 1.24 2007/01/09 03:11:15 marka Exp $
+# $Id: stop.sh,v 1.25 2007/06/18 23:47:27 tbox Exp $
 
 . ./conf.sh
 $PERL ./stop.pl "$@"

diff --git a/bin/tests/system/stress/clean.sh b/bin/tests/system/stress/clean.sh
index 1e423ac7686124b3d72505db0b1b75d9f2c0e965..142c7ee4b3bb95249d1b92f1c7cb524db3467ff8 100644 (file)
--- a/bin/tests/system/stress/clean.sh
+++ b/bin/tests/system/stress/clean.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.3 2004/03/05 05:02:47 marka Exp $
+# $Id: clean.sh,v 1.4 2007/06/18 23:47:30 tbox Exp $
 
 rm -f reload.pid
 

diff --git a/bin/tests/system/stress/ns1/named.conf b/bin/tests/system/stress/ns1/named.conf
index 77f7392a098b19c298b0f87cdcfffd4bf7b4f7fc..094f03b6e871a7adec2ef497cc486fa221f89459 100644 (file)
--- a/bin/tests/system/stress/ns1/named.conf
+++ b/bin/tests/system/stress/ns1/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.4 2004/03/05 05:02:50 marka Exp $ */
+/* $Id: named.conf,v 1.5 2007/06/18 23:47:30 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/stress/ns2/named.conf b/bin/tests/system/stress/ns2/named.conf
index faccd20106aeeffce39ef17b385fd39c7c88c93f..97016c5f74218e47929f89cc665b4811d2325eb2 100644 (file)
--- a/bin/tests/system/stress/ns2/named.conf
+++ b/bin/tests/system/stress/ns2/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.5 2004/03/05 05:02:52 marka Exp $ */
+/* $Id: named.conf,v 1.6 2007/06/18 23:47:30 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/stress/ns3/named.conf b/bin/tests/system/stress/ns3/named.conf
index 04354a2ff0f1beebc6d57ce8b13a7656bad2e6f0..9ff09d771dfacc5ca3c5369a075be827a88f3575 100644 (file)
--- a/bin/tests/system/stress/ns3/named.conf
+++ b/bin/tests/system/stress/ns3/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.7 2007/04/26 23:46:51 tbox Exp $ */
+/* $Id: named.conf,v 1.8 2007/06/18 23:47:30 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/stress/ns4/named.conf b/bin/tests/system/stress/ns4/named.conf
index 4f7df70f28b2c5bc7870b60dcd9db3579b979b55..e40a0a5009c4c0f5de671486c7de1b422ef70521 100644 (file)
--- a/bin/tests/system/stress/ns4/named.conf
+++ b/bin/tests/system/stress/ns4/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.7 2007/04/26 23:46:52 tbox Exp $ */
+/* $Id: named.conf,v 1.8 2007/06/18 23:47:31 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/stress/setup.pl b/bin/tests/system/stress/setup.pl
index 156f6141e3143bf7cdf7743e3ed60f1482b705d8..aaabe4408767ba553549b3507c02ff0b3324e2c2 100644 (file)
--- a/bin/tests/system/stress/setup.pl
+++ b/bin/tests/system/stress/setup.pl
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,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.4 2004/03/05 05:02:48 marka Exp $
+# $Id: setup.pl,v 1.5 2007/06/18 23:47:30 tbox Exp $
 
 #
 # Set up test data for zone transfer quota tests.

diff --git a/bin/tests/system/stress/setup.sh b/bin/tests/system/stress/setup.sh
index 85d81d527278ed037a0df756e51a98c51913de44..155430c549f802dd274ff084a99ae04cc2da7151 100644 (file)
--- a/bin/tests/system/stress/setup.sh
+++ b/bin/tests/system/stress/setup.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: setup.sh,v 1.3 2004/03/05 05:02:48 marka Exp $
+# $Id: setup.sh,v 1.4 2007/06/18 23:47:30 tbox Exp $
 
 #
 # Set up test data for zone transfer quota tests.

diff --git a/bin/tests/system/stress/tests.sh b/bin/tests/system/stress/tests.sh
index 63b9647ddabaee38a6005eb33e06175abb08ad96..f0f0c8f89b2b4ef0d97cc0c3fe05079006cb66f8 100644 (file)
--- a/bin/tests/system/stress/tests.sh
+++ b/bin/tests/system/stress/tests.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,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.3 2004/03/05 05:02:48 marka Exp $
+# $Id: tests.sh,v 1.4 2007/06/18 23:47:30 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/stress/update.pl b/bin/tests/system/stress/update.pl
index b96bcddc7939f69428493ceaa8decb589ee663a8..1ef3543e6781c4d5fd9c2309c1ef1ef6cda4ecbf 100644 (file)
--- a/bin/tests/system/stress/update.pl
+++ b/bin/tests/system/stress/update.pl
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -37,7 +37,7 @@
 #
 #    perl -MCPAN -e "install Net::DNS"
 #
-# $Id: update.pl,v 1.3 2004/03/05 05:02:48 marka Exp $
+# $Id: update.pl,v 1.4 2007/06/18 23:47:30 tbox Exp $
 #
 
 use Getopt::Std;

diff --git a/bin/tests/system/stub/clean.sh b/bin/tests/system/stub/clean.sh
index bbbe742884c26329be7fd4010efa24057ec57fc6..6b0ab1c72f3a745ec8d5384b2e89c46c15285799 100644 (file)
--- a/bin/tests/system/stub/clean.sh
+++ b/bin/tests/system/stub/clean.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.7 2004/03/05 05:02:59 marka Exp $
+# $Id: clean.sh,v 1.8 2007/06/18 23:47:31 tbox Exp $
 
 #
 # Clean up after stub tests.

diff --git a/bin/tests/system/stub/ns1/named.conf b/bin/tests/system/stub/ns1/named.conf
index ee0689d60cd4fd6df99f83316c412898048088c4..a4180ea002a47f4a1312e97cf58df187084c3625 100644 (file)
--- a/bin/tests/system/stub/ns1/named.conf
+++ b/bin/tests/system/stub/ns1/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.12 2004/03/05 05:03:01 marka Exp $ */
+/* $Id: named.conf,v 1.13 2007/06/18 23:47:31 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/stub/ns1/root.db b/bin/tests/system/stub/ns1/root.db
index 3b91a34acc6dc55a39c9ad13942240221cf8e63a..5606ae706cd0c4ff59d6c1fc578b3e38608b02a1 100644 (file)
--- a/bin/tests/system/stub/ns1/root.db
+++ b/bin/tests/system/stub/ns1/root.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: root.db,v 1.7 2004/03/05 05:03:01 marka Exp $
+; $Id: root.db,v 1.8 2007/06/18 23:47:31 tbox Exp $
 
 $TTL 300
 .                      IN SOA  gson.nominum.com. a.root.servers.nil. (

diff --git a/bin/tests/system/stub/ns2/child.example.db b/bin/tests/system/stub/ns2/child.example.db
index a6730a0769ca7bae4695d41ec22c521741301604..8403f46aa993260af2e3f53022d42ae896eee8e4 100644 (file)
--- a/bin/tests/system/stub/ns2/child.example.db
+++ b/bin/tests/system/stub/ns2/child.example.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: child.example.db,v 1.7 2004/03/05 05:03:03 marka Exp $
+; $Id: child.example.db,v 1.8 2007/06/18 23:47:31 tbox Exp $
 
 $TTL 300       ; 5 minutes
 child.example.         IN SOA  ns2.child.example. hostmaster.child.example. (

diff --git a/bin/tests/system/stub/ns2/named.conf b/bin/tests/system/stub/ns2/named.conf
index ccaaa65d2fd22d6630ab4c5cb9a726de13f25395..e046f8aaa199dd8efbfba577c467a45ff68ba7af 100644 (file)
--- a/bin/tests/system/stub/ns2/named.conf
+++ b/bin/tests/system/stub/ns2/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.12 2004/03/05 05:03:04 marka Exp $ */
+/* $Id: named.conf,v 1.13 2007/06/18 23:47:31 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/stub/ns3/example.db b/bin/tests/system/stub/ns3/example.db
index 63560109d44bc9b15b39ed7a8e37d04394104e1c..d89731f043f1d515b7f82219d01b274fcfbc6a8b 100644 (file)
--- a/bin/tests/system/stub/ns3/example.db
+++ b/bin/tests/system/stub/ns3/example.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: example.db,v 1.7 2004/03/05 05:03:08 marka Exp $
+; $Id: example.db,v 1.8 2007/06/18 23:47:31 tbox Exp $
 
 $ORIGIN .
 $TTL 300       ; 5 minutes

diff --git a/bin/tests/system/stub/ns3/named.conf b/bin/tests/system/stub/ns3/named.conf
index 7c7e43007d31287969d62cd225083dab8f1b8ed6..89ba16e91a72fed4cac67937cf6cee2010d829ce 100644 (file)
--- a/bin/tests/system/stub/ns3/named.conf
+++ b/bin/tests/system/stub/ns3/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.15 2007/04/26 23:46:52 tbox Exp $ */
+/* $Id: named.conf,v 1.16 2007/06/18 23:47:31 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/stub/tests.sh b/bin/tests/system/stub/tests.sh
index 91c5db5e127bf9a4e479ce5fc16f14bb44ed3426..efa7b05c9c939dc8560fb6427925435f6198899c 100644 (file)
--- a/bin/tests/system/stub/tests.sh
+++ b/bin/tests/system/stub/tests.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,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.12 2004/03/05 05:02:59 marka Exp $
+# $Id: tests.sh,v 1.13 2007/06/18 23:47:31 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/testsock.pl b/bin/tests/system/testsock.pl
index 07e87ae0591e5e90f57f836654bf5fd45e7d493c..59378f50dab5b3f08beb31c19823ae8a3ea6fb2f 100644 (file)
--- a/bin/tests/system/testsock.pl
+++ b/bin/tests/system/testsock.pl
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: testsock.pl,v 1.14 2004/03/05 04:59:13 marka Exp $
+# $Id: testsock.pl,v 1.15 2007/06/18 23:47:27 tbox Exp $
 
 # Test whether the interfaces on 10.53.0.* are up.
 

diff --git a/bin/tests/system/tkey/Makefile.in b/bin/tests/system/tkey/Makefile.in
index 9aa80fc51793e74d41fbe581e1787b0a57bd0fd4..20510bfb4787e72f9cfdec7f02f27602830ab122 100644 (file)
--- a/bin/tests/system/tkey/Makefile.in
+++ b/bin/tests/system/tkey/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001, 2002  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.9 2004/07/20 07:13:38 marka Exp $
+# $Id: Makefile.in,v 1.10 2007/06/18 23:47:31 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/bin/tests/system/tkey/clean.sh b/bin/tests/system/tkey/clean.sh
index b97da604cb111d7fd8ce446b840f725fa0835d0c..89de2b3f8800bcfd49168b4d2e4414bcb52565e0 100644 (file)
--- a/bin/tests/system/tkey/clean.sh
+++ b/bin/tests/system/tkey/clean.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.3 2004/03/05 05:03:12 marka Exp $
+# $Id: clean.sh,v 1.4 2007/06/18 23:47:31 tbox Exp $
 
 rm -f dig.out.* random.data ns1/named.conf
 rm -f K* ns1/K*

diff --git a/bin/tests/system/tkey/keycreate.c b/bin/tests/system/tkey/keycreate.c
index 6419a74ca55654c4afd25807de4b8015c8cc80a9..e0958eaa3915141e56ddca5ea1cc9a298a47839a 100644 (file)
--- a/bin/tests/system/tkey/keycreate.c
+++ b/bin/tests/system/tkey/keycreate.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: keycreate.c,v 1.13 2005/11/30 23:52:54 marka Exp $ */
+/* $Id: keycreate.c,v 1.14 2007/06/18 23:47:31 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/tests/system/tkey/keydelete.c b/bin/tests/system/tkey/keydelete.c
index 5fb509b41289a5298c97e8404ad35248fe582882..6f8e5a1f0fb070ad9686b518e44ebe91b89156dc 100644 (file)
--- a/bin/tests/system/tkey/keydelete.c
+++ b/bin/tests/system/tkey/keydelete.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: keydelete.c,v 1.9 2005/11/30 23:52:54 marka Exp $ */
+/* $Id: keydelete.c,v 1.10 2007/06/18 23:47:31 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/tests/system/tkey/ns1/named.conf.in b/bin/tests/system/tkey/ns1/named.conf.in
index 863b4658679ab2d3f32551b4611fce69074bfc8b..2d25cb64df7fa418e99ec74f701f793d7b02fc92 100644 (file)
--- a/bin/tests/system/tkey/ns1/named.conf.in
+++ b/bin/tests/system/tkey/ns1/named.conf.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf.in,v 1.4 2004/03/05 05:03:16 marka Exp $ */
+/* $Id: named.conf.in,v 1.5 2007/06/18 23:47:31 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/tkey/ns1/setup.sh b/bin/tests/system/tkey/ns1/setup.sh
index e629c7fb187bb93005352a9c750548db153dca6d..c33059a9d8fd692b519e91599ca9fd28a8c3bd56 100644 (file)
--- a/bin/tests/system/tkey/ns1/setup.sh
+++ b/bin/tests/system/tkey/ns1/setup.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: setup.sh,v 1.6 2004/06/11 00:27:06 marka Exp $
+# $Id: setup.sh,v 1.7 2007/06/18 23:47:31 tbox Exp $
 
 RANDFILE=../random.data
 

diff --git a/bin/tests/system/tkey/prereq.sh b/bin/tests/system/tkey/prereq.sh
index c79d79e45c6fcb32f49c2e73835f3de2ae1764d6..7dd637061a12ba76aad68f45a593162fa6246cc6 100644 (file)
--- a/bin/tests/system/tkey/prereq.sh
+++ b/bin/tests/system/tkey/prereq.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: prereq.sh,v 1.8 2006/01/04 00:37:24 marka Exp $
+# $Id: prereq.sh,v 1.9 2007/06/18 23:47:31 tbox Exp $
 
 ../../genrandom 400 random.data
 

diff --git a/bin/tests/system/tkey/setup.sh b/bin/tests/system/tkey/setup.sh
index 4c6a4dcdd32b6eb65dfec13f69a5f6de73472aad..bb39baf8e8e232a977359708f45f7654239d05ae 100644 (file)
--- a/bin/tests/system/tkey/setup.sh
+++ b/bin/tests/system/tkey/setup.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: setup.sh,v 1.3 2004/03/05 05:03:13 marka Exp $
+# $Id: setup.sh,v 1.4 2007/06/18 23:47:31 tbox Exp $
 
 RANDFILE=random.data
 

diff --git a/bin/tests/system/tkey/tests.sh b/bin/tests/system/tkey/tests.sh
index fadceabe3096c62ffc620cdd242557c3ef2638a6..031e6f447db36821998350d06d850167607811e3 100644 (file)
--- a/bin/tests/system/tkey/tests.sh
+++ b/bin/tests/system/tkey/tests.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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,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.5 2004/06/11 00:27:06 marka Exp $
+# $Id: tests.sh,v 1.6 2007/06/18 23:47:31 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/tsig/clean.sh b/bin/tests/system/tsig/clean.sh
index 339fde188e02ec1f710e61ed2418fb70e071c32f..323137642be99bc5ab156f821d1580c7b0c0609d 100644 (file)
--- a/bin/tests/system/tsig/clean.sh
+++ b/bin/tests/system/tsig/clean.sh
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2005, 2006  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: clean.sh,v 1.3 2006/01/27 23:57:46 marka Exp $
+# $Id: clean.sh,v 1.4 2007/06/18 23:47:31 tbox Exp $
 
 #
 # Clean up after tsig tests.

diff --git a/bin/tests/system/tsig/ns1/example.db b/bin/tests/system/tsig/ns1/example.db
index 8514607db5a941f5f0c40d0ab9b68f277c443e0b..7d27960eaf07360874dd8cdf06bb719c7fc761a2 100644 (file)
--- a/bin/tests/system/tsig/ns1/example.db
+++ b/bin/tests/system/tsig/ns1/example.db
@@ -1,6 +1,6 @@
 ; Copyright (C) 2005, 2006  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.
 ;
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: example.db,v 1.3 2006/01/27 23:57:46 marka Exp $
+; $Id: example.db,v 1.4 2007/06/18 23:47:31 tbox Exp $
 
 $ORIGIN .
 $TTL 300       ; 5 minutes

diff --git a/bin/tests/system/tsig/ns1/named.conf b/bin/tests/system/tsig/ns1/named.conf
index a5b07f13b243b7757e3e010810ff98e71a24ac9c..c5e462842dd5b67a05a9bbfc78f48f4671baf371 100644 (file)
--- a/bin/tests/system/tsig/ns1/named.conf
+++ b/bin/tests/system/tsig/ns1/named.conf
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2005, 2006  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.3 2006/01/27 23:57:46 marka Exp $ */
+/* $Id: named.conf,v 1.4 2007/06/18 23:47:31 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/tsig/tests.sh b/bin/tests/system/tsig/tests.sh
index dfe3803b257a85936ddd296dd2c3f2a8f3a9fe1a..89c1bb2ac163cceeaf5280de568121a3be43ad94 100644 (file)
--- a/bin/tests/system/tsig/tests.sh
+++ b/bin/tests/system/tsig/tests.sh
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2005, 2006  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.3 2006/01/27 23:57:46 marka Exp $
+# $Id: tests.sh,v 1.4 2007/06/18 23:47:31 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/unknown/clean.sh b/bin/tests/system/unknown/clean.sh
index 384f2fcbe973bc067f4095a7191777f3cd5da82b..b6be0ef6f08a705e1f317b40e7533ee5e502ab22 100644 (file)
--- a/bin/tests/system/unknown/clean.sh
+++ b/bin/tests/system/unknown/clean.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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 +15,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.4 2004/03/05 05:03:18 marka Exp $
+# $Id: clean.sh,v 1.5 2007/06/18 23:47:31 tbox Exp $
 
 rm -f dig.out

diff --git a/bin/tests/system/unknown/ns1/broken1.db b/bin/tests/system/unknown/ns1/broken1.db
index 1c0ca5f2874b250a61a0a57967e940e0fca67c46..8c474fb64b36621cc4a4ea5955fd34110bd2d2e8 100644 (file)
--- a/bin/tests/system/unknown/ns1/broken1.db
+++ b/bin/tests/system/unknown/ns1/broken1.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: broken1.db,v 1.3 2004/03/05 05:03:20 marka Exp $
+; $Id: broken1.db,v 1.4 2007/06/18 23:47:31 tbox Exp $
 
 $TTL 300       ; 5 minutes
 @                      SOA     mname1. . (

diff --git a/bin/tests/system/unknown/ns1/broken2.db b/bin/tests/system/unknown/ns1/broken2.db
index 504830e2479529dfb4fe7aebbca436166f24695d..4abbad214f123909de9cbf016b077281404b7d76 100644 (file)
--- a/bin/tests/system/unknown/ns1/broken2.db
+++ b/bin/tests/system/unknown/ns1/broken2.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: broken2.db,v 1.3 2004/03/05 05:03:21 marka Exp $
+; $Id: broken2.db,v 1.4 2007/06/18 23:47:31 tbox Exp $
 
 $TTL 300       ; 5 minutes
 @                      SOA     mname1. . (

diff --git a/bin/tests/system/unknown/ns1/broken3.db b/bin/tests/system/unknown/ns1/broken3.db
index a08e7c626080329655f797c3e11d3a2fb7df61e2..f2f6cac9ca03eddafa7914ed14c1c1969e907536 100644 (file)
--- a/bin/tests/system/unknown/ns1/broken3.db
+++ b/bin/tests/system/unknown/ns1/broken3.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: broken3.db,v 1.3 2004/03/05 05:03:21 marka Exp $
+; $Id: broken3.db,v 1.4 2007/06/18 23:47:31 tbox Exp $
 
 $TTL 300       ; 5 minutes
 @                      SOA     mname1. . (

diff --git a/bin/tests/system/unknown/ns1/broken4.db b/bin/tests/system/unknown/ns1/broken4.db
index e48430c508ce999aa20b99e38dc5335c1cf3b74c..fedc3b295451c45114b059e4f3e340115a38a8c5 100644 (file)
--- a/bin/tests/system/unknown/ns1/broken4.db
+++ b/bin/tests/system/unknown/ns1/broken4.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: broken4.db,v 1.4 2004/03/05 05:03:21 marka Exp $
+; $Id: broken4.db,v 1.5 2007/06/18 23:47:31 tbox Exp $
 
 $TTL 300       ; 5 minutes
 @                      SOA     mname1. . (

diff --git a/bin/tests/system/unknown/ns1/broken5.db b/bin/tests/system/unknown/ns1/broken5.db
index e78119a1229a8ff8a69e16bd4aa4db77cb42ab59..58d4114e5b38f807328ea3da4693d4a9eee7e5e8 100644 (file)
--- a/bin/tests/system/unknown/ns1/broken5.db
+++ b/bin/tests/system/unknown/ns1/broken5.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: broken5.db,v 1.3 2004/03/05 05:03:21 marka Exp $
+; $Id: broken5.db,v 1.4 2007/06/18 23:47:31 tbox Exp $
 
 $TTL 300       ; 5 minutes
 @                      SOA     mname1. . (

diff --git a/bin/tests/system/unknown/ns1/class10.hints b/bin/tests/system/unknown/ns1/class10.hints
index 18fa34466826b68ea4cd2cb42185a80c4476c82d..46094e50deb3a9a8eb9f49785c869ba3f06b2def 100644 (file)
--- a/bin/tests/system/unknown/ns1/class10.hints
+++ b/bin/tests/system/unknown/ns1/class10.hints
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: class10.hints,v 1.3 2004/03/05 05:03:21 marka Exp $
+; $Id: class10.hints,v 1.4 2007/06/18 23:47:31 tbox Exp $
 
 $TTL 3600
 .      NS      ns.

diff --git a/bin/tests/system/unknown/ns1/example-class10.db b/bin/tests/system/unknown/ns1/example-class10.db
index f36e77226a31f7d61ac8924428e3e5d1f71e1dc0..3328587a4488be77f1c0fe8dc535fc3e0f84ff93 100644 (file)
--- a/bin/tests/system/unknown/ns1/example-class10.db
+++ b/bin/tests/system/unknown/ns1/example-class10.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: example-class10.db,v 1.3 2004/03/05 05:03:21 marka Exp $
+; $Id: example-class10.db,v 1.4 2007/06/18 23:47:31 tbox Exp $
 
 $TTL 300       ; 5 minutes
 @                      SOA     mname1. . (

diff --git a/bin/tests/system/unknown/ns1/example-in.db b/bin/tests/system/unknown/ns1/example-in.db
index b88c4cefecb5365b296ed799430e293307d9a3f7..b8ad680bb4c9c152738c80d6f69ebbd7786f5e22 100644 (file)
--- a/bin/tests/system/unknown/ns1/example-in.db
+++ b/bin/tests/system/unknown/ns1/example-in.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: example-in.db,v 1.5 2004/03/05 05:03:21 marka Exp $
+; $Id: example-in.db,v 1.6 2007/06/18 23:47:31 tbox Exp $
 
 $TTL 300       ; 5 minutes
 @                      SOA     mname1. . (

diff --git a/bin/tests/system/unknown/ns1/named.conf b/bin/tests/system/unknown/ns1/named.conf
index 9fdab42951049ffcedbf8cc35f57a8ecd0bfc796..d40332eee381aee3a3a0b0f9a3e82841859e76ec 100644 (file)
--- a/bin/tests/system/unknown/ns1/named.conf
+++ b/bin/tests/system/unknown/ns1/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.9 2004/03/05 05:03:21 marka Exp $ */
+/* $Id: named.conf,v 1.10 2007/06/18 23:47:31 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/unknown/tests.sh b/bin/tests/system/unknown/tests.sh
index 597fecc96489753eea2d9a6338a6378ee6834d80..46247fb1cefdcae8595656d1c0b59e02adbdee67 100644 (file)
--- a/bin/tests/system/unknown/tests.sh
+++ b/bin/tests/system/unknown/tests.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,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.8 2004/03/05 05:03:19 marka Exp $
+# $Id: tests.sh,v 1.9 2007/06/18 23:47:31 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/upforwd/clean.sh b/bin/tests/system/upforwd/clean.sh
index bde8ddd86f14df9da5abcd0bfaaca30b545eb16d..6b386bf7e04a4b2409b836a08f7f5cf7e467f3f1 100644 (file)
--- a/bin/tests/system/upforwd/clean.sh
+++ b/bin/tests/system/upforwd/clean.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,7 +15,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 2004/03/05 05:03:24 marka Exp $
+# $Id: clean.sh,v 1.7 2007/06/18 23:47:31 tbox Exp $
 
 #
 # Clean up after zone transfer tests.

diff --git a/bin/tests/system/upforwd/ns1/example1.db b/bin/tests/system/upforwd/ns1/example1.db
index da7f171f9ba18b500d4acb01dd1353daae76b721..71790205267f46e3967e1e461439f62857540cfb 100644 (file)
--- a/bin/tests/system/upforwd/ns1/example1.db
+++ b/bin/tests/system/upforwd/ns1/example1.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: example1.db,v 1.2 2004/03/05 05:03:26 marka Exp $
+; $Id: example1.db,v 1.3 2007/06/18 23:47:31 tbox Exp $
 
 @      3600    SOA     n1.example. hostmaster.ns1.example. (
                        1 3600 1200 604800 7200 )

diff --git a/bin/tests/system/upforwd/ns1/named.conf b/bin/tests/system/upforwd/ns1/named.conf
index 4b9c3ac0080512bd39c929a67eb18462b1ca765d..8d9d2fa0d9590bdcaa551ae0846d55af009c7d09 100644 (file)
--- a/bin/tests/system/upforwd/ns1/named.conf
+++ b/bin/tests/system/upforwd/ns1/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.10 2007/04/26 23:46:52 tbox Exp $ */
+/* $Id: named.conf,v 1.11 2007/06/18 23:47:31 tbox Exp $ */
 
 key "update.example." {
        algorithm "hmac-md5";

diff --git a/bin/tests/system/upforwd/ns2/named.conf b/bin/tests/system/upforwd/ns2/named.conf
index 1576bd8e3347663f4ccb9c2e7a2a7af5ba565647..57ad4b001409371028d85e774ac7b7885faa3451 100644 (file)
--- a/bin/tests/system/upforwd/ns2/named.conf
+++ b/bin/tests/system/upforwd/ns2/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.9 2007/04/26 23:46:52 tbox Exp $ */
+/* $Id: named.conf,v 1.10 2007/06/18 23:47:31 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/upforwd/ns3/named.conf b/bin/tests/system/upforwd/ns3/named.conf
index ca9dacf98ff8bec340742a7bbd898c90a9f59e48..b1fe854d0072bf040d7045bfd88cd940176a6f25 100644 (file)
--- a/bin/tests/system/upforwd/ns3/named.conf
+++ b/bin/tests/system/upforwd/ns3/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.9 2007/04/26 23:46:52 tbox Exp $ */
+/* $Id: named.conf,v 1.10 2007/06/18 23:47:31 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/upforwd/setup.sh b/bin/tests/system/upforwd/setup.sh
index fa8ed37d6bc93f594d67808503269e59da0216de..049962ebab7608cee5c35f72dad97fb44b99a18c 100644 (file)
--- a/bin/tests/system/upforwd/setup.sh
+++ b/bin/tests/system/upforwd/setup.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: setup.sh,v 1.6 2004/03/10 01:06:05 marka Exp $
+# $Id: setup.sh,v 1.7 2007/06/18 23:47:31 tbox Exp $
 
 cp -f ns1/example1.db ns1/example.db
 rm -f ns1/example.db.jnl ns2/example.bk ns2/example.bk.jnl

diff --git a/bin/tests/system/upforwd/tests.sh b/bin/tests/system/upforwd/tests.sh
index f0556ca2d83c7f8b9516df62e2300275535f4e7e..d8410f0cd68893a8c298bc9b6f6459e6efb3fa0a 100644 (file)
--- a/bin/tests/system/upforwd/tests.sh
+++ b/bin/tests/system/upforwd/tests.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,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.8 2004/03/05 05:03:24 marka Exp $ 
+# $Id: tests.sh,v 1.9 2007/06/18 23:47:31 tbox Exp $ 
 
 # ns1 = stealth master
 # ns2 = slave with update forwarding disabled; not currently used

diff --git a/bin/tests/system/v6synth/clean.sh b/bin/tests/system/v6synth/clean.sh
index 7408fccc9d9c328394578ea40766a87262dd53d8..a897f98983d2c583da01663ad1117ca857a3a860 100644 (file)
--- a/bin/tests/system/v6synth/clean.sh
+++ b/bin/tests/system/v6synth/clean.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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 +15,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.2 2004/03/05 05:03:33 marka Exp $
+# $Id: clean.sh,v 1.3 2007/06/18 23:47:31 tbox Exp $
 
 rm -f *.out

diff --git a/bin/tests/system/v6synth/ns1/named.conf b/bin/tests/system/v6synth/ns1/named.conf
index 68d02be4af0de7fed84972808b83365099ea900f..41b879b6f7bea9056705abdbdc73bf759a3376f3 100644 (file)
--- a/bin/tests/system/v6synth/ns1/named.conf
+++ b/bin/tests/system/v6synth/ns1/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.3 2004/03/05 05:03:35 marka Exp $ */
+/* $Id: named.conf,v 1.4 2007/06/18 23:47:31 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/v6synth/ns1/root.db b/bin/tests/system/v6synth/ns1/root.db
index 5eb211f2bd74ce81449e14213399065a42775ac7..8ee76e9b1fcdbc37c042620916709e0f803dac95 100644 (file)
--- a/bin/tests/system/v6synth/ns1/root.db
+++ b/bin/tests/system/v6synth/ns1/root.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: root.db,v 1.2 2004/03/05 05:03:35 marka Exp $
+; $Id: root.db,v 1.3 2007/06/18 23:47:31 tbox Exp $
 
 $TTL 300
 .                      IN SOA  gson.nominum.com. a.root.servers.nil. (

diff --git a/bin/tests/system/v6synth/ns2/example.db b/bin/tests/system/v6synth/ns2/example.db
index 2bd72062fe5dbd01ce3312743de5660db62e302b..2af053a75def02a25b135ff1440482e4a2656281 100644 (file)
--- a/bin/tests/system/v6synth/ns2/example.db
+++ b/bin/tests/system/v6synth/ns2/example.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: example.db,v 1.2 2004/03/05 05:03:38 marka Exp $
+; $Id: example.db,v 1.3 2007/06/18 23:47:31 tbox Exp $
 
 $TTL 86400
 @                       IN SOA  ns2 hostmaster (

diff --git a/bin/tests/system/v6synth/ns2/ip6.arpa.db b/bin/tests/system/v6synth/ns2/ip6.arpa.db
index 37d9aa2b0748829825628aceac6a9a0a0cc902f9..baec805819e6bd71fb154162cb1f40cf8ee9c153 100644 (file)
--- a/bin/tests/system/v6synth/ns2/ip6.arpa.db
+++ b/bin/tests/system/v6synth/ns2/ip6.arpa.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2001, 2002  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: ip6.arpa.db,v 1.3 2004/03/05 05:03:38 marka Exp $
+; $Id: ip6.arpa.db,v 1.4 2007/06/18 23:47:31 tbox Exp $
 
 $TTL 86400
 @                       IN SOA  ns2 hostmaster (

diff --git a/bin/tests/system/v6synth/ns2/ip6.int.db b/bin/tests/system/v6synth/ns2/ip6.int.db
index f9ced208b2a02e1a8843a5954471286a8b35f8e4..8f61d25cf729063d7827c476e1131b3b928abf05 100644 (file)
--- a/bin/tests/system/v6synth/ns2/ip6.int.db
+++ b/bin/tests/system/v6synth/ns2/ip6.int.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: ip6.int.db,v 1.2 2004/03/05 05:03:38 marka Exp $
+; $Id: ip6.int.db,v 1.3 2007/06/18 23:47:31 tbox Exp $
 
 $TTL 86400
 @                       IN SOA  ns2 hostmaster (

diff --git a/bin/tests/system/v6synth/ns2/named.conf b/bin/tests/system/v6synth/ns2/named.conf
index 5fb04879923c7ce94087bfc267aa131b070ace19..1eb6d337f0d41cbd1f56bdca3f0435c45b66b260 100644 (file)
--- a/bin/tests/system/v6synth/ns2/named.conf
+++ b/bin/tests/system/v6synth/ns2/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.5 2007/04/26 23:46:52 tbox Exp $ */
+/* $Id: named.conf,v 1.6 2007/06/18 23:47:31 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/v6synth/ns3/named.conf b/bin/tests/system/v6synth/ns3/named.conf
index 8a7273534e87f07924a00fc0df310078cd36720f..bacaab78927cb2d2b4c9dc065e3389555c8acde2 100644 (file)
--- a/bin/tests/system/v6synth/ns3/named.conf
+++ b/bin/tests/system/v6synth/ns3/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.5 2007/04/26 23:46:52 tbox Exp $ */
+/* $Id: named.conf,v 1.6 2007/06/18 23:47:31 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/v6synth/tests.sh b/bin/tests/system/v6synth/tests.sh
index 89b80edee80303716456499cbec0cabf405b6bd9..c5ceb8287bef8b258c1abf8c8cdf5a19dc0625ff 100644 (file)
--- a/bin/tests/system/v6synth/tests.sh
+++ b/bin/tests/system/v6synth/tests.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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,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.2 2004/03/05 05:03:33 marka Exp $
+# $Id: tests.sh,v 1.3 2007/06/18 23:47:31 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/views/clean.sh b/bin/tests/system/views/clean.sh
index b7f3745b9a225538d980e7b5dbcf8ee5ec5ad947..0ae28f5502c5b6c138711faf4f9e194c39969df8 100644 (file)
--- a/bin/tests/system/views/clean.sh
+++ b/bin/tests/system/views/clean.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.11 2005/09/13 00:35:29 marka Exp $
+# $Id: clean.sh,v 1.12 2007/06/18 23:47:31 tbox Exp $
 
 #
 # Clean up after zone transfer tests.

diff --git a/bin/tests/system/views/ns1/named.conf b/bin/tests/system/views/ns1/named.conf
index 530b6b9af24f640e5d2d53f3fa1cac474edc43ed..3873fd4b6df8155bf31f23ab229dac32eba67935 100644 (file)
--- a/bin/tests/system/views/ns1/named.conf
+++ b/bin/tests/system/views/ns1/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.15 2004/03/05 05:03:46 marka Exp $ */
+/* $Id: named.conf,v 1.16 2007/06/18 23:47:31 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/views/ns1/root.db b/bin/tests/system/views/ns1/root.db
index 360b6f5803b85e283af261b670e0f32138dda773..71b1fa03823f1ab183c32edbbefbea9e5f08e7aa 100644 (file)
--- a/bin/tests/system/views/ns1/root.db
+++ b/bin/tests/system/views/ns1/root.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: root.db,v 1.7 2004/03/05 05:03:46 marka Exp $
+; $Id: root.db,v 1.8 2007/06/18 23:47:32 tbox Exp $
 
 $TTL 300
 .                      IN SOA  gson.nominum.com. a.root.servers.nil. (

diff --git a/bin/tests/system/views/ns2/example1.db b/bin/tests/system/views/ns2/example1.db
index 057e79e8224884ff310ad53419d1cd23e98aeea1..b43670f71130b3056b2446aa5bdee9e144617b2a 100644 (file)
--- a/bin/tests/system/views/ns2/example1.db
+++ b/bin/tests/system/views/ns2/example1.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: example1.db,v 1.7 2004/03/05 05:03:48 marka Exp $
+; $Id: example1.db,v 1.8 2007/06/18 23:47:32 tbox Exp $
 
 $ORIGIN .
 $TTL 300       ; 5 minutes

diff --git a/bin/tests/system/views/ns2/example2.db b/bin/tests/system/views/ns2/example2.db
index 15f163d4ecb4fa9bf82f4bb84542227a05a3cd82..055afe78bc4da7ba4c0f22fb7dcf0f7460e6f1dd 100644 (file)
--- a/bin/tests/system/views/ns2/example2.db
+++ b/bin/tests/system/views/ns2/example2.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: example2.db,v 1.8 2004/11/23 05:23:41 marka Exp $
+; $Id: example2.db,v 1.9 2007/06/18 23:47:32 tbox Exp $
 
 $ORIGIN .
 $TTL 300       ; 5 minutes

diff --git a/bin/tests/system/views/ns2/internal.db b/bin/tests/system/views/ns2/internal.db
index 14892665435ed938162db057dbb76b9b3b66190e..fd815f7161a9217c5e5d313d26c67f2c59ea5edb 100644 (file)
--- a/bin/tests/system/views/ns2/internal.db
+++ b/bin/tests/system/views/ns2/internal.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: internal.db,v 1.7 2004/03/05 05:03:49 marka Exp $
+; $Id: internal.db,v 1.8 2007/06/18 23:47:32 tbox Exp $
 
 $ORIGIN .
 $TTL 300       ; 5 minutes

diff --git a/bin/tests/system/views/ns2/named1.conf b/bin/tests/system/views/ns2/named1.conf
index b4c1b8419f53428d85cb9d82a200787335cbb547..c47f002c72a5024f4e1466e0b56f21915359ff80 100644 (file)
--- a/bin/tests/system/views/ns2/named1.conf
+++ b/bin/tests/system/views/ns2/named1.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named1.conf,v 1.18 2004/03/05 05:03:49 marka Exp $ */
+/* $Id: named1.conf,v 1.19 2007/06/18 23:47:32 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/views/ns2/named2.conf b/bin/tests/system/views/ns2/named2.conf
index a79a40242ef6967a52940e21d21397cdc25c4688..a39f00e08fa67f7ed620f690201c48903c258a40 100644 (file)
--- a/bin/tests/system/views/ns2/named2.conf
+++ b/bin/tests/system/views/ns2/named2.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named2.conf,v 1.20 2004/03/05 05:03:49 marka Exp $ */
+/* $Id: named2.conf,v 1.21 2007/06/18 23:47:32 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/views/ns3/internal.db b/bin/tests/system/views/ns3/internal.db
index 27ae61f4b6662e16b3d459d64edb9a95042f76d6..dab859ea317fd9588adef457a9b0020e0d5b1a52 100644 (file)
--- a/bin/tests/system/views/ns3/internal.db
+++ b/bin/tests/system/views/ns3/internal.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: internal.db,v 1.7 2004/03/05 05:03:52 marka Exp $
+; $Id: internal.db,v 1.8 2007/06/18 23:47:32 tbox Exp $
 
 $ORIGIN .
 $TTL 300       ; 5 minutes

diff --git a/bin/tests/system/views/ns3/named1.conf b/bin/tests/system/views/ns3/named1.conf
index ed9cedb266b057ca820182492eb082e8328bbe03..abd7a88b1b00a080b5f167ee1dacd401a8455f69 100644 (file)
--- a/bin/tests/system/views/ns3/named1.conf
+++ b/bin/tests/system/views/ns3/named1.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named1.conf,v 1.17 2004/03/05 05:03:52 marka Exp $ */
+/* $Id: named1.conf,v 1.18 2007/06/18 23:47:32 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/views/ns3/named2.conf b/bin/tests/system/views/ns3/named2.conf
index 0cfcb89f795baa6f3872169968293ea2dbec2e8c..47618a4fee3c0c42e3524bee24e1362c483af950 100644 (file)
--- a/bin/tests/system/views/ns3/named2.conf
+++ b/bin/tests/system/views/ns3/named2.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named2.conf,v 1.17 2004/03/05 05:03:53 marka Exp $ */
+/* $Id: named2.conf,v 1.18 2007/06/18 23:47:32 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/views/setup.sh b/bin/tests/system/views/setup.sh
index e2fd03b1693c3e2ce2939e134ded031a30d7e544..26ce4e286dad7e5c8f2c68da423bc3323cf27aa7 100644 (file)
--- a/bin/tests/system/views/setup.sh
+++ b/bin/tests/system/views/setup.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: setup.sh,v 1.8 2004/03/10 01:06:06 marka Exp $
+# $Id: setup.sh,v 1.9 2007/06/18 23:47:31 tbox Exp $
 
 
 cp -f ns2/example1.db ns2/example.db

diff --git a/bin/tests/system/views/tests.sh b/bin/tests/system/views/tests.sh
index 77e0d2224894d2bf1b57a699251e310896d5f6bb..ffc936561923e423140b6665251d5fbac232c40a 100644 (file)
--- a/bin/tests/system/views/tests.sh
+++ b/bin/tests/system/views/tests.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,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.28 2004/03/10 01:06:06 marka Exp $
+# $Id: tests.sh,v 1.29 2007/06/18 23:47:31 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/xfer/clean.sh b/bin/tests/system/xfer/clean.sh
index 2735fbf1bc27516f6b1e04c0da50aff6207275b0..972ac3edd19c0697f4ec587e5bbedd5f4f682d49 100644 (file)
--- a/bin/tests/system/xfer/clean.sh
+++ b/bin/tests/system/xfer/clean.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.11 2004/03/05 05:03:55 marka Exp $
+# $Id: clean.sh,v 1.12 2007/06/18 23:47:32 tbox Exp $
 
 #
 # Clean up after zone transfer tests.

diff --git a/bin/tests/system/xfer/ns1/named.conf b/bin/tests/system/xfer/ns1/named.conf
index 3e987cb423e0e194e5a8f079f06833e41ce5b960..3ce988000179b0d88504d65ab7fa31f8239aabc9 100644 (file)
--- a/bin/tests/system/xfer/ns1/named.conf
+++ b/bin/tests/system/xfer/ns1/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.16 2004/03/05 05:03:57 marka Exp $ */
+/* $Id: named.conf,v 1.17 2007/06/18 23:47:32 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/xfer/ns1/root.db b/bin/tests/system/xfer/ns1/root.db
index 43b8f6f4522c2e463d0fb711eba0c8a87a10fede..3dfeec18e22d727f8d661a02324926327a68a77b 100644 (file)
--- a/bin/tests/system/xfer/ns1/root.db
+++ b/bin/tests/system/xfer/ns1/root.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: root.db,v 1.8 2004/03/05 05:03:57 marka Exp $
+; $Id: root.db,v 1.9 2007/06/18 23:47:32 tbox Exp $
 
 $TTL 300
 .                      IN SOA  gson.nominum.com. a.root.servers.nil. (

diff --git a/bin/tests/system/xfer/ns2/named.conf b/bin/tests/system/xfer/ns2/named.conf
index 8fe3ed539b4e9133aac004b6f1b0bbead941b578..6c24405f3aa094939f01972a67e12947d853fae0 100644 (file)
--- a/bin/tests/system/xfer/ns2/named.conf
+++ b/bin/tests/system/xfer/ns2/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.21 2005/08/24 23:54:00 marka Exp $ */
+/* $Id: named.conf,v 1.22 2007/06/18 23:47:32 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/xfer/ns3/named.conf b/bin/tests/system/xfer/ns3/named.conf
index d04dffc1fdcba8d33af2e0adffe4d152a6253ac0..2dd1254ed220192371344553ba7b19316e07da88 100644 (file)
--- a/bin/tests/system/xfer/ns3/named.conf
+++ b/bin/tests/system/xfer/ns3/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.20 2007/04/26 23:46:52 tbox Exp $ */
+/* $Id: named.conf,v 1.21 2007/06/18 23:47:32 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/xfer/setup.sh b/bin/tests/system/xfer/setup.sh
index 965a36da385aede8d2f0c47e69d85960015789a2..4df36f92040881348c20fd67e0fef933b477905c 100644 (file)
--- a/bin/tests/system/xfer/setup.sh
+++ b/bin/tests/system/xfer/setup.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001, 2002  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: setup.sh,v 1.3 2004/03/05 05:03:55 marka Exp $
+# $Id: setup.sh,v 1.4 2007/06/18 23:47:32 tbox Exp $
 
 sh ../genzone.sh 2 3 >ns2/example.db
 sh ../genzone.sh 2 3 >ns2/tsigzone.db

diff --git a/bin/tests/system/xfer/tests.sh b/bin/tests/system/xfer/tests.sh
index a74c5ed694c64949e09dd2af9ed7032d9d4fab70..24d98d6b5116ff868302397ace15d0b3d41eb0f0 100644 (file)
--- a/bin/tests/system/xfer/tests.sh
+++ b/bin/tests/system/xfer/tests.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,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.29 2005/11/03 00:02:56 marka Exp $
+# $Id: tests.sh,v 1.30 2007/06/18 23:47:32 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/xferquota/clean.sh b/bin/tests/system/xferquota/clean.sh
index 52bfbc5659b30f003ad2340a4cf7fa7cd3615fac..7cd02f4786b391f666e1c8b2f1ed421e23679958 100644 (file)
--- a/bin/tests/system/xferquota/clean.sh
+++ b/bin/tests/system/xferquota/clean.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.11 2004/12/14 01:02:50 marka Exp $
+# $Id: clean.sh,v 1.12 2007/06/18 23:47:32 tbox Exp $
 
 #
 # Clean up after zone transfer quota tests.

diff --git a/bin/tests/system/xferquota/ns1/changing1.db b/bin/tests/system/xferquota/ns1/changing1.db
index 34b8da2c3bdaa2244d9de1cbf73376d95d501a21..4189d2a956f6bc718c30229aaba0adf15f6f196f 100644 (file)
--- a/bin/tests/system/xferquota/ns1/changing1.db
+++ b/bin/tests/system/xferquota/ns1/changing1.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: changing1.db,v 1.8 2004/11/23 05:23:43 marka Exp $
+; $Id: changing1.db,v 1.9 2007/06/18 23:47:32 tbox Exp $
 
 $TTL   600
 

diff --git a/bin/tests/system/xferquota/ns1/changing2.db b/bin/tests/system/xferquota/ns1/changing2.db
index c213c657926d1b88e2b725dbf9c4d50a2538f7b5..b1d7fb933b206f76d25d26b284d272b495d86da9 100644 (file)
--- a/bin/tests/system/xferquota/ns1/changing2.db
+++ b/bin/tests/system/xferquota/ns1/changing2.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: changing2.db,v 1.8 2004/11/23 05:23:44 marka Exp $
+; $Id: changing2.db,v 1.9 2007/06/18 23:47:32 tbox Exp $
 
 $TTL   600
 

diff --git a/bin/tests/system/xferquota/ns1/named.conf b/bin/tests/system/xferquota/ns1/named.conf
index 23d314122670b551e1d87967c429d958aa2bc3ae..6d41da0e8acbd5bdfe69c7b3ab79f502c5544b89 100644 (file)
--- a/bin/tests/system/xferquota/ns1/named.conf
+++ b/bin/tests/system/xferquota/ns1/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.19 2004/03/05 05:04:06 marka Exp $ */
+/* $Id: named.conf,v 1.20 2007/06/18 23:47:32 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/xferquota/ns1/root.db b/bin/tests/system/xferquota/ns1/root.db
index 546fc09e90db4eafc8494ce0110c0322cf7ca31a..39590a7ab81bdea435a93974ee36a18b45d7662f 100644 (file)
--- a/bin/tests/system/xferquota/ns1/root.db
+++ b/bin/tests/system/xferquota/ns1/root.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: root.db,v 1.8 2004/03/05 05:04:06 marka Exp $
+; $Id: root.db,v 1.9 2007/06/18 23:47:32 tbox Exp $
 
 $TTL 300
 .                      IN SOA  gson.nominum.com. a.root.servers.nil. (

diff --git a/bin/tests/system/xferquota/ns2/example.db b/bin/tests/system/xferquota/ns2/example.db
index 47be735c7d3c41944a52577ffb6a6a476e540938..23f1ee76c0aeeedcc775b36eaf745668f2d09fd8 100644 (file)
--- a/bin/tests/system/xferquota/ns2/example.db
+++ b/bin/tests/system/xferquota/ns2/example.db
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000-2003  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: example.db,v 1.10 2004/03/05 05:04:07 marka Exp $
+; $Id: example.db,v 1.11 2007/06/18 23:47:32 tbox Exp $
 
 $ORIGIN .
 $TTL 300       ; 5 minutes

diff --git a/bin/tests/system/xferquota/ns2/named.conf b/bin/tests/system/xferquota/ns2/named.conf
index ff1c1bc13fb46d27b1cd0c7bb2d50c97d83cceb3..b19c43066a2f1dae816c27491211c397b7503626 100644 (file)
--- a/bin/tests/system/xferquota/ns2/named.conf
+++ b/bin/tests/system/xferquota/ns2/named.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.20 2004/11/23 05:23:44 marka Exp $ */
+/* $Id: named.conf,v 1.21 2007/06/18 23:47:32 tbox Exp $ */
 
 controls { /* empty */ };
 

diff --git a/bin/tests/system/xferquota/setup.pl b/bin/tests/system/xferquota/setup.pl
index 20893acc86c54e835f4cbf71e8bbf06fbd5e454b..432572b303960ae0a937ec1eba1c095c873cbd93 100644 (file)
--- a/bin/tests/system/xferquota/setup.pl
+++ b/bin/tests/system/xferquota/setup.pl
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,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.12 2004/11/23 05:23:42 marka Exp $
+# $Id: setup.pl,v 1.13 2007/06/18 23:47:32 tbox Exp $
 
 #
 # Set up test data for zone transfer quota tests.

diff --git a/bin/tests/system/xferquota/setup.sh b/bin/tests/system/xferquota/setup.sh
index ca932b665f3964e77b3e13158531885d20b75bd5..4bbe12f722a647ad2d8665f667237908e83363f2 100644 (file)
--- a/bin/tests/system/xferquota/setup.sh
+++ b/bin/tests/system/xferquota/setup.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: setup.sh,v 1.13 2004/03/10 01:06:06 marka Exp $
+# $Id: setup.sh,v 1.14 2007/06/18 23:47:32 tbox Exp $
 
 #
 # Set up test data for zone transfer quota tests.

diff --git a/bin/tests/system/xferquota/tests.sh b/bin/tests/system/xferquota/tests.sh
index a0e94ff9f17d96aeedbf3fff3d36ad524aa0b3ff..99c1e378cfb9ebf5f67ff734d54b66f39f78e06f 100644 (file)
--- a/bin/tests/system/xferquota/tests.sh
+++ b/bin/tests/system/xferquota/tests.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,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.23 2004/11/23 05:23:42 marka Exp $
+# $Id: tests.sh,v 1.24 2007/06/18 23:47:32 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/zonechecks/a.db b/bin/tests/system/zonechecks/a.db
index c0aebaef952ed85bc815eaf796c2a6cb4122f5f9..f8077b545e0f265ab25c4e803f4f972310f98aa7 100644 (file)
--- a/bin/tests/system/zonechecks/a.db
+++ b/bin/tests/system/zonechecks/a.db
@@ -1,6 +1,6 @@
 ; Copyright (C) 2004  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.
 ;
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: a.db,v 1.3 2004/11/24 23:50:56 marka Exp $
+; $Id: a.db,v 1.4 2007/06/18 23:47:32 tbox Exp $
 
 @      3600    IN SOA  ns hostmaster 1 3600 1200 604800 3600
 @      3600    IN NS   127.0.0.1

diff --git a/bin/tests/system/zonechecks/aaaa.db b/bin/tests/system/zonechecks/aaaa.db
index 3709f4ec1f3d64a606ea4ad45c8a1431f04c5f1a..9a8a21072a26a25dcfa91468f3cc123a5b3b6143 100644 (file)
--- a/bin/tests/system/zonechecks/aaaa.db
+++ b/bin/tests/system/zonechecks/aaaa.db
@@ -1,6 +1,6 @@
 ; Copyright (C) 2004  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.
 ;
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: aaaa.db,v 1.3 2004/11/24 23:50:56 marka Exp $
+; $Id: aaaa.db,v 1.4 2007/06/18 23:47:32 tbox Exp $
 
 @      3600    IN SOA  ns hostmaster 1 3600 1200 604800 3600
 @      3600    IN NS   ::1

diff --git a/bin/tests/system/zonechecks/clean.sh b/bin/tests/system/zonechecks/clean.sh
index b02a51b0d7ec682bd8c1912fbde83e2eea640bfe..b651f12f1807836ba397c18102a1839ef03394b8 100644 (file)
--- a/bin/tests/system/zonechecks/clean.sh
+++ b/bin/tests/system/zonechecks/clean.sh
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2004  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,6 +14,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.3 2004/11/24 23:50:56 marka Exp $
+# $Id: clean.sh,v 1.4 2007/06/18 23:47:32 tbox Exp $
 
 rm -f *.out

diff --git a/bin/tests/system/zonechecks/cname.db b/bin/tests/system/zonechecks/cname.db
index 98149e55d258ad3bc0fa736af05642a544204d4d..162833075130bb09ac28d5915a99638041f4d0cc 100644 (file)
--- a/bin/tests/system/zonechecks/cname.db
+++ b/bin/tests/system/zonechecks/cname.db
@@ -1,6 +1,6 @@
 ; Copyright (C) 2004  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.
 ;
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: cname.db,v 1.3 2004/11/24 23:50:56 marka Exp $
+; $Id: cname.db,v 1.4 2007/06/18 23:47:32 tbox Exp $
 
 @      3600    IN SOA  ns hostmaster 1 3600 1200 604800 3600
 @      3600    IN NS   ns

diff --git a/bin/tests/system/zonechecks/dname.db b/bin/tests/system/zonechecks/dname.db
index d5bb6230dd7f1a1500fccd755314a84514b2345b..35e18f7872d1886ad65c2c8ac774dc2b97836476 100644 (file)
--- a/bin/tests/system/zonechecks/dname.db
+++ b/bin/tests/system/zonechecks/dname.db
@@ -1,6 +1,6 @@
 ; Copyright (C) 2004  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.
 ;
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: dname.db,v 1.3 2004/11/24 23:50:57 marka Exp $
+; $Id: dname.db,v 1.4 2007/06/18 23:47:32 tbox Exp $
 
 @      3600    IN SOA  ns hostmaster 1 3600 1200 604800 3600
 @      3600    IN NS   ns

diff --git a/bin/tests/system/zonechecks/noaddress.db b/bin/tests/system/zonechecks/noaddress.db
index 9457795641f61d57628885ee1b687458092b29ed..6453b8299002f2d682540911ee2346dcf073f338 100644 (file)
--- a/bin/tests/system/zonechecks/noaddress.db
+++ b/bin/tests/system/zonechecks/noaddress.db
@@ -1,6 +1,6 @@
 ; Copyright (C) 2004  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.
 ;
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: noaddress.db,v 1.3 2004/11/24 23:50:57 marka Exp $
+; $Id: noaddress.db,v 1.4 2007/06/18 23:47:32 tbox Exp $
 
 @      3600    IN SOA  ns hostmaster 1 3600 1200 604800 3600
 @      3600    IN NS   ns

diff --git a/bin/tests/system/zonechecks/nxdomain.db b/bin/tests/system/zonechecks/nxdomain.db
index a439a7ac2a497679d89324dbb48676346741fa22..53f1dbcd799bd87bbd301a6a2a514e4abf2373f8 100644 (file)
--- a/bin/tests/system/zonechecks/nxdomain.db
+++ b/bin/tests/system/zonechecks/nxdomain.db
@@ -1,6 +1,6 @@
 ; Copyright (C) 2004  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.
 ;
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: nxdomain.db,v 1.3 2004/11/24 23:50:57 marka Exp $
+; $Id: nxdomain.db,v 1.4 2007/06/18 23:47:32 tbox Exp $
 
 @      3600    IN SOA  ns hostmaster 1 3600 1200 604800 3600
 @      3600    IN NS   ns

diff --git a/bin/tests/system/zonechecks/tests.sh b/bin/tests/system/zonechecks/tests.sh
index 1c99890348d788a3cff40c4323f0c99059677cc3..4715ec948e194696692425a6852a5e47d7db131a 100644 (file)
--- a/bin/tests/system/zonechecks/tests.sh
+++ b/bin/tests/system/zonechecks/tests.sh
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2004  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.2 2004/11/23 05:23:46 marka Exp $
+# $Id: tests.sh,v 1.3 2007/06/18 23:47:32 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/t_api.pl b/bin/tests/t_api.pl
index ddc1c2392cfac4c70ba817ef032d06d6fd50cbf5..659bf3d01199b221b4c154f41065f2374c7ef993 100644 (file)
--- a/bin/tests/t_api.pl
+++ b/bin/tests/t_api.pl
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1999-2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: t_api.pl,v 1.8 2004/03/05 04:58:40 marka Exp $
+# $Id: t_api.pl,v 1.9 2007/06/18 23:47:26 tbox Exp $
 
 require "getopts.pl";
 

diff --git a/bin/tests/task_test.c b/bin/tests/task_test.c
index a42827a0a7640d95d25e0f2f50466e67475c52d5..0fd0087b17e715428270771b08d2f8f62eb78821 100644 (file)
--- a/bin/tests/task_test.c
+++ b/bin/tests/task_test.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: task_test.c,v 1.49 2004/03/05 04:58:40 marka Exp $ */
+/* $Id: task_test.c,v 1.50 2007/06/18 23:47:26 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/tests/tasks/Makefile.in b/bin/tests/tasks/Makefile.in
index cde69f5cf9fbc7866aad0f0c7d562b2e3a4c35c6..7891f55e50e370bfd1a2b2df8207e2209c0b7068 100644 (file)
--- a/bin/tests/tasks/Makefile.in
+++ b/bin/tests/tasks/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2002  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.28 2004/07/20 07:13:38 marka Exp $
+# $Id: Makefile.in,v 1.29 2007/06/18 23:47:32 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/bin/tests/tasks/t_tasks.c b/bin/tests/tasks/t_tasks.c
index d92d801e8073ed8eb0ca6e9134848560bc736c36..193216e671d07b77b530cd6cbd7e79b27dd8829e 100644 (file)
--- a/bin/tests/tasks/t_tasks.c
+++ b/bin/tests/tasks/t_tasks.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_tasks.c,v 1.38 2005/11/30 03:33:48 marka Exp $ */
+/* $Id: t_tasks.c,v 1.39 2007/06/18 23:47:32 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/tests/timer_test.c b/bin/tests/timer_test.c
index a896bc4290af4da3bd3c8bf62d30b2a9655f9a08..87c1cf47b8ccf9c5daaf1d8ca4e495eb99aae481 100644 (file)
--- a/bin/tests/timer_test.c
+++ b/bin/tests/timer_test.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: timer_test.c,v 1.38 2004/03/05 04:58:40 marka Exp $ */
+/* $Id: timer_test.c,v 1.39 2007/06/18 23:47:26 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/tests/timers/Makefile.in b/bin/tests/timers/Makefile.in
index 3324978b4885385c2c3b741886ae015762b863f3..91c4dfde4b0664a96a51ffe99bc2bada428e1034 100644 (file)
--- a/bin/tests/timers/Makefile.in
+++ b/bin/tests/timers/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1999-2002  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.26 2004/07/20 07:13:39 marka Exp $
+# $Id: Makefile.in,v 1.27 2007/06/18 23:47:32 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/bin/tests/timers/t_timers.c b/bin/tests/timers/t_timers.c
index 260f1ff4ec18dcc2a6e0bc447c3c6253e82192e1..64a8135f023a1a366d86bce8fcb6256bda933e37 100644 (file)
--- a/bin/tests/timers/t_timers.c
+++ b/bin/tests/timers/t_timers.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_timers.c,v 1.24 2004/06/21 05:36:41 marka Exp $ */
+/* $Id: t_timers.c,v 1.25 2007/06/18 23:47:32 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/tests/wire_test.c b/bin/tests/wire_test.c
index 40aa16fad3f568ba98f5072ef6430201f6dce0a0..418e783da5a5053d79cdc674e33aef7ec9b974f2 100644 (file)
--- a/bin/tests/wire_test.c
+++ b/bin/tests/wire_test.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: wire_test.c,v 1.65 2005/03/17 03:56:11 marka Exp $ */
+/* $Id: wire_test.c,v 1.66 2007/06/18 23:47:26 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/tests/zone_test.c b/bin/tests/zone_test.c
index 4b796a1f747107334e4ed415d1686cef370c5fe0..3d07268741ffe54040a0fe75fd1fef3f894c9006 100644 (file)
--- a/bin/tests/zone_test.c
+++ b/bin/tests/zone_test.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone_test.c,v 1.31 2005/03/17 03:56:11 marka Exp $ */
+/* $Id: zone_test.c,v 1.32 2007/06/18 23:47:26 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/win32/BINDInstall/AccountInfo.cpp b/bin/win32/BINDInstall/AccountInfo.cpp
index 2f2d59f35873e152929287ddce0812a8fe4f0d3a..428db305b6507b0390fc7c9e0f01ebb0e825d27c 100644 (file)
--- a/bin/win32/BINDInstall/AccountInfo.cpp
+++ b/bin/win32/BINDInstall/AccountInfo.cpp
@@ -2,7 +2,7 @@
  * Portions Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 2001, 2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: AccountInfo.cpp,v 1.6 2004/03/05 05:04:16 marka Exp $ */
+/* $Id: AccountInfo.cpp,v 1.7 2007/06/18 23:47:32 tbox Exp $ */
 
 #ifndef UNICODE
 #define UNICODE

diff --git a/bin/win32/BINDInstall/AccountInfo.h b/bin/win32/BINDInstall/AccountInfo.h
index 5c481198a5768d505fc2d886e25e5577bea947b0..e3d9c6e77bdf6b2baed9df90684d184628eddb5e 100644 (file)
--- a/bin/win32/BINDInstall/AccountInfo.h
+++ b/bin/win32/BINDInstall/AccountInfo.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: AccountInfo.h,v 1.4 2004/03/05 05:04:16 marka Exp $ */
+/* $Id: AccountInfo.h,v 1.5 2007/06/18 23:47:32 tbox Exp $ */
 
 
 #define RTN_OK         0

diff --git a/bin/win32/BINDInstall/BINDInstall.cpp b/bin/win32/BINDInstall/BINDInstall.cpp
index 517f519221b430bc3829f4bb19349f4beb1ed4ef..f1a1283c1307b29add0d96b40babfc8c78df2afa 100644 (file)
--- a/bin/win32/BINDInstall/BINDInstall.cpp
+++ b/bin/win32/BINDInstall/BINDInstall.cpp
@@ -2,7 +2,7 @@
  * Portions Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: BINDInstall.cpp,v 1.5 2004/04/19 05:48:02 marka Exp $ */
+/* $Id: BINDInstall.cpp,v 1.6 2007/06/18 23:47:32 tbox Exp $ */
 
 /*
  * Copyright (c) 1999-2000 by Nortel Networks Corporation

diff --git a/bin/win32/BINDInstall/BINDInstall.h b/bin/win32/BINDInstall/BINDInstall.h
index 21dfbd7b67b7df8661b0ce0b7cf0546ba1f5e573..0b046d3068a350742b0c5e6e9306f9b98686f078 100644 (file)
--- a/bin/win32/BINDInstall/BINDInstall.h
+++ b/bin/win32/BINDInstall/BINDInstall.h
@@ -2,7 +2,7 @@
  * Portions Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: BINDInstall.h,v 1.4 2004/03/05 05:04:16 marka Exp $ */
+/* $Id: BINDInstall.h,v 1.5 2007/06/18 23:47:32 tbox Exp $ */
 
 /*
  * Copyright (c) 1999-2000 by Nortel Networks Corporation

diff --git a/bin/win32/BINDInstall/BINDInstallDlg.cpp b/bin/win32/BINDInstall/BINDInstallDlg.cpp
index 99000abf886f20c84b3930ddcd3c52583b0256f6..cbdc0b5402a65f430e06aef5ff6da55120119439 100644 (file)
--- a/bin/win32/BINDInstall/BINDInstallDlg.cpp
+++ b/bin/win32/BINDInstall/BINDInstallDlg.cpp
@@ -2,7 +2,7 @@
  * Portions Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: BINDInstallDlg.cpp,v 1.33 2007/05/21 05:52:21 marka Exp $ */
+/* $Id: BINDInstallDlg.cpp,v 1.34 2007/06/18 23:47:32 tbox Exp $ */
 
 /*
  * Copyright (c) 1999-2000 by Nortel Networks Corporation

diff --git a/bin/win32/BINDInstall/BINDInstallDlg.h b/bin/win32/BINDInstall/BINDInstallDlg.h
index 08058be7d79146dc783b6fceaa488157ffd40792..87058b79a3e54d588dfd36954459b331ee35797d 100644 (file)
--- a/bin/win32/BINDInstall/BINDInstallDlg.h
+++ b/bin/win32/BINDInstall/BINDInstallDlg.h
@@ -2,7 +2,7 @@
  * Portions Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: BINDInstallDlg.h,v 1.6 2004/03/05 05:04:17 marka Exp $ */
+/* $Id: BINDInstallDlg.h,v 1.7 2007/06/18 23:47:32 tbox Exp $ */
 
 /*
  * Copyright (c) 1999-2000 by Nortel Networks Corporation

diff --git a/bin/win32/BINDInstall/DirBrowse.cpp b/bin/win32/BINDInstall/DirBrowse.cpp
index c1094f425107aef5eb57ea9f9a97b6491a822e69..4956e2344d13f4bf579380c9463ab2d9ca58600d 100644 (file)
--- a/bin/win32/BINDInstall/DirBrowse.cpp
+++ b/bin/win32/BINDInstall/DirBrowse.cpp
@@ -2,7 +2,7 @@
  * Portions Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: DirBrowse.cpp,v 1.4 2004/03/05 05:04:17 marka Exp $ */
+/* $Id: DirBrowse.cpp,v 1.5 2007/06/18 23:47:32 tbox Exp $ */
 
 /*
  * Copyright (c) 1999-2000 by Nortel Networks Corporation

diff --git a/bin/win32/BINDInstall/DirBrowse.h b/bin/win32/BINDInstall/DirBrowse.h
index 902ce9afa412e7793967cbb802495ab2ed076d16..a9e31568656d7a9408d0dbe302feb8dd186433ff 100644 (file)
--- a/bin/win32/BINDInstall/DirBrowse.h
+++ b/bin/win32/BINDInstall/DirBrowse.h
@@ -2,7 +2,7 @@
  * Portions Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: DirBrowse.h,v 1.4 2004/03/05 05:04:17 marka Exp $ */
+/* $Id: DirBrowse.h,v 1.5 2007/06/18 23:47:32 tbox Exp $ */
 
 /*
  * Copyright (c) 1999-2000 by Nortel Networks Corporation

diff --git a/config.h.win32 b/config.h.win32
index d7790dd8acc2b743123d4812c056131593ceb879..10ba682ebf651bf4cd1bdcea9078366818c1f219 100644 (file)
--- a/config.h.win32
+++ b/config.h.win32
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: config.h.win32,v 1.14 2006/09/25 07:09:02 marka Exp $ */
+/* $Id: config.h.win32,v 1.15 2007/06/18 23:47:16 tbox Exp $ */
 
 /*
  * win32 configuration file

diff --git a/configure.in b/configure.in
index fa57cbf533c059344fb32331f8f3931fe35bb217..069c48ef81eec4c3d47a09fd675d6943f4cfb93f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2003  Internet Software Consortium.
 #
-# 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.
 #
@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(1)dnl
 esyscmd([sed "s/^/# /" COPYRIGHT])dnl
 AC_DIVERT_POP()dnl
 
-AC_REVISION($Revision: 1.428 $)
+AC_REVISION($Revision: 1.429 $)
 
 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.59)

diff --git a/conftools/perllib/dnsconf/DNSConf-macros.h b/conftools/perllib/dnsconf/DNSConf-macros.h
index 7317cff6cc4d9c25de63c13e43ce65ff824562a1..98eb0225ae6b3a72b669bb01ddb19437fa48048f 100644 (file)
--- a/conftools/perllib/dnsconf/DNSConf-macros.h
+++ b/conftools/perllib/dnsconf/DNSConf-macros.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: DNSConf-macros.h,v 1.7 2004/03/05 05:04:22 marka Exp $ */
+/* $Id: DNSConf-macros.h,v 1.8 2007/06/18 23:47:32 tbox Exp $ */
 
 #define CONCAT(a,b) a ## b
 #define DNSCONF_SET_STRING(FIELD)                                      \

diff --git a/conftools/perllib/dnsconf/DNSConf.i b/conftools/perllib/dnsconf/DNSConf.i
index 7e0a6c936b8b4741396d7fa7f04e0f8bb2d97f72..5246a51c2c412e9c7b9aec4252c7ecddab939c38 100644 (file)
--- a/conftools/perllib/dnsconf/DNSConf.i
+++ b/conftools/perllib/dnsconf/DNSConf.i
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: DNSConf.i,v 1.7 2004/03/05 05:04:22 marka Exp $ */
+/* $Id: DNSConf.i,v 1.8 2007/06/18 23:47:32 tbox Exp $ */
 
 %module DNSConf
 

diff --git a/conftools/perllib/dnsconf/Makefile.PL b/conftools/perllib/dnsconf/Makefile.PL
index 8064268299b61b4da2011525b019be0d7562e991..b43a0afc76f2d4a5ca6fb626bf4fbe425af0ef9c 100644 (file)
--- a/conftools/perllib/dnsconf/Makefile.PL
+++ b/conftools/perllib/dnsconf/Makefile.PL
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.PL,v 1.7 2004/03/05 05:04:22 marka Exp $
+# $Id: Makefile.PL,v 1.8 2007/06/18 23:47:32 tbox Exp $
 
 use ExtUtils::MakeMaker;
 

diff --git a/conftools/perllib/dnsconf/named1.conf b/conftools/perllib/dnsconf/named1.conf
index b004e0e89da852ec7b20eb0181b7875330957c35..2864d73db220779c84a624e9aa3db81acd97ed12 100644 (file)
--- a/conftools/perllib/dnsconf/named1.conf
+++ b/conftools/perllib/dnsconf/named1.conf
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named1.conf,v 1.7 2004/03/05 05:04:22 marka Exp $ */
+/* $Id: named1.conf,v 1.8 2007/06/18 23:47:32 tbox Exp $ */
 
 options {
 #      port 8888;

diff --git a/conftools/perllib/dnsconf/test.pl b/conftools/perllib/dnsconf/test.pl
index 0153b04a3f54328bb302c0194cbbf441bb41d87e..0a5390ac81f43555231c2cb709130b50c0ffb741 100644 (file)
--- a/conftools/perllib/dnsconf/test.pl
+++ b/conftools/perllib/dnsconf/test.pl
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: test.pl,v 1.7 2004/03/05 05:04:22 marka Exp $
+# $Id: test.pl,v 1.8 2007/06/18 23:47:32 tbox Exp $
 
 push(@ARGV, "/etc/named.conf") if ! @ARGV;
 

diff --git a/contrib/named-bootconf/named-bootconf.sh b/contrib/named-bootconf/named-bootconf.sh
index 394952afdfc3866a0a6f8da717689d004cf091ad..dc0841ab27fdbd3a7c0848d053f9d4efd17c6593 100644 (file)
--- a/contrib/named-bootconf/named-bootconf.sh
+++ b/contrib/named-bootconf/named-bootconf.sh
@@ -3,7 +3,7 @@
 # Portions Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
 # Portions Copyright (C) 1999-2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: named-bootconf.sh,v 1.10 2006/10/11 02:33:30 marka Exp $
+# $Id: named-bootconf.sh,v 1.11 2007/06/18 23:47:32 tbox Exp $
 
 # $NetBSD: named-bootconf.sh,v 1.5 1998/12/15 01:00:53 tron Exp $
 #

diff --git a/contrib/nanny/nanny.pl b/contrib/nanny/nanny.pl
index 1aa122d45a2e3d4dd81378073f03540a1c0d1ccd..376ecbc17b4c5e364dca8ff28aeda2bbc51b5ce0 100644 (file)
--- a/contrib/nanny/nanny.pl
+++ b/contrib/nanny/nanny.pl
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: nanny.pl,v 1.9 2004/03/05 05:04:27 marka Exp $
+# $Id: nanny.pl,v 1.10 2007/06/18 23:47:33 tbox Exp $
 
 # A simple nanny to make sure named stays running.
 

diff --git a/contrib/sdb/dir/dirdb.c b/contrib/sdb/dir/dirdb.c
index 147c74e616e83266ec43b31cefd8324aa1a13922..b3d9279e234ab185661fbcc2746df7c32c37aabe 100644 (file)
--- a/contrib/sdb/dir/dirdb.c
+++ b/contrib/sdb/dir/dirdb.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dirdb.c,v 1.10 2004/03/05 05:04:30 marka Exp $ */
+/* $Id: dirdb.c,v 1.11 2007/06/18 23:47:33 tbox Exp $ */
 
 /*
  * A simple database driver that returns basic information about

diff --git a/contrib/sdb/dir/dirdb.h b/contrib/sdb/dir/dirdb.h
index ee18f38f8f755406881501dcf7d1f3630099acb4..941bec2fc7c170733b65c4e4047f5e0b7c021cf8 100644 (file)
--- a/contrib/sdb/dir/dirdb.h
+++ b/contrib/sdb/dir/dirdb.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dirdb.h,v 1.3 2004/03/05 05:04:30 marka Exp $ */
+/* $Id: dirdb.h,v 1.4 2007/06/18 23:47:33 tbox Exp $ */
 
 #include <isc/types.h>
 

diff --git a/contrib/sdb/pgsql/pgsqldb.c b/contrib/sdb/pgsql/pgsqldb.c
index d9027712fcb10f93c02e172c51e7659cca51f156..5f020030a0741c1c3db343a730ad75df57312f92 100644 (file)
--- a/contrib/sdb/pgsql/pgsqldb.c
+++ b/contrib/sdb/pgsql/pgsqldb.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: pgsqldb.c,v 1.13 2004/03/05 05:04:32 marka Exp $ */
+/* $Id: pgsqldb.c,v 1.14 2007/06/18 23:47:33 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/contrib/sdb/pgsql/pgsqldb.h b/contrib/sdb/pgsql/pgsqldb.h
index 3fdd813fc6898ecda7608b6346a51d898dc992f6..4af0edec9ca4b6f1d4f1a389333d37928dc1c476 100644 (file)
--- a/contrib/sdb/pgsql/pgsqldb.h
+++ b/contrib/sdb/pgsql/pgsqldb.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: pgsqldb.h,v 1.3 2004/03/05 05:04:32 marka Exp $ */
+/* $Id: pgsqldb.h,v 1.4 2007/06/18 23:47:33 tbox Exp $ */
 
 #include <isc/types.h>
 

diff --git a/contrib/sdb/pgsql/zonetodb.c b/contrib/sdb/pgsql/zonetodb.c
index 003d411d4cbbe2f64f0b5c880cf73e68b1620cc9..bcc7242a42032f7abb1c3813df85387bf7db6c14 100644 (file)
--- a/contrib/sdb/pgsql/zonetodb.c
+++ b/contrib/sdb/pgsql/zonetodb.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zonetodb.c,v 1.17 2007/01/09 03:11:15 marka Exp $ */
+/* $Id: zonetodb.c,v 1.18 2007/06/18 23:47:33 tbox Exp $ */
 
 #include <stdlib.h>
 #include <string.h>

diff --git a/contrib/sdb/tcl/lookup.tcl b/contrib/sdb/tcl/lookup.tcl
index b20abc2d59439430226d61a74d85cb89a81d72f6..e3411a29ce96180494ef0aa2981bbb20ca446b5a 100644 (file)
--- a/contrib/sdb/tcl/lookup.tcl
+++ b/contrib/sdb/tcl/lookup.tcl
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: lookup.tcl,v 1.8 2004/03/05 05:04:35 marka Exp $
+# $Id: lookup.tcl,v 1.9 2007/06/18 23:47:33 tbox Exp $
 
 #
 # Sample lookup procedure for tcldb

diff --git a/contrib/sdb/tcl/tcldb.c b/contrib/sdb/tcl/tcldb.c
index 9555dc3a4f8956380ac3462274c9fceabc0a56e8..9b18eb1d7ae076b5008cbf758e2dc6889f2ff372 100644 (file)
--- a/contrib/sdb/tcl/tcldb.c
+++ b/contrib/sdb/tcl/tcldb.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tcldb.c,v 1.8 2004/03/05 05:04:35 marka Exp $ */
+/* $Id: tcldb.c,v 1.9 2007/06/18 23:47:33 tbox Exp $ */
 
 /*
  * A simple database driver that calls a Tcl procedure to define

diff --git a/contrib/sdb/tcl/tcldb.h b/contrib/sdb/tcl/tcldb.h
index 6cce4809ee527effefda2caffb24f9e244bb88ce..98def016455596976033cd2ce1c0b777b91283af 100644 (file)
--- a/contrib/sdb/tcl/tcldb.h
+++ b/contrib/sdb/tcl/tcldb.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tcldb.h,v 1.5 2004/03/05 05:04:35 marka Exp $ */
+/* $Id: tcldb.h,v 1.6 2007/06/18 23:47:33 tbox Exp $ */
 
 #include <isc/types.h>
 

diff --git a/contrib/sdb/time/timedb.c b/contrib/sdb/time/timedb.c
index fc11cba10ad956e45378ba3069aa6132891683ba..9ce27955ca0af5d8aa57eec0aa5ecba76d540943 100644 (file)
--- a/contrib/sdb/time/timedb.c
+++ b/contrib/sdb/time/timedb.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: timedb.c,v 1.8 2004/03/05 05:04:37 marka Exp $ */
+/* $Id: timedb.c,v 1.9 2007/06/18 23:47:33 tbox Exp $ */
 
 /*
  * A simple database driver that enables the server to return the

diff --git a/contrib/sdb/time/timedb.h b/contrib/sdb/time/timedb.h
index 80f0af96cbbf2ae101800d861a2073602fc8bae4..2a1eee062520ba522c48dbf42fb21f110f0ff377 100644 (file)
--- a/contrib/sdb/time/timedb.h
+++ b/contrib/sdb/time/timedb.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: timedb.h,v 1.3 2004/03/05 05:04:38 marka Exp $ */
+/* $Id: timedb.h,v 1.4 2007/06/18 23:47:33 tbox Exp $ */
 
 #include <isc/types.h>
 

diff --git a/doc/Makefile.in b/doc/Makefile.in
index bf127d9c0c0e80f5eff8ef9c9b150a168acf3bb0..c579dcc3b7c808b59575651f259a410ea2f15c09 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.9 2006/12/22 01:59:43 marka Exp $
+# $Id: Makefile.in,v 1.10 2007/06/18 23:47:33 tbox Exp $
 
 # This Makefile is a placeholder.  It exists merely to make
 # sure that its directory gets created in the object directory

diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 38972550a53ec56ae80b053491df357817f3541a..110a57944a8ff54f3c8a35043cf4cbaac156e403 100644 (file)
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -5,7 +5,7 @@
  - Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2003  Internet Software Consortium.
  -
- - 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.
  -
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- File: $Id: Bv9ARM-book.xml,v 1.328 2007/06/13 07:04:47 marka Exp $ -->
+<!-- File: $Id: Bv9ARM-book.xml,v 1.329 2007/06/18 23:47:33 tbox Exp $ -->
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <title>BIND 9 Administrator Reference Manual</title>
 

diff --git a/doc/arm/Makefile.in b/doc/arm/Makefile.in
index 6c8eb1ee7d9a1ba71590c25a89b785a49766cab7..d727da922a921e6a132f438a1a360e45f5200519 100644 (file)
--- a/doc/arm/Makefile.in
+++ b/doc/arm/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001, 2002  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.19 2007/02/07 23:57:59 marka Exp $
+# $Id: Makefile.in,v 1.20 2007/06/18 23:47:33 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/doc/arm/latex-fixup.pl b/doc/arm/latex-fixup.pl
index abb9c887aa251acadec847ea5c20d9407e4e40f1..6e99899cce9a0593335b77b5d35281b5f862ffd9 100644 (file)
--- a/doc/arm/latex-fixup.pl
+++ b/doc/arm/latex-fixup.pl
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2005  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: latex-fixup.pl,v 1.3 2005/07/19 04:55:23 marka Exp $
+# $Id: latex-fixup.pl,v 1.4 2007/06/18 23:47:33 tbox Exp $
 
 # Sadly, the final stages of generating a presentable PDF file always
 # seem to require some manual tweaking.  Doesn't seem to matter what

diff --git a/doc/doxygen/Makefile.in b/doc/doxygen/Makefile.in
index 220eb2f30306efa23fd32eb00f14d1929dab95b7..2d62b510accbea927391572de7d6ba20819339e8 100644 (file)
--- a/doc/doxygen/Makefile.in
+++ b/doc/doxygen/Makefile.in
@@ -1,6 +1,6 @@
 # Copyright (C) 2006  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.
 #
@@ -12,7 +12,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2 2006/12/22 01:44:59 marka Exp $
+# $Id: Makefile.in,v 1.3 2007/06/18 23:47:34 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/doc/doxygen/doxygen-input-filter.in b/doc/doxygen/doxygen-input-filter.in
index 3bf481a8c6d5a33c575a1ceefc773bfe08688e07..5cd198953e1f85368b7e31bf416dda95ba7675a6 100644 (file)
--- a/doc/doxygen/doxygen-input-filter.in
+++ b/doc/doxygen/doxygen-input-filter.in
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2006  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: doxygen-input-filter.in,v 1.2 2006/12/22 01:44:59 marka Exp $
+# $Id: doxygen-input-filter.in,v 1.3 2007/06/18 23:47:34 tbox Exp $
 
 # Input filter for feeding our source code into Doxygen.
 

diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index 058f254c1f925bc2e5ab3bc31ea2cf1954d974df..5cdce626e88071e875861e34d89bd2296593f751 100644 (file)
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.5 2007/01/30 23:52:54 marka Exp $
+# $Id: Makefile.in,v 1.6 2007/06/18 23:47:34 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/doc/misc/format-options.pl b/doc/misc/format-options.pl
index 70b334e31e1eb81d2e9ea81db472f3089b8474b7..c77c1ea4e89591d7ad9bbde9b13097b4054552fd 100644 (file)
--- a/doc/misc/format-options.pl
+++ b/doc/misc/format-options.pl
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: format-options.pl,v 1.2 2004/03/05 05:04:53 marka Exp $
+# $Id: format-options.pl,v 1.3 2007/06/18 23:47:34 tbox Exp $
 
 print <<END;
 

diff --git a/doc/xsl/Makefile.in b/doc/xsl/Makefile.in
index e8aac1782fb6a5b8a7db20bdd56d1e5c8a31e3b3..78eef16b83a781a7c9b361302fd9025ea089c1b2 100644 (file)
--- a/doc/xsl/Makefile.in
+++ b/doc/xsl/Makefile.in
@@ -1,6 +1,6 @@
 # Copyright (C) 2005  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.
 #
@@ -12,7 +12,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2 2005/07/19 04:55:24 marka Exp $
+# $Id: Makefile.in,v 1.3 2007/06/18 23:47:34 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/doc/xsl/copyright.xsl b/doc/xsl/copyright.xsl
index 60ec51974304fa51a9c5b7c130eb2872dd6bfdd2..c6994079f849c94d54e03dcf8824c058f0f4e8a8 100644 (file)
--- a/doc/xsl/copyright.xsl
+++ b/doc/xsl/copyright.xsl
@@ -1,7 +1,7 @@
 <!--
  - Copyright (C) 2005  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 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: copyright.xsl,v 1.4 2005/07/19 04:55:24 marka Exp $ -->
+<!-- $Id: copyright.xsl,v 1.5 2007/06/18 23:47:34 tbox Exp $ -->
 
 <!-- Generate ISC copyright comments from Docbook copyright metadata. -->
 

diff --git a/doc/xsl/isc-docbook-chunk.xsl.in b/doc/xsl/isc-docbook-chunk.xsl.in
index ee246360a04a5bf275117996b677189ff61fd77c..f6ca4b7830dddf80a3f1edb0355532753c92bf1a 100644 (file)
--- a/doc/xsl/isc-docbook-chunk.xsl.in
+++ b/doc/xsl/isc-docbook-chunk.xsl.in
@@ -1,7 +1,7 @@
 <!--
  - Copyright (C) 2005  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 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: isc-docbook-chunk.xsl.in,v 1.4 2005/05/13 01:35:43 marka Exp $ -->
+<!-- $Id: isc-docbook-chunk.xsl.in,v 1.5 2007/06/18 23:47:34 tbox Exp $ -->
 
 <!-- ISC customizations for Docbook-XSL chunked HTML generator --> 
 

diff --git a/doc/xsl/isc-docbook-html.xsl.in b/doc/xsl/isc-docbook-html.xsl.in
index cc7358e8643edef897743e37e8cedf3f68cf2655..5f5dafd0290b60a6d1860da078c00f79c3b24633 100644 (file)
--- a/doc/xsl/isc-docbook-html.xsl.in
+++ b/doc/xsl/isc-docbook-html.xsl.in
@@ -1,7 +1,7 @@
 <!--
  - Copyright (C) 2005  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 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: isc-docbook-html.xsl.in,v 1.4 2005/05/13 01:35:43 marka Exp $ -->
+<!-- $Id: isc-docbook-html.xsl.in,v 1.5 2007/06/18 23:47:34 tbox Exp $ -->
 
 <!-- ISC customizations for Docbook-XSL HTML generator --> 
 

diff --git a/doc/xsl/isc-docbook-latex-mappings.xml b/doc/xsl/isc-docbook-latex-mappings.xml
index 4630de8148e32ff75f8fd7b162be7d85a48f38a8..0e7b3090a86208dc77ff6b0dbab803f206cece6f 100644 (file)
--- a/doc/xsl/isc-docbook-latex-mappings.xml
+++ b/doc/xsl/isc-docbook-latex-mappings.xml
@@ -1,7 +1,7 @@
 <!--
  - Copyright (C) 2005  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 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: isc-docbook-latex-mappings.xml,v 1.2 2005/07/19 04:55:24 marka Exp $ -->
+<!-- $Id: isc-docbook-latex-mappings.xml,v 1.3 2007/06/18 23:47:34 tbox Exp $ -->
 
 <!--
   - ISC modifications to db2latex mapping rules.

diff --git a/doc/xsl/isc-docbook-latex.xsl.in b/doc/xsl/isc-docbook-latex.xsl.in
index 26d10f7259ad326d1cb36e8f31b3090b365f89aa..765084f5836c62d459208425b5d7a79ac512ca1e 100644 (file)
--- a/doc/xsl/isc-docbook-latex.xsl.in
+++ b/doc/xsl/isc-docbook-latex.xsl.in
@@ -1,7 +1,7 @@
 <!--
  - Copyright (C) 2005  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 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: isc-docbook-latex.xsl.in,v 1.4 2005/07/19 04:55:24 marka Exp $ -->
+<!-- $Id: isc-docbook-latex.xsl.in,v 1.5 2007/06/18 23:47:34 tbox Exp $ -->
 
 <!-- ISC customizations for db2latex generator -->
 

diff --git a/doc/xsl/isc-docbook-text.xsl b/doc/xsl/isc-docbook-text.xsl
index aef5de2353b69ee97946e154e75a1be79ab8efdb..2a5e05f9b6c64780a8a308be9f5c30ead0eabd45 100644 (file)
--- a/doc/xsl/isc-docbook-text.xsl
+++ b/doc/xsl/isc-docbook-text.xsl
@@ -1,7 +1,7 @@
 <!--
  - Copyright (C) 2005  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 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: isc-docbook-text.xsl,v 1.1 2005/08/17 22:55:57 sra Exp $ -->
+<!-- $Id: isc-docbook-text.xsl,v 1.2 2007/06/18 23:47:34 tbox Exp $ -->
 
 <!-- Tweaks to Docbook-XSL HTML for producing flat ASCII text. --> 
 

diff --git a/doc/xsl/isc-manpage.xsl.in b/doc/xsl/isc-manpage.xsl.in
index 1e5b48fb7daece771fdccc88269fe30db06bb366..fe008d3adb062c135d93c3517a7deee467411f2c 100644 (file)
--- a/doc/xsl/isc-manpage.xsl.in
+++ b/doc/xsl/isc-manpage.xsl.in
@@ -1,7 +1,7 @@
 <!--
  - Copyright (C) 2005, 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.
  -
@@ -14,7 +14,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: isc-manpage.xsl.in,v 1.8 2007/01/27 00:22:49 marka Exp $ -->
+<!-- $Id: isc-manpage.xsl.in,v 1.9 2007/06/18 23:47:34 tbox Exp $ -->
 
 <!-- ISC customizations for Docbook-XSL manual page generator. -->
 

diff --git a/doc/xsl/pre-latex.xsl b/doc/xsl/pre-latex.xsl
index 4ae5adfb1e7063f29fa6645f038b079e37fbff07..8a78348db23ea2dfa26c498cc28ea145581bb940 100644 (file)
--- a/doc/xsl/pre-latex.xsl
+++ b/doc/xsl/pre-latex.xsl
@@ -1,7 +1,7 @@
 <!--
  - Copyright (C) 2005  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 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: pre-latex.xsl,v 1.4 2005/09/15 02:25:25 marka Exp $ -->
+<!-- $Id: pre-latex.xsl,v 1.5 2007/06/18 23:47:34 tbox Exp $ -->
 
 <!--
   - Whack &mdash; into something that won't choke LaTeX.

diff --git a/isc-config.sh.in b/isc-config.sh.in
index 45aab669f5f412790f03c015ee27d2a2d50541d2..d657f7f1b191ad849cfa5f486e5a8224cdf1bb23 100644 (file)
--- a/isc-config.sh.in
+++ b/isc-config.sh.in
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: isc-config.sh.in,v 1.15 2004/03/05 04:56:57 marka Exp $
+# $Id: isc-config.sh.in,v 1.16 2007/06/18 23:47:16 tbox Exp $
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@

diff --git a/lib/Makefile.in b/lib/Makefile.in
index e8be2945ca318546a3a2af15c97eecf4f84ca524..bfb0b55f74675e5eba9327fc930c60def77e0bae 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2001, 2003  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.19 2004/03/05 05:05:00 marka Exp $
+# $Id: Makefile.in,v 1.20 2007/06/18 23:47:34 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/bind/Makefile.in b/lib/bind/Makefile.in
index 679a978c011808e629d40eee2785889e68275d40..47fbc3875f41e9142d53723918e83161e74c9910 100644 (file)
--- a/lib/bind/Makefile.in
+++ b/lib/bind/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001-2003  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.29 2006/06/24 00:25:40 marka Exp $
+# $Id: Makefile.in,v 1.30 2007/06/18 23:47:34 tbox Exp $
 
 srcdir =        @srcdir@
 VPATH =         @srcdir@

diff --git a/lib/bind/bsd/Makefile.in b/lib/bind/bsd/Makefile.in
index cf70c10b1e4092a31cd5b2b2836f4a6c74ed01f1..800b61a95c08bf1b408a857a76aa8be89600fab7 100644 (file)
--- a/lib/bind/bsd/Makefile.in
+++ b/lib/bind/bsd/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.7 2004/03/05 05:05:07 marka Exp $
+# $Id: Makefile.in,v 1.8 2007/06/18 23:47:34 tbox Exp $
 
 srcdir=         @srcdir@
 VPATH =         @srcdir@

diff --git a/lib/bind/configure.in b/lib/bind/configure.in
index 63c26af172addea3c1e233f8cc69f6f73204638e..ef3c39359f9ddfd0decbaf86e56ec34d10de7c74 100644 (file)
--- a/lib/bind/configure.in
+++ b/lib/bind/configure.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001, 2003  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-AC_REVISION($Revision: 1.127 $)
+AC_REVISION($Revision: 1.128 $)
 
 AC_INIT(resolv/herror.c)
 AC_PREREQ(2.13)

diff --git a/lib/bind/dst/Makefile.in b/lib/bind/dst/Makefile.in
index c802840613fa3377af03ee2219aea1520643a932..20575692a7754b96d5df84f5f3213ade8d3e1f2b 100644 (file)
--- a/lib/bind/dst/Makefile.in
+++ b/lib/bind/dst/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.6 2004/03/05 05:05:09 marka Exp $
+# $Id: Makefile.in,v 1.7 2007/06/18 23:47:34 tbox Exp $
  
 srcdir=                @srcdir@
 VPATH =         @srcdir@

diff --git a/lib/bind/include/Makefile.in b/lib/bind/include/Makefile.in
index d07ea7abfafdb8bfbe8e01f1303aa05ade88ffe4..91811a0cdb7c1f140f1d42097ffc36d6c2e4bf34 100644 (file)
--- a/lib/bind/include/Makefile.in
+++ b/lib/bind/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.4 2004/03/05 05:05:11 marka Exp $
+# $Id: Makefile.in,v 1.5 2007/06/18 23:47:34 tbox Exp $
 
 srcdir =        @srcdir@
 VPATH =         @srcdir@

diff --git a/lib/bind/inet/Makefile.in b/lib/bind/inet/Makefile.in
index 7eb297c13d15bc4767aae4526e82a9c71825e83d..4ee5a6763bf9a44837cbde609790ea7ac372bbb9 100644 (file)
--- a/lib/bind/inet/Makefile.in
+++ b/lib/bind/inet/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.5 2004/03/05 05:05:13 marka Exp $
+# $Id: Makefile.in,v 1.6 2007/06/18 23:47:34 tbox Exp $
 
 srcdir=                @srcdir@
 VPATH =         @srcdir@

diff --git a/lib/bind/irs/Makefile.in b/lib/bind/irs/Makefile.in
index f0ba80213ea5b3b7d879e96dadc9d89308a6901a..662a9710e9a46b405fac11babbf323a50c8f8531 100644 (file)
--- a/lib/bind/irs/Makefile.in
+++ b/lib/bind/irs/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.10 2004/12/07 00:36:27 marka Exp $
+# $Id: Makefile.in,v 1.11 2007/06/18 23:47:34 tbox Exp $
 
 srcdir=                @srcdir@
 VPATH =         @srcdir@

diff --git a/lib/bind/isc/Makefile.in b/lib/bind/isc/Makefile.in
index 3cbb640f99ff4496e87f605c77f158d31f7e9147..3b05395ae032788572f27bc41e0062758167220f 100644 (file)
--- a/lib/bind/isc/Makefile.in
+++ b/lib/bind/isc/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.7 2004/03/05 05:05:38 marka Exp $
+# $Id: Makefile.in,v 1.8 2007/06/18 23:47:34 tbox Exp $
 
 srcdir=                @srcdir@
 VPATH =         @srcdir@

diff --git a/lib/bind/make/includes.in b/lib/bind/make/includes.in
index d7e21cb36f98cc4377967438b1dc82f12a62cb46..99bb133678f425431769aca864d962ba1bf5853b 100644 (file)
--- a/lib/bind/make/includes.in
+++ b/lib/bind/make/includes.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: includes.in,v 1.2 2004/03/16 05:22:19 marka Exp $
+# $Id: includes.in,v 1.3 2007/06/18 23:47:34 tbox Exp $
 
 # Search for machine-generated header files in the build tree,
 # and for normal headers in the source tree (${top_srcdir}).

diff --git a/lib/bind/make/rules.in b/lib/bind/make/rules.in
index 522c8ec841df60995789314bf85a8dc672b902c9..f37998035f591e67dec5ff7c90420575b4046dd8 100644 (file)
--- a/lib/bind/make/rules.in
+++ b/lib/bind/make/rules.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001, 2002  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: rules.in,v 1.12 2007/01/09 03:11:15 marka Exp $
+# $Id: rules.in,v 1.13 2007/06/18 23:47:34 tbox Exp $
 
 ###
 ### Common Makefile rules for BIND 9.

diff --git a/lib/bind/nameser/Makefile.in b/lib/bind/nameser/Makefile.in
index d033eee1ea08e20218ecf6adbe27515e71d788f5..669fcde817e169b6250a442625d74aec1de71214 100644 (file)
--- a/lib/bind/nameser/Makefile.in
+++ b/lib/bind/nameser/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.5 2004/03/16 05:22:19 marka Exp $
+# $Id: Makefile.in,v 1.6 2007/06/18 23:47:34 tbox Exp $
 
 srcdir=                @srcdir@
 VPATH =         @srcdir@

diff --git a/lib/bind/port/Makefile.in b/lib/bind/port/Makefile.in
index 99e59854895b9d26f3df4c50ddb6f3953c921952..84f9cf9ef1f16ea7335ce7b95f09bb4cb03dc04d 100644 (file)
--- a/lib/bind/port/Makefile.in
+++ b/lib/bind/port/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #

diff --git a/lib/bind/port/aix32/Makefile.in b/lib/bind/port/aix32/Makefile.in
index 99e59854895b9d26f3df4c50ddb6f3953c921952..84f9cf9ef1f16ea7335ce7b95f09bb4cb03dc04d 100644 (file)
--- a/lib/bind/port/aix32/Makefile.in
+++ b/lib/bind/port/aix32/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #

diff --git a/lib/bind/port/aix32/include/Makefile.in b/lib/bind/port/aix32/include/Makefile.in
index 7aa1048fdc81824817b5464edb7574b34122032c..8a619be500de4f15d394656b836630f8394a0388 100644 (file)
--- a/lib/bind/port/aix32/include/Makefile.in
+++ b/lib/bind/port/aix32/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2 2004/03/16 05:22:19 marka Exp $
+# $Id: Makefile.in,v 1.3 2007/06/18 23:47:35 tbox Exp $
 
 srcdir =        @srcdir@
 VPATH =         @srcdir@

diff --git a/lib/bind/port/aix4/Makefile.in b/lib/bind/port/aix4/Makefile.in
index 99e59854895b9d26f3df4c50ddb6f3953c921952..84f9cf9ef1f16ea7335ce7b95f09bb4cb03dc04d 100644 (file)
--- a/lib/bind/port/aix4/Makefile.in
+++ b/lib/bind/port/aix4/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #

diff --git a/lib/bind/port/aix4/include/Makefile.in b/lib/bind/port/aix4/include/Makefile.in
index bc78ba890fb2077638922ddf91f723645da12542..8a619be500de4f15d394656b836630f8394a0388 100644 (file)
--- a/lib/bind/port/aix4/include/Makefile.in
+++ b/lib/bind/port/aix4/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2 2004/03/16 05:22:20 marka Exp $
+# $Id: Makefile.in,v 1.3 2007/06/18 23:47:35 tbox Exp $
 
 srcdir =        @srcdir@
 VPATH =         @srcdir@

diff --git a/lib/bind/port/aix5/Makefile.in b/lib/bind/port/aix5/Makefile.in
index 99e59854895b9d26f3df4c50ddb6f3953c921952..84f9cf9ef1f16ea7335ce7b95f09bb4cb03dc04d 100644 (file)
--- a/lib/bind/port/aix5/Makefile.in
+++ b/lib/bind/port/aix5/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #

diff --git a/lib/bind/port/aix5/include/Makefile.in b/lib/bind/port/aix5/include/Makefile.in
index 82034bbd8485e7dcdcb687c996d125718ba80659..10aa892adac36824f55e89b8bcd3f6677284f06d 100644 (file)
--- a/lib/bind/port/aix5/include/Makefile.in
+++ b/lib/bind/port/aix5/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.1 2004/09/24 04:32:32 marka Exp $
+# $Id: Makefile.in,v 1.2 2007/06/18 23:47:35 tbox Exp $
 
 srcdir =        @srcdir@
 VPATH =         @srcdir@

diff --git a/lib/bind/port/aux3/Makefile.in b/lib/bind/port/aux3/Makefile.in
index 99e59854895b9d26f3df4c50ddb6f3953c921952..84f9cf9ef1f16ea7335ce7b95f09bb4cb03dc04d 100644 (file)
--- a/lib/bind/port/aux3/Makefile.in
+++ b/lib/bind/port/aux3/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #

diff --git a/lib/bind/port/aux3/include/Makefile.in b/lib/bind/port/aux3/include/Makefile.in
index b823549519ce0e772074ee3aee186720f78c3a49..92b3d05a38117ce0864c55b5b7774ecb6c9c706a 100644 (file)
--- a/lib/bind/port/aux3/include/Makefile.in
+++ b/lib/bind/port/aux3/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2 2004/03/16 05:22:20 marka Exp $
+# $Id: Makefile.in,v 1.3 2007/06/18 23:47:35 tbox Exp $
 
 srcdir =        @srcdir@
 VPATH =         @srcdir@

diff --git a/lib/bind/port/bsdos/Makefile.in b/lib/bind/port/bsdos/Makefile.in
index 99e59854895b9d26f3df4c50ddb6f3953c921952..84f9cf9ef1f16ea7335ce7b95f09bb4cb03dc04d 100644 (file)
--- a/lib/bind/port/bsdos/Makefile.in
+++ b/lib/bind/port/bsdos/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #

diff --git a/lib/bind/port/bsdos/include/Makefile.in b/lib/bind/port/bsdos/include/Makefile.in
index ae026dd50bc04fed62c9057fe7d970c4404669e1..5f33870816dd475bf0989dd4a16767f03ac048af 100644 (file)
--- a/lib/bind/port/bsdos/include/Makefile.in
+++ b/lib/bind/port/bsdos/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2 2004/03/16 05:22:21 marka Exp $
+# $Id: Makefile.in,v 1.3 2007/06/18 23:47:36 tbox Exp $
 
 srcdir =        @srcdir@
 VPATH =         @srcdir@

diff --git a/lib/bind/port/bsdos2/Makefile.in b/lib/bind/port/bsdos2/Makefile.in
index 99e59854895b9d26f3df4c50ddb6f3953c921952..84f9cf9ef1f16ea7335ce7b95f09bb4cb03dc04d 100644 (file)
--- a/lib/bind/port/bsdos2/Makefile.in
+++ b/lib/bind/port/bsdos2/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #

diff --git a/lib/bind/port/bsdos2/include/Makefile.in b/lib/bind/port/bsdos2/include/Makefile.in
index ae026dd50bc04fed62c9057fe7d970c4404669e1..5f33870816dd475bf0989dd4a16767f03ac048af 100644 (file)
--- a/lib/bind/port/bsdos2/include/Makefile.in
+++ b/lib/bind/port/bsdos2/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2 2004/03/16 05:22:21 marka Exp $
+# $Id: Makefile.in,v 1.3 2007/06/18 23:47:36 tbox Exp $
 
 srcdir =        @srcdir@
 VPATH =         @srcdir@

diff --git a/lib/bind/port/cygwin/Makefile.in b/lib/bind/port/cygwin/Makefile.in
index bf8977ab64497b539ab1f62bf9b85c1b45f598b7..5d7d982b9814480e49e334aca29c623f89e55ed2 100644 (file)
--- a/lib/bind/port/cygwin/Makefile.in
+++ b/lib/bind/port/cygwin/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2002  Internet Software Consortium.
 #
-# 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.
 #

diff --git a/lib/bind/port/cygwin/include/Makefile.in b/lib/bind/port/cygwin/include/Makefile.in
index f6263323a878b3b688effd2e10a06b738aa5bd1f..1b098245546df197e1cbe1b5a99069458e707729 100644 (file)
--- a/lib/bind/port/cygwin/include/Makefile.in
+++ b/lib/bind/port/cygwin/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2002  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2 2004/03/05 05:07:59 marka Exp $
+# $Id: Makefile.in,v 1.3 2007/06/18 23:47:36 tbox Exp $
 
 srcdir =        @srcdir@
 VPATH =         @srcdir@

diff --git a/lib/bind/port/darwin/Makefile.in b/lib/bind/port/darwin/Makefile.in
index 99e59854895b9d26f3df4c50ddb6f3953c921952..84f9cf9ef1f16ea7335ce7b95f09bb4cb03dc04d 100644 (file)
--- a/lib/bind/port/darwin/Makefile.in
+++ b/lib/bind/port/darwin/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #

diff --git a/lib/bind/port/darwin/include/Makefile.in b/lib/bind/port/darwin/include/Makefile.in
index ae026dd50bc04fed62c9057fe7d970c4404669e1..5f33870816dd475bf0989dd4a16767f03ac048af 100644 (file)
--- a/lib/bind/port/darwin/include/Makefile.in
+++ b/lib/bind/port/darwin/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2 2004/03/16 05:22:21 marka Exp $
+# $Id: Makefile.in,v 1.3 2007/06/18 23:47:36 tbox Exp $
 
 srcdir =        @srcdir@
 VPATH =         @srcdir@

diff --git a/lib/bind/port/decunix/Makefile.in b/lib/bind/port/decunix/Makefile.in
index 99e59854895b9d26f3df4c50ddb6f3953c921952..84f9cf9ef1f16ea7335ce7b95f09bb4cb03dc04d 100644 (file)
--- a/lib/bind/port/decunix/Makefile.in
+++ b/lib/bind/port/decunix/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #

diff --git a/lib/bind/port/decunix/include/Makefile.in b/lib/bind/port/decunix/include/Makefile.in
index 04c315ef5b2fd7ea97d7ec6232b674977b8e7434..ff56aa98650d27b501a2d2e901cba5878a4dd0dc 100644 (file)
--- a/lib/bind/port/decunix/include/Makefile.in
+++ b/lib/bind/port/decunix/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2 2004/03/16 05:22:22 marka Exp $
+# $Id: Makefile.in,v 1.3 2007/06/18 23:47:36 tbox Exp $
 
 srcdir =        @srcdir@
 VPATH =         @srcdir@

diff --git a/lib/bind/port/freebsd/Makefile.in b/lib/bind/port/freebsd/Makefile.in
index 99e59854895b9d26f3df4c50ddb6f3953c921952..84f9cf9ef1f16ea7335ce7b95f09bb4cb03dc04d 100644 (file)
--- a/lib/bind/port/freebsd/Makefile.in
+++ b/lib/bind/port/freebsd/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #

diff --git a/lib/bind/port/freebsd/include/Makefile.in b/lib/bind/port/freebsd/include/Makefile.in
index 68bef09d909164dc573205c96a7fd4aa2dee3458..5f33870816dd475bf0989dd4a16767f03ac048af 100644 (file)
--- a/lib/bind/port/freebsd/include/Makefile.in
+++ b/lib/bind/port/freebsd/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2 2004/03/16 05:22:22 marka Exp $
+# $Id: Makefile.in,v 1.3 2007/06/18 23:47:36 tbox Exp $
 
 srcdir =        @srcdir@
 VPATH =         @srcdir@

diff --git a/lib/bind/port/hpux/Makefile.in b/lib/bind/port/hpux/Makefile.in
index 99e59854895b9d26f3df4c50ddb6f3953c921952..84f9cf9ef1f16ea7335ce7b95f09bb4cb03dc04d 100644 (file)
--- a/lib/bind/port/hpux/Makefile.in
+++ b/lib/bind/port/hpux/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #

diff --git a/lib/bind/port/hpux/include/Makefile.in b/lib/bind/port/hpux/include/Makefile.in
index ecf852cbef92ad8dfefec17906ad485dcfb5444f..d5c569f07fa6fce4dd3a73fa2a7f1a95393add7d 100644 (file)
--- a/lib/bind/port/hpux/include/Makefile.in
+++ b/lib/bind/port/hpux/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2 2004/03/16 05:22:22 marka Exp $
+# $Id: Makefile.in,v 1.3 2007/06/18 23:47:36 tbox Exp $
 
 srcdir =        @srcdir@
 VPATH =         @srcdir@

diff --git a/lib/bind/port/hpux10/Makefile.in b/lib/bind/port/hpux10/Makefile.in
index 99e59854895b9d26f3df4c50ddb6f3953c921952..84f9cf9ef1f16ea7335ce7b95f09bb4cb03dc04d 100644 (file)
--- a/lib/bind/port/hpux10/Makefile.in
+++ b/lib/bind/port/hpux10/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #

diff --git a/lib/bind/port/hpux10/include/Makefile.in b/lib/bind/port/hpux10/include/Makefile.in
index 9f61cc6aeba8a64e6954bd796f0aa34444bb53aa..97ba0fd97fdcb14ed39c826261ebf8f5a31f887a 100644 (file)
--- a/lib/bind/port/hpux10/include/Makefile.in
+++ b/lib/bind/port/hpux10/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2 2004/03/16 05:22:23 marka Exp $
+# $Id: Makefile.in,v 1.3 2007/06/18 23:47:36 tbox Exp $
 
 srcdir =        @srcdir@
 VPATH =         @srcdir@

diff --git a/lib/bind/port/hpux9/Makefile.in b/lib/bind/port/hpux9/Makefile.in
index 99e59854895b9d26f3df4c50ddb6f3953c921952..84f9cf9ef1f16ea7335ce7b95f09bb4cb03dc04d 100644 (file)
--- a/lib/bind/port/hpux9/Makefile.in
+++ b/lib/bind/port/hpux9/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #

diff --git a/lib/bind/port/hpux9/include/Makefile.in b/lib/bind/port/hpux9/include/Makefile.in
index 9f61cc6aeba8a64e6954bd796f0aa34444bb53aa..236566b057ad8cec1845d477e68fb3d502ddada0 100644 (file)
--- a/lib/bind/port/hpux9/include/Makefile.in
+++ b/lib/bind/port/hpux9/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2 2004/03/16 05:22:23 marka Exp $
+# $Id: Makefile.in,v 1.3 2007/06/18 23:47:37 tbox Exp $
 
 srcdir =        @srcdir@
 VPATH =         @srcdir@

diff --git a/lib/bind/port/irix/Makefile.in b/lib/bind/port/irix/Makefile.in
index 99e59854895b9d26f3df4c50ddb6f3953c921952..84f9cf9ef1f16ea7335ce7b95f09bb4cb03dc04d 100644 (file)
--- a/lib/bind/port/irix/Makefile.in
+++ b/lib/bind/port/irix/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #

diff --git a/lib/bind/port/irix/include/Makefile.in b/lib/bind/port/irix/include/Makefile.in
index 14251347af8d88854a475e0366954a09b1f0b326..8533f0163718254f2b8707813363118f828b8b8e 100644 (file)
--- a/lib/bind/port/irix/include/Makefile.in
+++ b/lib/bind/port/irix/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.3 2004/03/16 05:22:23 marka Exp $
+# $Id: Makefile.in,v 1.4 2007/06/18 23:47:37 tbox Exp $
 
 srcdir =        @srcdir@
 VPATH =         @srcdir@

diff --git a/lib/bind/port/linux/Makefile.in b/lib/bind/port/linux/Makefile.in
index 99e59854895b9d26f3df4c50ddb6f3953c921952..84f9cf9ef1f16ea7335ce7b95f09bb4cb03dc04d 100644 (file)
--- a/lib/bind/port/linux/Makefile.in
+++ b/lib/bind/port/linux/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #

diff --git a/lib/bind/port/linux/include/Makefile.in b/lib/bind/port/linux/include/Makefile.in
index a3dbf5d4741cc6108b9ca7a300974ea33adc2ed7..00a65860b4a6f91c88634d43db6abad72e1e88ac 100644 (file)
--- a/lib/bind/port/linux/include/Makefile.in
+++ b/lib/bind/port/linux/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.3 2004/03/16 05:22:24 marka Exp $
+# $Id: Makefile.in,v 1.4 2007/06/18 23:47:37 tbox Exp $
 
 srcdir =        @srcdir@
 VPATH =         @srcdir@

diff --git a/lib/bind/port/lynxos/Makefile.in b/lib/bind/port/lynxos/Makefile.in
index 99e59854895b9d26f3df4c50ddb6f3953c921952..84f9cf9ef1f16ea7335ce7b95f09bb4cb03dc04d 100644 (file)
--- a/lib/bind/port/lynxos/Makefile.in
+++ b/lib/bind/port/lynxos/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #

diff --git a/lib/bind/port/lynxos/include/Makefile.in b/lib/bind/port/lynxos/include/Makefile.in
index e755bb6c986f64f3d8e6eee893d64e1b97780b0a..db98dd867a4b57953adcb9ed866e24a2a2cb255c 100644 (file)
--- a/lib/bind/port/lynxos/include/Makefile.in
+++ b/lib/bind/port/lynxos/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2 2004/03/16 05:22:24 marka Exp $
+# $Id: Makefile.in,v 1.3 2007/06/18 23:47:37 tbox Exp $
 
 srcdir =        @srcdir@
 VPATH =         @srcdir@

diff --git a/lib/bind/port/mpe/Makefile.in b/lib/bind/port/mpe/Makefile.in
index 99e59854895b9d26f3df4c50ddb6f3953c921952..84f9cf9ef1f16ea7335ce7b95f09bb4cb03dc04d 100644 (file)
--- a/lib/bind/port/mpe/Makefile.in
+++ b/lib/bind/port/mpe/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #

diff --git a/lib/bind/port/mpe/include/Makefile.in b/lib/bind/port/mpe/include/Makefile.in
index 44d68c4b6edfec8c48a310be88e7f983ada57ed3..03c8957f104f5d4918f2e7bb3bb87a107e7e550b 100644 (file)
--- a/lib/bind/port/mpe/include/Makefile.in
+++ b/lib/bind/port/mpe/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.3 2004/03/16 05:22:25 marka Exp $
+# $Id: Makefile.in,v 1.4 2007/06/18 23:47:37 tbox Exp $
 
 srcdir =        @srcdir@
 VPATH =         @srcdir@

diff --git a/lib/bind/port/netbsd/Makefile.in b/lib/bind/port/netbsd/Makefile.in
index 99e59854895b9d26f3df4c50ddb6f3953c921952..84f9cf9ef1f16ea7335ce7b95f09bb4cb03dc04d 100644 (file)
--- a/lib/bind/port/netbsd/Makefile.in
+++ b/lib/bind/port/netbsd/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #

diff --git a/lib/bind/port/netbsd/include/Makefile.in b/lib/bind/port/netbsd/include/Makefile.in
index 3b78127ee6cbe862f1598004b6eb5c3e78e133ba..f661fe8956f0b83b037b8f80439e2965c4a1391d 100644 (file)
--- a/lib/bind/port/netbsd/include/Makefile.in
+++ b/lib/bind/port/netbsd/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2 2004/03/16 05:22:25 marka Exp $
+# $Id: Makefile.in,v 1.3 2007/06/18 23:47:37 tbox Exp $
 
 srcdir =        @srcdir@
 VPATH =         @srcdir@

diff --git a/lib/bind/port/next/Makefile.in b/lib/bind/port/next/Makefile.in
index 99e59854895b9d26f3df4c50ddb6f3953c921952..84f9cf9ef1f16ea7335ce7b95f09bb4cb03dc04d 100644 (file)
--- a/lib/bind/port/next/Makefile.in
+++ b/lib/bind/port/next/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #

diff --git a/lib/bind/port/next/include/Makefile.in b/lib/bind/port/next/include/Makefile.in
index 662b0e3899510f95dedb5b80be11ad234fe20500..bb668063de37ab8eb567a2776d9ca74067288532 100644 (file)
--- a/lib/bind/port/next/include/Makefile.in
+++ b/lib/bind/port/next/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2 2004/03/16 05:22:25 marka Exp $
+# $Id: Makefile.in,v 1.3 2007/06/18 23:47:38 tbox Exp $
 
 srcdir =        @srcdir@
 VPATH =         @srcdir@

diff --git a/lib/bind/port/openbsd/Makefile.in b/lib/bind/port/openbsd/Makefile.in
index 99e59854895b9d26f3df4c50ddb6f3953c921952..84f9cf9ef1f16ea7335ce7b95f09bb4cb03dc04d 100644 (file)
--- a/lib/bind/port/openbsd/Makefile.in
+++ b/lib/bind/port/openbsd/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #

diff --git a/lib/bind/port/openbsd/include/Makefile.in b/lib/bind/port/openbsd/include/Makefile.in
index 1c5d2a2836442152804c9487e6a49a241ee92ce6..a38788e932126bcd224116968448f9c4d09beed3 100644 (file)
--- a/lib/bind/port/openbsd/include/Makefile.in
+++ b/lib/bind/port/openbsd/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2 2004/03/16 05:22:26 marka Exp $
+# $Id: Makefile.in,v 1.3 2007/06/18 23:47:38 tbox Exp $
 
 srcdir =        @srcdir@
 VPATH =         @srcdir@

diff --git a/lib/bind/port/prand_conf/Makefile.in b/lib/bind/port/prand_conf/Makefile.in
index 99e59854895b9d26f3df4c50ddb6f3953c921952..84f9cf9ef1f16ea7335ce7b95f09bb4cb03dc04d 100644 (file)
--- a/lib/bind/port/prand_conf/Makefile.in
+++ b/lib/bind/port/prand_conf/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #

diff --git a/lib/bind/port/qnx/Makefile.in b/lib/bind/port/qnx/Makefile.in
index 99e59854895b9d26f3df4c50ddb6f3953c921952..84f9cf9ef1f16ea7335ce7b95f09bb4cb03dc04d 100644 (file)
--- a/lib/bind/port/qnx/Makefile.in
+++ b/lib/bind/port/qnx/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #

diff --git a/lib/bind/port/qnx/include/Makefile.in b/lib/bind/port/qnx/include/Makefile.in
index 831f62580466d417b17149f14af8875bdaedc8d5..a5d457558d51a11c5c6dc746e0e48ae276a21483 100644 (file)
--- a/lib/bind/port/qnx/include/Makefile.in
+++ b/lib/bind/port/qnx/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.3 2004/03/16 05:22:26 marka Exp $
+# $Id: Makefile.in,v 1.4 2007/06/18 23:47:38 tbox Exp $
 
 srcdir =        @srcdir@
 VPATH =         @srcdir@

diff --git a/lib/bind/port/rhapsody/Makefile.in b/lib/bind/port/rhapsody/Makefile.in
index 99e59854895b9d26f3df4c50ddb6f3953c921952..84f9cf9ef1f16ea7335ce7b95f09bb4cb03dc04d 100644 (file)
--- a/lib/bind/port/rhapsody/Makefile.in
+++ b/lib/bind/port/rhapsody/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #

diff --git a/lib/bind/port/rhapsody/include/Makefile.in b/lib/bind/port/rhapsody/include/Makefile.in
index 7634a401fa3d1667baa14445c1eb576810ea0a4f..a6f1bd94f5002e878ea7fbf92ea2c40c4b481ac5 100644 (file)
--- a/lib/bind/port/rhapsody/include/Makefile.in
+++ b/lib/bind/port/rhapsody/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2 2004/03/16 05:22:26 marka Exp $
+# $Id: Makefile.in,v 1.3 2007/06/18 23:47:38 tbox Exp $
 
 srcdir =        @srcdir@
 VPATH =         @srcdir@

diff --git a/lib/bind/port/sco42/Makefile.in b/lib/bind/port/sco42/Makefile.in
index 99e59854895b9d26f3df4c50ddb6f3953c921952..84f9cf9ef1f16ea7335ce7b95f09bb4cb03dc04d 100644 (file)
--- a/lib/bind/port/sco42/Makefile.in
+++ b/lib/bind/port/sco42/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #

diff --git a/lib/bind/port/sco42/include/Makefile.in b/lib/bind/port/sco42/include/Makefile.in
index 8d3e229e00774aba672cb4da5a8d6d8c6debb981..1873578e1a97752068bd5147f14cf92d728e5774 100644 (file)
--- a/lib/bind/port/sco42/include/Makefile.in
+++ b/lib/bind/port/sco42/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2 2004/03/16 05:22:27 marka Exp $
+# $Id: Makefile.in,v 1.3 2007/06/18 23:47:38 tbox Exp $
 
 srcdir =        @srcdir@
 VPATH =         @srcdir@

diff --git a/lib/bind/port/sco50/Makefile.in b/lib/bind/port/sco50/Makefile.in
index 99e59854895b9d26f3df4c50ddb6f3953c921952..84f9cf9ef1f16ea7335ce7b95f09bb4cb03dc04d 100644 (file)
--- a/lib/bind/port/sco50/Makefile.in
+++ b/lib/bind/port/sco50/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #

diff --git a/lib/bind/port/sco50/include/Makefile.in b/lib/bind/port/sco50/include/Makefile.in
index bc08b64fbb14fadb2a4f717811cb044264c41297..dd40727f38e85d702714c7c541328aca59721b94 100644 (file)
--- a/lib/bind/port/sco50/include/Makefile.in
+++ b/lib/bind/port/sco50/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2 2004/03/16 05:22:27 marka Exp $
+# $Id: Makefile.in,v 1.3 2007/06/18 23:47:38 tbox Exp $
 
 srcdir =        @srcdir@
 VPATH =         @srcdir@

diff --git a/lib/bind/port/solaris/Makefile.in b/lib/bind/port/solaris/Makefile.in
index 99e59854895b9d26f3df4c50ddb6f3953c921952..84f9cf9ef1f16ea7335ce7b95f09bb4cb03dc04d 100644 (file)
--- a/lib/bind/port/solaris/Makefile.in
+++ b/lib/bind/port/solaris/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #

diff --git a/lib/bind/port/solaris/include/Makefile.in b/lib/bind/port/solaris/include/Makefile.in
index 928d73c40d18bcccf6db19d16b45c3a982e18c3c..bb668063de37ab8eb567a2776d9ca74067288532 100644 (file)
--- a/lib/bind/port/solaris/include/Makefile.in
+++ b/lib/bind/port/solaris/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2 2004/03/16 05:22:27 marka Exp $
+# $Id: Makefile.in,v 1.3 2007/06/18 23:47:38 tbox Exp $
 
 srcdir =        @srcdir@
 VPATH =         @srcdir@

diff --git a/lib/bind/port/solaris/include/sys/bitypes.h b/lib/bind/port/solaris/include/sys/bitypes.h
index 27ce345685bdaecc7db8916eaae322ffbb1a4738..388a997e746a74d123ade150c82af6a4c8085937 100644 (file)
--- a/lib/bind/port/solaris/include/sys/bitypes.h
+++ b/lib/bind/port/solaris/include/sys/bitypes.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: bitypes.h,v 1.3 2004/03/16 05:22:28 marka Exp $ */
+/* $Id: bitypes.h,v 1.4 2007/06/18 23:47:38 tbox Exp $ */
 
 #ifndef __BIT_TYPES_DEFINED__
 #define __BIT_TYPES_DEFINED__

diff --git a/lib/bind/port/sunos/Makefile.in b/lib/bind/port/sunos/Makefile.in
index 99e59854895b9d26f3df4c50ddb6f3953c921952..84f9cf9ef1f16ea7335ce7b95f09bb4cb03dc04d 100644 (file)
--- a/lib/bind/port/sunos/Makefile.in
+++ b/lib/bind/port/sunos/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #

diff --git a/lib/bind/port/sunos/include/Makefile.in b/lib/bind/port/sunos/include/Makefile.in
index 51efec2389599ea6406559fe4ba022b0bd8b1891..bea3c34379062f6cecfa9c7f7d6c84012b0797d4 100644 (file)
--- a/lib/bind/port/sunos/include/Makefile.in
+++ b/lib/bind/port/sunos/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2 2004/03/16 05:22:28 marka Exp $
+# $Id: Makefile.in,v 1.3 2007/06/18 23:47:38 tbox Exp $
 
 srcdir =        @srcdir@
 VPATH =         @srcdir@

diff --git a/lib/bind/port/sunos/include/paths.h b/lib/bind/port/sunos/include/paths.h
index 48b1c434356efa763a0ae284d4bd73e3a1c6b3a2..43f6f74268b9ae1f64564a63bf5b44af8057649f 100644 (file)
--- a/lib/bind/port/sunos/include/paths.h
+++ b/lib/bind/port/sunos/include/paths.h
@@ -1,7 +1,7 @@
 /*
  * 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.
  *
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: paths.h,v 1.2 2007/05/16 23:46:54 tbox Exp $ */
+/* $Id: paths.h,v 1.3 2007/06/18 23:47:38 tbox Exp $ */
 
 #define _PATH_DEVNULL "/dev/null"
 

diff --git a/lib/bind/port/ultrix/Makefile.in b/lib/bind/port/ultrix/Makefile.in
index 99e59854895b9d26f3df4c50ddb6f3953c921952..84f9cf9ef1f16ea7335ce7b95f09bb4cb03dc04d 100644 (file)
--- a/lib/bind/port/ultrix/Makefile.in
+++ b/lib/bind/port/ultrix/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #

diff --git a/lib/bind/port/ultrix/include/Makefile.in b/lib/bind/port/ultrix/include/Makefile.in
index 862f29fe5eb2d6cb6e2ab5985f9f80d16496e62b..23905850a9eae7e3b6e49cfd11830968387a31f7 100644 (file)
--- a/lib/bind/port/ultrix/include/Makefile.in
+++ b/lib/bind/port/ultrix/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2 2004/03/16 05:22:29 marka Exp $
+# $Id: Makefile.in,v 1.3 2007/06/18 23:47:39 tbox Exp $
 
 srcdir =        @srcdir@
 VPATH =         @srcdir@

diff --git a/lib/bind/port/unixware20/Makefile.in b/lib/bind/port/unixware20/Makefile.in
index 99e59854895b9d26f3df4c50ddb6f3953c921952..84f9cf9ef1f16ea7335ce7b95f09bb4cb03dc04d 100644 (file)
--- a/lib/bind/port/unixware20/Makefile.in
+++ b/lib/bind/port/unixware20/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #

diff --git a/lib/bind/port/unixware20/include/Makefile.in b/lib/bind/port/unixware20/include/Makefile.in
index c4a8b5f80bb7f8e125f09dec9f5df6bd508189e3..16d7c9b7818f6c3e2e9dfe6d59959ce8c6f518ea 100644 (file)
--- a/lib/bind/port/unixware20/include/Makefile.in
+++ b/lib/bind/port/unixware20/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2 2004/03/16 05:22:29 marka Exp $
+# $Id: Makefile.in,v 1.3 2007/06/18 23:47:39 tbox Exp $
 
 srcdir =        @srcdir@
 VPATH =         @srcdir@

diff --git a/lib/bind/port/unixware212/Makefile.in b/lib/bind/port/unixware212/Makefile.in
index 99e59854895b9d26f3df4c50ddb6f3953c921952..84f9cf9ef1f16ea7335ce7b95f09bb4cb03dc04d 100644 (file)
--- a/lib/bind/port/unixware212/Makefile.in
+++ b/lib/bind/port/unixware212/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #

diff --git a/lib/bind/port/unixware212/include/Makefile.in b/lib/bind/port/unixware212/include/Makefile.in
index c4a8b5f80bb7f8e125f09dec9f5df6bd508189e3..16d7c9b7818f6c3e2e9dfe6d59959ce8c6f518ea 100644 (file)
--- a/lib/bind/port/unixware212/include/Makefile.in
+++ b/lib/bind/port/unixware212/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2 2004/03/16 05:22:29 marka Exp $
+# $Id: Makefile.in,v 1.3 2007/06/18 23:47:39 tbox Exp $
 
 srcdir =        @srcdir@
 VPATH =         @srcdir@

diff --git a/lib/bind/port/unixware7/Makefile.in b/lib/bind/port/unixware7/Makefile.in
index 99e59854895b9d26f3df4c50ddb6f3953c921952..84f9cf9ef1f16ea7335ce7b95f09bb4cb03dc04d 100644 (file)
--- a/lib/bind/port/unixware7/Makefile.in
+++ b/lib/bind/port/unixware7/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #

diff --git a/lib/bind/port/unixware7/include/Makefile.in b/lib/bind/port/unixware7/include/Makefile.in
index eb9cc49ba331d77464521345e08e38f0cc828f51..20647328ee6bef08c52b56bb40aac6bedc1c66f4 100644 (file)
--- a/lib/bind/port/unixware7/include/Makefile.in
+++ b/lib/bind/port/unixware7/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2 2004/03/16 05:22:30 marka Exp $
+# $Id: Makefile.in,v 1.3 2007/06/18 23:47:39 tbox Exp $
 
 srcdir =        @srcdir@
 VPATH =         @srcdir@

diff --git a/lib/bind/port/unknown/Makefile.in b/lib/bind/port/unknown/Makefile.in
index 99e59854895b9d26f3df4c50ddb6f3953c921952..84f9cf9ef1f16ea7335ce7b95f09bb4cb03dc04d 100644 (file)
--- a/lib/bind/port/unknown/Makefile.in
+++ b/lib/bind/port/unknown/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #

diff --git a/lib/bind/port/unknown/include/Makefile.in b/lib/bind/port/unknown/include/Makefile.in
index 9e921d89c0b85798a0e4cdb922f36c5cdd28d926..ef1cd65aee74e62c9ec0dccad34cdbb62079e849 100644 (file)
--- a/lib/bind/port/unknown/include/Makefile.in
+++ b/lib/bind/port/unknown/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.6 2005/03/16 00:55:16 marka Exp $
+# $Id: Makefile.in,v 1.7 2007/06/18 23:47:39 tbox Exp $
 
 all:
        exit 1

diff --git a/lib/bind/port_after.h.in b/lib/bind/port_after.h.in
index c3672163b573f146911f55c33646fc269674ff69..48f56f58f7b014cfd276f9b31c36bd16b68faaa9 100644 (file)
--- a/lib/bind/port_after.h.in
+++ b/lib/bind/port_after.h.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: port_after.h.in,v 1.52 2007/01/09 03:11:15 marka Exp $ */
+/* $Id: port_after.h.in,v 1.53 2007/06/18 23:47:34 tbox Exp $ */
 
 #ifndef port_after_h
 #define port_after_h

diff --git a/lib/bind/port_before.h.in b/lib/bind/port_before.h.in
index 52f1b5fafdf68f241db7c6dd709ee865fa2f2001..19552f92a50746cfac91d04e8241139347cecf6b 100644 (file)
--- a/lib/bind/port_before.h.in
+++ b/lib/bind/port_before.h.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2005-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: port_before.h.in,v 1.26 2007/05/18 06:22:03 marka Exp $ */
+/* $Id: port_before.h.in,v 1.27 2007/06/18 23:47:34 tbox Exp $ */
 
 #ifndef port_before_h
 #define port_before_h

diff --git a/lib/bind/resolv/Makefile.in b/lib/bind/resolv/Makefile.in
index 6040eee05be685667ded72744737d027a1656a0e..0d97f9c244fe544f7ab3b43d7c81782691c2f575 100644 (file)
--- a/lib/bind/resolv/Makefile.in
+++ b/lib/bind/resolv/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.6 2005/07/29 00:12:41 marka Exp $
+# $Id: Makefile.in,v 1.7 2007/06/18 23:47:39 tbox Exp $
 
 srcdir=                @srcdir@
 VPATH =         @srcdir@

diff --git a/lib/bind9/Makefile.in b/lib/bind9/Makefile.in
index 9c3b2461da8b82b623eb217a1519dfed32089d6c..840b1b38078d03a80ff9b1762d09ba31e3ca7426 100644 (file)
--- a/lib/bind9/Makefile.in
+++ b/lib/bind9/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.9 2004/12/10 00:12:27 marka Exp $
+# $Id: Makefile.in,v 1.10 2007/06/18 23:47:39 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index f7bd0d4ef387665cd7a6f383176f346802da53ae..d92920ec090c727924dd1d6f0f17d303a276228f 100644 (file)
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: check.c,v 1.79 2007/03/29 06:36:30 marka Exp $ */
+/* $Id: check.c,v 1.80 2007/06/18 23:47:39 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/bind9/getaddresses.c b/lib/bind9/getaddresses.c
index fb435bdaaea64a9e9e14dc5ca3310ec4050cbfe5..255be7012f1849e47f68a606fbbadb55356f8279 100644 (file)
--- a/lib/bind9/getaddresses.c
+++ b/lib/bind9/getaddresses.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001, 2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: getaddresses.c,v 1.20 2005/10/14 01:14:08 marka Exp $ */
+/* $Id: getaddresses.c,v 1.21 2007/06/18 23:47:39 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/bind9/include/Makefile.in b/lib/bind9/include/Makefile.in
index 6c6611e672bb95efe4285cbcb162c293db6f5c8b..95fc3618b1b4345dda425135a10fe5c5ec20bdb2 100644 (file)
--- a/lib/bind9/include/Makefile.in
+++ b/lib/bind9/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2 2004/03/05 05:09:08 marka Exp $
+# $Id: Makefile.in,v 1.3 2007/06/18 23:47:39 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/bind9/include/bind9/Makefile.in b/lib/bind9/include/bind9/Makefile.in
index 8ef5c32f5d1fecffe30a1493921d9e37f09b155e..8dae22205260ce564b659150f2c31f4621285f09 100644 (file)
--- a/lib/bind9/include/bind9/Makefile.in
+++ b/lib/bind9/include/bind9/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.6 2004/03/05 05:09:10 marka Exp $
+# $Id: Makefile.in,v 1.7 2007/06/18 23:47:39 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/bind9/include/bind9/check.h b/lib/bind9/include/bind9/check.h
index ae5eaaaa9329410656fa755aaac8f51a8c694d6a..530055ebc4db03846b76666b5766829230a02640 100644 (file)
--- a/lib/bind9/include/bind9/check.h
+++ b/lib/bind9/include/bind9/check.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: check.h,v 1.7 2006/12/22 01:44:59 marka Exp $ */
+/* $Id: check.h,v 1.8 2007/06/18 23:47:39 tbox Exp $ */
 
 #ifndef BIND9_CHECK_H
 #define BIND9_CHECK_H 1

diff --git a/lib/bind9/include/bind9/getaddresses.h b/lib/bind9/include/bind9/getaddresses.h
index 24859785c95e03377bfc3ab21c270adab5b1eb50..79f229fd5953ca61f69e2b7b9813d5e4b5c527ca 100644 (file)
--- a/lib/bind9/include/bind9/getaddresses.h
+++ b/lib/bind9/include/bind9/getaddresses.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: getaddresses.h,v 1.7 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: getaddresses.h,v 1.8 2007/06/18 23:47:39 tbox Exp $ */
 
 #ifndef BIND9_GETADDRESSES_H
 #define BIND9_GETADDRESSES_H 1

diff --git a/lib/bind9/include/bind9/version.h b/lib/bind9/include/bind9/version.h
index 6c813707b81ce9e891fcf33f18254260eba2b7da..88678cd35f884b7b9f73f479bb340f698bd7b1f4 100644 (file)
--- a/lib/bind9/include/bind9/version.h
+++ b/lib/bind9/include/bind9/version.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: version.h,v 1.7 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: version.h,v 1.8 2007/06/18 23:47:39 tbox Exp $ */
 
 /*! \file bind9/version.h */
 

diff --git a/lib/bind9/version.c b/lib/bind9/version.c
index 35e5bba2aad1fc83ce21ae3276f1b032b995226c..346fa3f36194b1ed32c102874f6162d0b2287186 100644 (file)
--- a/lib/bind9/version.c
+++ b/lib/bind9/version.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: version.c,v 1.6 2005/04/29 00:22:42 marka Exp $ */
+/* $Id: version.c,v 1.7 2007/06/18 23:47:39 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/bind9/win32/DLLMain.c b/lib/bind9/win32/DLLMain.c
index 9f6f2fad3a95e236185af7efdd776ca3709421d6..74d6e490311761be6628215081fa6a507263f715 100644 (file)
--- a/lib/bind9/win32/DLLMain.c
+++ b/lib/bind9/win32/DLLMain.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: DLLMain.c,v 1.3 2007/06/18 03:36:50 marka Exp $ */
+/* $Id: DLLMain.c,v 1.4 2007/06/18 23:47:39 tbox Exp $ */
 
 #include <windows.h>
 #include <signal.h>

diff --git a/lib/bind9/win32/version.c b/lib/bind9/win32/version.c
index cfad415bfe51d7477dcc8d5c29de1293d1adf144..5707e2267a5a4952dbffb0cc20f8b3589379d49f 100644 (file)
--- a/lib/bind9/win32/version.c
+++ b/lib/bind9/win32/version.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: version.c,v 1.3 2004/03/05 05:09:14 marka Exp $ */
+/* $Id: version.c,v 1.4 2007/06/18 23:47:39 tbox Exp $ */
 
 #include <versions.h>
 

diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
index f532cdc1056c42593afa339a106066d8c69285e3..43ab1d11a918d013001977d65f04f53cc92511e1 100644 (file)
--- a/lib/dns/Makefile.in
+++ b/lib/dns/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2003  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.155 2006/12/04 01:52:46 marka Exp $
+# $Id: Makefile.in,v 1.156 2007/06/18 23:47:39 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/dns/acache.c b/lib/dns/acache.c
index 35e36ce6f7b5c416421a3d7848fe6357e712964c..5c8802d62d443f00711cf380a5655cc7bc97561c 100644 (file)
--- a/lib/dns/acache.c
+++ b/lib/dns/acache.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2004-2006  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: acache.c,v 1.18 2006/07/06 06:30:00 jinmei Exp $ */
+/* $Id: acache.c,v 1.19 2007/06/18 23:47:40 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/lib/dns/acl.c b/lib/dns/acl.c
index e982674530ce94ad976b33c945c4a21d2a24fdf0..61393d655de56b249b69c40177314368f924ab91 100644 (file)
--- a/lib/dns/acl.c
+++ b/lib/dns/acl.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: acl.c,v 1.30 2006/03/02 00:37:23 marka Exp $ */
+/* $Id: acl.c,v 1.31 2007/06/18 23:47:40 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/adb.c b/lib/dns/adb.c
index c738ce807960ab00db46d2e0047155ab0f037ce3..79b6a19ba27756352d202b512e32c67bd9d7ec9f 100644 (file)
--- a/lib/dns/adb.c
+++ b/lib/dns/adb.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: adb.c,v 1.230 2007/02/25 23:46:49 tbox Exp $ */
+/* $Id: adb.c,v 1.231 2007/06/18 23:47:40 tbox Exp $ */
 
 /*! \file 
  *

diff --git a/lib/dns/byaddr.c b/lib/dns/byaddr.c
index 48fce01d35fef105c9c7c494c4514d93f3711a2f..583aa2b20e738583cfd30d9a1fd331796cad6a78 100644 (file)
--- a/lib/dns/byaddr.c
+++ b/lib/dns/byaddr.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: byaddr.c,v 1.37 2005/04/29 00:22:44 marka Exp $ */
+/* $Id: byaddr.c,v 1.38 2007/06/18 23:47:40 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/cache.c b/lib/dns/cache.c
index 83f58e8e32856210eed030aba63dbede941ebde2..eac86b530508eb002c56cd489e5b63c19850a0a5 100644 (file)
--- a/lib/dns/cache.c
+++ b/lib/dns/cache.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: cache.c,v 1.73 2006/08/01 01:03:27 marka Exp $ */
+/* $Id: cache.c,v 1.74 2007/06/18 23:47:40 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/callbacks.c b/lib/dns/callbacks.c
index 362262bb44c9fb1a60e5796069ee5e7790d385f4..aa2031c633539b550e681fa32bd9dc3bd439ba04 100644 (file)
--- a/lib/dns/callbacks.c
+++ b/lib/dns/callbacks.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: callbacks.c,v 1.15 2005/04/29 00:22:44 marka Exp $ */
+/* $Id: callbacks.c,v 1.16 2007/06/18 23:47:40 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/compress.c b/lib/dns/compress.c
index d1f5a0b4f3789a057505d9a4439af4dffb7b8d14..826cec1ac93e889df16973f4c431338462584196 100644 (file)
--- a/lib/dns/compress.c
+++ b/lib/dns/compress.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: compress.c,v 1.57 2006/03/02 00:37:23 marka Exp $ */
+/* $Id: compress.c,v 1.58 2007/06/18 23:47:40 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/db.c b/lib/dns/db.c
index d6e4615852f36d6b9ab5df77a1d56459e97e5933..64327651de941eb3b81d234e73eaa0e90e861219 100644 (file)
--- a/lib/dns/db.c
+++ b/lib/dns/db.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: db.c,v 1.82 2007/03/06 02:12:39 tbox Exp $ */
+/* $Id: db.c,v 1.83 2007/06/18 23:47:40 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/dbiterator.c b/lib/dns/dbiterator.c
index a36c7cf63f3db6983710e7b49091b25512602707..5ffac838e76a20d927b6ef0b788b651e387cb47b 100644 (file)
--- a/lib/dns/dbiterator.c
+++ b/lib/dns/dbiterator.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dbiterator.c,v 1.16 2005/04/29 00:22:44 marka Exp $ */
+/* $Id: dbiterator.c,v 1.17 2007/06/18 23:47:40 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/dbtable.c b/lib/dns/dbtable.c
index cfca8502f7a4b2ccdab9da0bc8baaedfaa1d766e..11f1ef66a5a24ddd42e9fd40cbab47c3786dd6be 100644 (file)
--- a/lib/dns/dbtable.c
+++ b/lib/dns/dbtable.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: dbtable.c,v 1.31 2005/07/12 01:00:14 marka Exp $
+ * $Id: dbtable.c,v 1.32 2007/06/18 23:47:40 tbox Exp $
  */
 
 /*! \file

diff --git a/lib/dns/diff.c b/lib/dns/diff.c
index c47b8e8c3a7b86115eac83bf1222a7a29eab4b97..8cfa4cd137b351bce89743ab37623628e2fc02b9 100644 (file)
--- a/lib/dns/diff.c
+++ b/lib/dns/diff.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: diff.c,v 1.12 2005/04/27 04:56:45 sra Exp $ */
+/* $Id: diff.c,v 1.13 2007/06/18 23:47:40 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c
index 56acb725a2ebf8a01b2b37a5391d6a1e68066e06..b9981451ccec9a08795c7893e6d847aeece0101d 100644 (file)
--- a/lib/dns/dispatch.c
+++ b/lib/dns/dispatch.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dispatch.c,v 1.132 2007/05/18 05:30:23 marka Exp $ */
+/* $Id: dispatch.c,v 1.133 2007/06/18 23:47:40 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/dlz.c b/lib/dns/dlz.c
index 4fa4c77f837b543995a89f199823ac5ff62bc888..96b60f120b50cf27c641f2a83aa4a9dd75ec77a2 100644 (file)
--- a/lib/dns/dlz.c
+++ b/lib/dns/dlz.c
@@ -2,7 +2,7 @@
  * Portions Copyright (C) 2005  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -50,7 +50,7 @@
  * USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dlz.c,v 1.3 2005/09/06 03:51:35 marka Exp $ */
+/* $Id: dlz.c,v 1.4 2007/06/18 23:47:40 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/dnssec.c b/lib/dns/dnssec.c
index bed0f9e93ef238947b3a46f6469f45b5e2d796b8..405362cc3a5c6e7e88bc48cb65f7bde5ba2d6705 100644 (file)
--- a/lib/dns/dnssec.c
+++ b/lib/dns/dnssec.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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.
  *
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: dnssec.c,v 1.89 2007/05/18 23:46:58 tbox Exp $
+ * $Id: dnssec.c,v 1.90 2007/06/18 23:47:40 tbox Exp $
  */
 
 /*! \file */

diff --git a/lib/dns/ds.c b/lib/dns/ds.c
index 2f67c2a20c346eb20981d21414accd67d50d31e5..2d88f3bda251f4330ea9024c350d9f223cfe0411 100644 (file)
--- a/lib/dns/ds.c
+++ b/lib/dns/ds.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2002, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ds.c,v 1.9 2006/02/22 23:50:10 marka Exp $ */
+/* $Id: ds.c,v 1.10 2007/06/18 23:47:40 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/dst_api.c b/lib/dns/dst_api.c
index 0c945efe82c70ca659e5489a73060a0b03b416a3..5e483f31c17238e5db659a4eaddbe7c44e1dc65a 100644 (file)
--- a/lib/dns/dst_api.c
+++ b/lib/dns/dst_api.c
@@ -1,6 +1,19 @@
 /*
  * Portions Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2003  Internet Software Consortium.
+ *
+ * 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 AND NETWORK ASSOCIATES 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.
+ *
  * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -18,7 +31,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: dst_api.c,v 1.8 2006/12/04 01:52:46 marka Exp $
+ * $Id: dst_api.c,v 1.9 2007/06/18 23:47:40 tbox Exp $
  */
 
 /*! \file */

diff --git a/lib/dns/dst_internal.h b/lib/dns/dst_internal.h
index a19cc114aa15702e21d0eeac0b2808d1ab131bbe..6ea46e999642c3960041177fa71cd910f0a2dbad 100644 (file)
--- a/lib/dns/dst_internal.h
+++ b/lib/dns/dst_internal.h
@@ -1,6 +1,19 @@
 /*
  * Portions Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 2000-2002  Internet Software Consortium.
+ *
+ * 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 AND NETWORK ASSOCIATES 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.
+ *
  * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -16,7 +29,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dst_internal.h,v 1.6 2006/12/04 01:52:46 marka Exp $ */
+/* $Id: dst_internal.h,v 1.7 2007/06/18 23:47:40 tbox Exp $ */
 
 #ifndef DST_DST_INTERNAL_H
 #define DST_DST_INTERNAL_H 1

diff --git a/lib/dns/dst_lib.c b/lib/dns/dst_lib.c
index db66557a048ad33dd8ee2715d4fce8ce44f7f2bf..eaf9875bc7a460a28a07e6aa6ea705fcef2a75a1 100644 (file)
--- a/lib/dns/dst_lib.c
+++ b/lib/dns/dst_lib.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -17,7 +17,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: dst_lib.c,v 1.3 2005/04/29 00:22:45 marka Exp $
+ * $Id: dst_lib.c,v 1.4 2007/06/18 23:47:40 tbox Exp $
  */
 
 /*! \file */

diff --git a/lib/dns/dst_openssl.h b/lib/dns/dst_openssl.h
index 886d51493ecd52c9f80410b3ef9fcad8a97968b7..ca30ba86de14ca3cecee79953ea27e59cca1f29c 100644 (file)
--- a/lib/dns/dst_openssl.h
+++ b/lib/dns/dst_openssl.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dst_openssl.h,v 1.3 2005/04/29 00:22:45 marka Exp $ */
+/* $Id: dst_openssl.h,v 1.4 2007/06/18 23:47:40 tbox Exp $ */
 
 #ifndef DST_OPENSSL_H
 #define DST_OPENSSL_H 1

diff --git a/lib/dns/dst_parse.c b/lib/dns/dst_parse.c
index c427522c131d6e3fa59a7b838852ec63f18ff6e7..5753f5efc558938869a35827a166da96a8602376 100644 (file)
--- a/lib/dns/dst_parse.c
+++ b/lib/dns/dst_parse.c
@@ -1,6 +1,19 @@
 /*
  * Portions Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2002  Internet Software Consortium.
+ *
+ * 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 AND NETWORK ASSOCIATES 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.
+ *
  * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -18,7 +31,7 @@
 
 /*%
  * Principal Author: Brian Wellington
- * $Id: dst_parse.c,v 1.7 2006/05/16 04:00:01 marka Exp $
+ * $Id: dst_parse.c,v 1.8 2007/06/18 23:47:40 tbox Exp $
  */
 
 #include <config.h>

diff --git a/lib/dns/dst_parse.h b/lib/dns/dst_parse.h
index 1811d183b57bc57e845fb3c604a12c3e467df467..e456f328e4fcc6f91ed8990bf7f4920bce1134b4 100644 (file)
--- a/lib/dns/dst_parse.h
+++ b/lib/dns/dst_parse.h
@@ -1,6 +1,19 @@
 /*
  * Portions Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 2000-2002  Internet Software Consortium.
+ *
+ * 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 AND NETWORK ASSOCIATES 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.
+ *
  * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -16,7 +29,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dst_parse.h,v 1.5 2006/01/27 23:57:46 marka Exp $ */
+/* $Id: dst_parse.h,v 1.6 2007/06/18 23:47:40 tbox Exp $ */
 
 /*! \file */
 #ifndef DST_DST_PARSE_H

diff --git a/lib/dns/dst_result.c b/lib/dns/dst_result.c
index 4309abf48c5f2f52cc11c95d689d2c97b74d816a..29db8fdc3d117939780e2a994e0b4715a8531525 100644 (file)
--- a/lib/dns/dst_result.c
+++ b/lib/dns/dst_result.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -17,7 +17,7 @@
 
 /*%
  * Principal Author: Brian Wellington
- * $Id: dst_result.c,v 1.3 2005/04/29 00:22:46 marka Exp $
+ * $Id: dst_result.c,v 1.4 2007/06/18 23:47:40 tbox Exp $
  */
 
 #include <config.h>

diff --git a/lib/dns/forward.c b/lib/dns/forward.c
index 8e506edeb12c8d861e101456f92372bfe8ca0bc4..acb23af5c0d1492e9a618108c0647f4d0fc3863d 100644 (file)
--- a/lib/dns/forward.c
+++ b/lib/dns/forward.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: forward.c,v 1.10 2005/07/12 01:00:15 marka Exp $ */
+/* $Id: forward.c,v 1.11 2007/06/18 23:47:40 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/gen-unix.h b/lib/dns/gen-unix.h
index 522f2e1e3a68e6a2d2907b825c06cf90a78ac850..33f5823363571cfc396102984e4f5f585993ba3f 100644 (file)
--- a/lib/dns/gen-unix.h
+++ b/lib/dns/gen-unix.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: gen-unix.h,v 1.17 2005/06/08 02:06:58 marka Exp $ */
+/* $Id: gen-unix.h,v 1.18 2007/06/18 23:47:40 tbox Exp $ */
 
 /*! \file
  * \brief

diff --git a/lib/dns/gen-win32.h b/lib/dns/gen-win32.h
index 6241303d81920f954621a35ddc8c3f868b2b2010..172abab7f6173a461398c3870c65fda033f20368 100644 (file)
--- a/lib/dns/gen-win32.h
+++ b/lib/dns/gen-win32.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -48,7 +48,7 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: gen-win32.h,v 1.21 2006/10/03 23:50:52 marka Exp $ */
+/* $Id: gen-win32.h,v 1.22 2007/06/18 23:47:40 tbox Exp $ */
 
 /*! \file
  * \author Principal Authors: Computer Systems Research Group at UC Berkeley

diff --git a/lib/dns/gen.c b/lib/dns/gen.c
index 36b0fd3ce1036927be0b404f4b42f07420f2c923..03cf9829ea33b8c6e628376624e7d0dbaa286c22 100644 (file)
--- a/lib/dns/gen.c
+++ b/lib/dns/gen.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: gen.c,v 1.79 2006/10/02 07:03:05 marka Exp $ */
+/* $Id: gen.c,v 1.80 2007/06/18 23:47:40 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/gssapi_link.c b/lib/dns/gssapi_link.c
index 52902c352e3e73ddb070d2b1405ea1dbd888524f..09210ea02ee15c53fb218da7ca34570ec621d6eb 100644 (file)
--- a/lib/dns/gssapi_link.c
+++ b/lib/dns/gssapi_link.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
- * 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.
  *
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: gssapi_link.c,v 1.5 2006/12/05 00:13:48 marka Exp $
+ * $Id: gssapi_link.c,v 1.6 2007/06/18 23:47:40 tbox Exp $
  */
 
 #include <config.h>

diff --git a/lib/dns/gssapictx.c b/lib/dns/gssapictx.c
index 91f5beb580fe258f3c8699e273185af7dc7a66dd..6f3797cf8c13fcb37fddc538e962c093b0aa4bad 100644 (file)
--- a/lib/dns/gssapictx.c
+++ b/lib/dns/gssapictx.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: gssapictx.c,v 1.6 2006/12/05 21:59:12 marka Exp $ */
+/* $Id: gssapictx.c,v 1.7 2007/06/18 23:47:40 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/lib/dns/hmac_link.c b/lib/dns/hmac_link.c
index 48c67fb0be6048417669431ef997dd24c8b0bf44..5f3296aa16a39cc19423b602cca9614ef8132d97 100644 (file)
--- a/lib/dns/hmac_link.c
+++ b/lib/dns/hmac_link.c
@@ -1,6 +1,19 @@
 /*
  * Portions Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2002  Internet Software Consortium.
+ *
+ * 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 AND NETWORK ASSOCIATES 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.
+ *
  * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -18,7 +31,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: hmac_link.c,v 1.6 2006/12/04 01:52:46 marka Exp $
+ * $Id: hmac_link.c,v 1.7 2007/06/18 23:47:40 tbox Exp $
  */
 
 #include <config.h>

diff --git a/lib/dns/include/Makefile.in b/lib/dns/include/Makefile.in
index e587acaac85e1bff725443c02157d0ce18df4187..fc179e7ea98a027c6bbc3f5039ea927d2a244d0e 100644 (file)
--- a/lib/dns/include/Makefile.in
+++ b/lib/dns/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.13 2004/12/09 01:41:04 marka Exp $
+# $Id: Makefile.in,v 1.14 2007/06/18 23:47:42 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/dns/include/dns/Makefile.in b/lib/dns/include/dns/Makefile.in
index 3f367bc79204e3e9127cb6965028d58d8a37f7df..4ac325fcd5810635c759f5753ac11607c29206af 100644 (file)
--- a/lib/dns/include/dns/Makefile.in
+++ b/lib/dns/include/dns/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2003  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.50 2004/03/05 05:09:40 marka Exp $
+# $Id: Makefile.in,v 1.51 2007/06/18 23:47:42 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/dns/include/dns/acache.h b/lib/dns/include/dns/acache.h
index ba73e059a518c088f87a7801184d52fc865a4470..098854b91952ff086269eddd727c5b027538c2a9 100644 (file)
--- a/lib/dns/include/dns/acache.h
+++ b/lib/dns/include/dns/acache.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2004, 2006  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: acache.h,v 1.6 2006/05/03 00:07:50 marka Exp $ */
+/* $Id: acache.h,v 1.7 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_ACACHE_H
 #define DNS_ACACHE_H 1

diff --git a/lib/dns/include/dns/acl.h b/lib/dns/include/dns/acl.h
index 293f77a9da68f26a5d0993fc72f7229b8e74c86c..7c7fcf3843783eadeb6943be21e82ced66cd5119 100644 (file)
--- a/lib/dns/include/dns/acl.h
+++ b/lib/dns/include/dns/acl.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: acl.h,v 1.27 2006/12/22 01:44:59 marka Exp $ */
+/* $Id: acl.h,v 1.28 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_ACL_H
 #define DNS_ACL_H 1

diff --git a/lib/dns/include/dns/adb.h b/lib/dns/include/dns/adb.h
index 3d72d092182a1e4bfdda5e5ee899d0f3f801d344..3daf0ea141fe65ffd8b353a7a6130cc4e54597a1 100644 (file)
--- a/lib/dns/include/dns/adb.h
+++ b/lib/dns/include/dns/adb.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: adb.h,v 1.81 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: adb.h,v 1.82 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_ADB_H
 #define DNS_ADB_H 1

diff --git a/lib/dns/include/dns/bit.h b/lib/dns/include/dns/bit.h
index 420a96f44031347281962bb08d963b65395d96f6..1d2570b295fb0196d3322c94a3ed2cd9d30e02c8 100644 (file)
--- a/lib/dns/include/dns/bit.h
+++ b/lib/dns/include/dns/bit.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: bit.h,v 1.12 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: bit.h,v 1.13 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_BIT_H
 #define DNS_BIT_H 1

diff --git a/lib/dns/include/dns/byaddr.h b/lib/dns/include/dns/byaddr.h
index a007a5b8fa88293bb21453137d3a3783dc1a29bd..ecb303dd98bc3e62f8ceb70f6c4abdb3953c7392 100644 (file)
--- a/lib/dns/include/dns/byaddr.h
+++ b/lib/dns/include/dns/byaddr.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: byaddr.h,v 1.20 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: byaddr.h,v 1.21 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_BYADDR_H
 #define DNS_BYADDR_H 1

diff --git a/lib/dns/include/dns/cache.h b/lib/dns/include/dns/cache.h
index e846b60ee1ec06b58757cb881c063600606fda7b..a2a0bcfa5f981667f313cb3a92d63d7fd46966f3 100644 (file)
--- a/lib/dns/include/dns/cache.h
+++ b/lib/dns/include/dns/cache.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: cache.h,v 1.24 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: cache.h,v 1.25 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_CACHE_H
 #define DNS_CACHE_H 1

diff --git a/lib/dns/include/dns/callbacks.h b/lib/dns/include/dns/callbacks.h
index b96765c6db0c1e97848f2742da393bac1a2fff30..4b2325d18770982677dc4524a46bc3ca47928378 100644 (file)
--- a/lib/dns/include/dns/callbacks.h
+++ b/lib/dns/include/dns/callbacks.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: callbacks.h,v 1.22 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: callbacks.h,v 1.23 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_CALLBACKS_H
 #define DNS_CALLBACKS_H 1

diff --git a/lib/dns/include/dns/cert.h b/lib/dns/include/dns/cert.h
index 73a452d36067853aa0896978147da26f5e7b20a0..2958d8abfa44de060372cded6ef7b64215d63c63 100644 (file)
--- a/lib/dns/include/dns/cert.h
+++ b/lib/dns/include/dns/cert.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: cert.h,v 1.17 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: cert.h,v 1.18 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_CERT_H
 #define DNS_CERT_H 1

diff --git a/lib/dns/include/dns/compress.h b/lib/dns/include/dns/compress.h
index c818e435e0ab24631fd6767f1c567e80126b7887..3de54d8793a0680d5847f9a522625803f9ca622f 100644 (file)
--- a/lib/dns/include/dns/compress.h
+++ b/lib/dns/include/dns/compress.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: compress.h,v 1.38 2006/12/22 01:44:59 marka Exp $ */
+/* $Id: compress.h,v 1.39 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_COMPRESS_H
 #define DNS_COMPRESS_H 1

diff --git a/lib/dns/include/dns/db.h b/lib/dns/include/dns/db.h
index 3080af27fef159f6a5bc65a1d0aaf058ec815031..fb87cf66f03ffc3bbe2883fb4485956d8cbb7c39 100644 (file)
--- a/lib/dns/include/dns/db.h
+++ b/lib/dns/include/dns/db.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: db.h,v 1.88 2007/03/06 02:12:39 tbox Exp $ */
+/* $Id: db.h,v 1.89 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_DB_H
 #define DNS_DB_H 1

diff --git a/lib/dns/include/dns/dbiterator.h b/lib/dns/include/dns/dbiterator.h
index 4a38d585507963e1418e6c77610b102f2eb2d9e2..598bb845dd36ad1fcfc0604ca11a768f96b13898 100644 (file)
--- a/lib/dns/include/dns/dbiterator.h
+++ b/lib/dns/include/dns/dbiterator.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dbiterator.h,v 1.23 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: dbiterator.h,v 1.24 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_DBITERATOR_H
 #define DNS_DBITERATOR_H 1

diff --git a/lib/dns/include/dns/dbtable.h b/lib/dns/include/dns/dbtable.h
index ba80f4664c85224e30f3a1258b9be96994df8544..ea597506999119fafd40f671d718bb3a9f8167ad 100644 (file)
--- a/lib/dns/include/dns/dbtable.h
+++ b/lib/dns/include/dns/dbtable.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dbtable.h,v 1.21 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: dbtable.h,v 1.22 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_DBTABLE_H
 #define DNS_DBTABLE_H 1

diff --git a/lib/dns/include/dns/diff.h b/lib/dns/include/dns/diff.h
index a0527d9344ba05c579ababdf89a96083de61c8cf..293622233b2cbe311c9a2e57391bde6fb994023e 100644 (file)
--- a/lib/dns/include/dns/diff.h
+++ b/lib/dns/include/dns/diff.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: diff.h,v 1.10 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: diff.h,v 1.11 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_DIFF_H
 #define DNS_DIFF_H 1

diff --git a/lib/dns/include/dns/dispatch.h b/lib/dns/include/dns/dispatch.h
index 75a0b7e1f564ca0ed8f8f829f7c10da7a1a3bbd2..95ebadd3a9e5d5609066faaa52343ba365bf0f2c 100644 (file)
--- a/lib/dns/include/dns/dispatch.h
+++ b/lib/dns/include/dns/dispatch.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dispatch.h,v 1.54 2007/02/06 00:01:23 marka Exp $ */
+/* $Id: dispatch.h,v 1.55 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_DISPATCH_H
 #define DNS_DISPATCH_H 1

diff --git a/lib/dns/include/dns/dlz.h b/lib/dns/include/dns/dlz.h
index 1ff2bd802b9cf40446315f74b136aeac9d256349..40b7d8c51d8da57f3a006d71f7f1e89e3b8f0bde 100644 (file)
--- a/lib/dns/include/dns/dlz.h
+++ b/lib/dns/include/dns/dlz.h
@@ -2,7 +2,7 @@
  * Portions Copyright (C) 2005, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -50,7 +50,7 @@
  * USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dlz.h,v 1.5 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: dlz.h,v 1.6 2007/06/18 23:47:42 tbox Exp $ */
 
 /*! \file dns/dlz.h */
 

diff --git a/lib/dns/include/dns/dnssec.h b/lib/dns/include/dns/dnssec.h
index 353809984aed485f958031ef30a7030b122a3f25..3c3aa49faa538000d5186468bb93fc283f3b5a6a 100644 (file)
--- a/lib/dns/include/dns/dnssec.h
+++ b/lib/dns/include/dns/dnssec.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec.h,v 1.30 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: dnssec.h,v 1.31 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_DNSSEC_H
 #define DNS_DNSSEC_H 1

diff --git a/lib/dns/include/dns/ds.h b/lib/dns/include/dns/ds.h
index baf392abc4f630615aa08031499edcb3698235f4..6ec4a2cc80e7c95cb97004d8f0ea2874f78bf436 100644 (file)
--- a/lib/dns/include/dns/ds.h
+++ b/lib/dns/include/dns/ds.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ds.h,v 1.8 2006/02/22 23:50:10 marka Exp $ */
+/* $Id: ds.h,v 1.9 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_DS_H
 #define DNS_DS_H 1

diff --git a/lib/dns/include/dns/events.h b/lib/dns/include/dns/events.h
index 31d81deb9027d490054e923008be88f0b7449579..d7e36a2ed556fd75a02d14da434914af3d20b3f2 100644 (file)
--- a/lib/dns/include/dns/events.h
+++ b/lib/dns/include/dns/events.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: events.h,v 1.47 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: events.h,v 1.48 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_EVENTS_H
 #define DNS_EVENTS_H 1

diff --git a/lib/dns/include/dns/fixedname.h b/lib/dns/include/dns/fixedname.h
index a16dbc75206a7d3fa98e4ff03faf7cd5aa2d5dd5..9f2719d344dfcf5e22838e7247b25a09bbb188a6 100644 (file)
--- a/lib/dns/include/dns/fixedname.h
+++ b/lib/dns/include/dns/fixedname.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: fixedname.h,v 1.17 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: fixedname.h,v 1.18 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_FIXEDNAME_H
 #define DNS_FIXEDNAME_H 1

diff --git a/lib/dns/include/dns/forward.h b/lib/dns/include/dns/forward.h
index 39cd426529eb29ae0285a5afb2c6d82ce6b37449..56c1f3acfccf43288a36f43ed0935e6ed255ac6a 100644 (file)
--- a/lib/dns/include/dns/forward.h
+++ b/lib/dns/include/dns/forward.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: forward.h,v 1.9 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: forward.h,v 1.10 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_FORWARD_H
 #define DNS_FORWARD_H 1

diff --git a/lib/dns/include/dns/journal.h b/lib/dns/include/dns/journal.h
index a4e0f0fc8a3b4b11dc7ae3fd962c771da99ee44f..fd4555f9399fdc433c0717f9e2bd32d682fa91f1 100644 (file)
--- a/lib/dns/include/dns/journal.h
+++ b/lib/dns/include/dns/journal.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: journal.h,v 1.29 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: journal.h,v 1.30 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_JOURNAL_H
 #define DNS_JOURNAL_H 1

diff --git a/lib/dns/include/dns/keyflags.h b/lib/dns/include/dns/keyflags.h
index ea909f34a60c2222f831258c5a53758c8e5d5d12..0c6c6d731aaa0df6da4a46868ef5bf2e9738a068 100644 (file)
--- a/lib/dns/include/dns/keyflags.h
+++ b/lib/dns/include/dns/keyflags.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: keyflags.h,v 1.14 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: keyflags.h,v 1.15 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_KEYFLAGS_H
 #define DNS_KEYFLAGS_H 1

diff --git a/lib/dns/include/dns/keytable.h b/lib/dns/include/dns/keytable.h
index 93e8d2c586453ce5c0811221e638c7ecec708991..8676cac2d7be36f37b89e5c9301d05aa2edf5f3f 100644 (file)
--- a/lib/dns/include/dns/keytable.h
+++ b/lib/dns/include/dns/keytable.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: keytable.h,v 1.14 2005/12/04 23:54:01 marka Exp $ */
+/* $Id: keytable.h,v 1.15 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_KEYTABLE_H
 #define DNS_KEYTABLE_H 1

diff --git a/lib/dns/include/dns/keyvalues.h b/lib/dns/include/dns/keyvalues.h
index d5027166bbe3cb18d38474bf25b840b3507b8e5b..c0b64db4f25f1469373e78ded80bec5db98483ba 100644 (file)
--- a/lib/dns/include/dns/keyvalues.h
+++ b/lib/dns/include/dns/keyvalues.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: keyvalues.h,v 1.19 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: keyvalues.h,v 1.20 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_KEYVALUES_H
 #define DNS_KEYVALUES_H 1

diff --git a/lib/dns/include/dns/lib.h b/lib/dns/include/dns/lib.h
index 57a56640ab937cd7dc85381ea24189775690f393..4edbef9d86c5c57ad9cc9789628aad08d9aaee79 100644 (file)
--- a/lib/dns/include/dns/lib.h
+++ b/lib/dns/include/dns/lib.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lib.h,v 1.14 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: lib.h,v 1.15 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_LIB_H
 #define DNS_LIB_H 1

diff --git a/lib/dns/include/dns/log.h b/lib/dns/include/dns/log.h
index d6b5909bbbb1f4f14164e5b295ab87ab7f0c0734..5adcedd12554c299dab1a9a122dcda2aa18aeec5 100644 (file)
--- a/lib/dns/include/dns/log.h
+++ b/lib/dns/include/dns/log.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: log.h,v 1.41 2007/05/21 03:46:42 tbox Exp $ */
+/* $Id: log.h,v 1.42 2007/06/18 23:47:42 tbox Exp $ */
 
 /*! \file dns/log.h
  * \author  Principal Authors: DCL */

diff --git a/lib/dns/include/dns/lookup.h b/lib/dns/include/dns/lookup.h
index d37446ddecbd22cf0d20e36b0ab7e17def7d4065..e2adb4230bb64e616c7098d17da0f54108d786c1 100644 (file)
--- a/lib/dns/include/dns/lookup.h
+++ b/lib/dns/include/dns/lookup.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lookup.h,v 1.10 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: lookup.h,v 1.11 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_LOOKUP_H
 #define DNS_LOOKUP_H 1

diff --git a/lib/dns/include/dns/master.h b/lib/dns/include/dns/master.h
index ac68b830a04f48d7e3ac28884de131dff9fc6044..af1300770888eb293eb05598dc85035996fd8e4e 100644 (file)
--- a/lib/dns/include/dns/master.h
+++ b/lib/dns/include/dns/master.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: master.h,v 1.46 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: master.h,v 1.47 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_MASTER_H
 #define DNS_MASTER_H 1

diff --git a/lib/dns/include/dns/masterdump.h b/lib/dns/include/dns/masterdump.h
index 6a6d6fbaec37097339e65458c39a8ddfba54844d..72dd343555fc672ed5903252b7da74273f4d055a 100644 (file)
--- a/lib/dns/include/dns/masterdump.h
+++ b/lib/dns/include/dns/masterdump.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: masterdump.h,v 1.37 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: masterdump.h,v 1.38 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_MASTERDUMP_H
 #define DNS_MASTERDUMP_H 1

diff --git a/lib/dns/include/dns/message.h b/lib/dns/include/dns/message.h
index 332f9de273678835f5020708c638f09d93cb421f..053d9868cb948f3ac220073cb81569422a109dd5 100644 (file)
--- a/lib/dns/include/dns/message.h
+++ b/lib/dns/include/dns/message.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: message.h,v 1.121 2006/12/22 01:45:00 marka Exp $ */
+/* $Id: message.h,v 1.122 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_MESSAGE_H
 #define DNS_MESSAGE_H 1

diff --git a/lib/dns/include/dns/name.h b/lib/dns/include/dns/name.h
index 2f005d4ab6f1546d943d6246b35ed7aa1815ab0a..2529d9b822cc0c2a7be690a91fd138f9226ec774 100644 (file)
--- a/lib/dns/include/dns/name.h
+++ b/lib/dns/include/dns/name.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: name.h,v 1.124 2006/12/22 01:45:00 marka Exp $ */
+/* $Id: name.h,v 1.125 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_NAME_H
 #define DNS_NAME_H 1

diff --git a/lib/dns/include/dns/ncache.h b/lib/dns/include/dns/ncache.h
index 39f3aa10ef133066d52db2021aeafe691d7ee81c..9eacc3694338edd51cec011bf4da83c8408567a7 100644 (file)
--- a/lib/dns/include/dns/ncache.h
+++ b/lib/dns/include/dns/ncache.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ncache.h,v 1.21 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: ncache.h,v 1.22 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_NCACHE_H
 #define DNS_NCACHE_H 1

diff --git a/lib/dns/include/dns/nsec.h b/lib/dns/include/dns/nsec.h
index 1427ab545f20a6c4d6f37929602689f544b67721..88473b9c1b73a954fc2a254cb80fa5c59523c92b 100644 (file)
--- a/lib/dns/include/dns/nsec.h
+++ b/lib/dns/include/dns/nsec.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsec.h,v 1.8 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: nsec.h,v 1.9 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_NSEC_H
 #define DNS_NSEC_H 1

diff --git a/lib/dns/include/dns/opcode.h b/lib/dns/include/dns/opcode.h
index 61da9970e6885dd79393c343b815e8ce30f912de..774e737ada0891b051c2c72bfcd7a55426033a61 100644 (file)
--- a/lib/dns/include/dns/opcode.h
+++ b/lib/dns/include/dns/opcode.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: opcode.h,v 1.6 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: opcode.h,v 1.7 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_OPCODE_H
 #define DNS_OPCODE_H 1

diff --git a/lib/dns/include/dns/order.h b/lib/dns/include/dns/order.h
index ec05ea8407dbe49949ab3c8f64a8fcb3e38850b5..13360361aaaefd0fa1706e5c53716cd4000e4fff 100644 (file)
--- a/lib/dns/include/dns/order.h
+++ b/lib/dns/include/dns/order.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: order.h,v 1.7 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: order.h,v 1.8 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_ORDER_H
 #define DNS_ORDER_H 1

diff --git a/lib/dns/include/dns/peer.h b/lib/dns/include/dns/peer.h
index 770b57603602ae972faceec1efcebf691a2f40d9..2ac340c69ad6cc1557406124fbd6760949094cf2 100644 (file)
--- a/lib/dns/include/dns/peer.h
+++ b/lib/dns/include/dns/peer.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: peer.h,v 1.29 2006/12/22 01:45:00 marka Exp $ */
+/* $Id: peer.h,v 1.30 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_PEER_H
 #define DNS_PEER_H 1

diff --git a/lib/dns/include/dns/portlist.h b/lib/dns/include/dns/portlist.h
index df39860f0c920048f2bc92265e5a93b82d344242..85b0cfd7c9b32bb58dba8eb7da24ca633f17c2a7 100644 (file)
--- a/lib/dns/include/dns/portlist.h
+++ b/lib/dns/include/dns/portlist.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: portlist.h,v 1.7 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: portlist.h,v 1.8 2007/06/18 23:47:42 tbox Exp $ */
 
 /*! \file dns/portlist.h */
 

diff --git a/lib/dns/include/dns/rbt.h b/lib/dns/include/dns/rbt.h
index 2a416eed3b1c87e09813940f562f609d93d697e3..ff343c5bc2bbda3e85f4e2511482f56c76b6da74 100644 (file)
--- a/lib/dns/include/dns/rbt.h
+++ b/lib/dns/include/dns/rbt.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rbt.h,v 1.66 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: rbt.h,v 1.67 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_RBT_H
 #define DNS_RBT_H 1

diff --git a/lib/dns/include/dns/rcode.h b/lib/dns/include/dns/rcode.h
index 5b7bc7174a232f78be251721137378ab684c177f..c32f7d72f2fe90315c9173ee2607801cc9b79b2a 100644 (file)
--- a/lib/dns/include/dns/rcode.h
+++ b/lib/dns/include/dns/rcode.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rcode.h,v 1.17 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: rcode.h,v 1.18 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_RCODE_H
 #define DNS_RCODE_H 1

diff --git a/lib/dns/include/dns/rdata.h b/lib/dns/include/dns/rdata.h
index 43d752191c5e7fe2c248446f80bb7e249b1aa440..e22e06fbca2e60f173ef8fe9c36eaca9e701a762 100644 (file)
--- a/lib/dns/include/dns/rdata.h
+++ b/lib/dns/include/dns/rdata.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdata.h,v 1.65 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: rdata.h,v 1.66 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_RDATA_H
 #define DNS_RDATA_H 1

diff --git a/lib/dns/include/dns/rdataclass.h b/lib/dns/include/dns/rdataclass.h
index 0a76b86d4dd0ac48704c6b8b8273be326b6536e7..95c9e23d644948f1fda163b8817035eee25bb2be 100644 (file)
--- a/lib/dns/include/dns/rdataclass.h
+++ b/lib/dns/include/dns/rdataclass.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdataclass.h,v 1.22 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: rdataclass.h,v 1.23 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_RDATACLASS_H
 #define DNS_RDATACLASS_H 1

diff --git a/lib/dns/include/dns/rdatalist.h b/lib/dns/include/dns/rdatalist.h
index 5a767e2c7f4a9b660cc694929305b19c5fa600a2..0b271205b71799f77ee94ffa7dbd21095628ed43 100644 (file)
--- a/lib/dns/include/dns/rdatalist.h
+++ b/lib/dns/include/dns/rdatalist.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdatalist.h,v 1.18 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: rdatalist.h,v 1.19 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_RDATALIST_H
 #define DNS_RDATALIST_H 1

diff --git a/lib/dns/include/dns/rdataset.h b/lib/dns/include/dns/rdataset.h
index 183422ff1cc86793e0663f5513a824647eec793f..2bfba90f0c5656585d1668ad754294bb15860bda 100644 (file)
--- a/lib/dns/include/dns/rdataset.h
+++ b/lib/dns/include/dns/rdataset.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdataset.h,v 1.60 2006/12/22 01:45:00 marka Exp $ */
+/* $Id: rdataset.h,v 1.61 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_RDATASET_H
 #define DNS_RDATASET_H 1

diff --git a/lib/dns/include/dns/rdatasetiter.h b/lib/dns/include/dns/rdatasetiter.h
index 92ed5264e91ff802d0f900f25cff0ac4f57a6fe2..59c8a733e2bdfa22c3706637e593cf61282eb610 100644 (file)
--- a/lib/dns/include/dns/rdatasetiter.h
+++ b/lib/dns/include/dns/rdatasetiter.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdatasetiter.h,v 1.19 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: rdatasetiter.h,v 1.20 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_RDATASETITER_H
 #define DNS_RDATASETITER_H 1

diff --git a/lib/dns/include/dns/rdataslab.h b/lib/dns/include/dns/rdataslab.h
index 94a61ec6135b571ceea72ecb75018b995b455636..3f9e0920214d0dd38542308012c2f2c660e7960f 100644 (file)
--- a/lib/dns/include/dns/rdataslab.h
+++ b/lib/dns/include/dns/rdataslab.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdataslab.h,v 1.29 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: rdataslab.h,v 1.30 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_RDATASLAB_H
 #define DNS_RDATASLAB_H 1

diff --git a/lib/dns/include/dns/rdatatype.h b/lib/dns/include/dns/rdatatype.h
index 28e2c7716a5634a86c82d3c0cd5a81ec94db6a6d..4ab7a586d3aa6dcbd220aceb8f0923f442dba5ac 100644 (file)
--- a/lib/dns/include/dns/rdatatype.h
+++ b/lib/dns/include/dns/rdatatype.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdatatype.h,v 1.22 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: rdatatype.h,v 1.23 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_RDATATYPE_H
 #define DNS_RDATATYPE_H 1

diff --git a/lib/dns/include/dns/request.h b/lib/dns/include/dns/request.h
index c201f144a9847c7ffb85ea2f3483527d0e1fa663..5fb498a7f9368ffc7502833d6c264d33e2f73d52 100644 (file)
--- a/lib/dns/include/dns/request.h
+++ b/lib/dns/include/dns/request.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: request.h,v 1.25 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: request.h,v 1.26 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_REQUEST_H
 #define DNS_REQUEST_H 1

diff --git a/lib/dns/include/dns/resolver.h b/lib/dns/include/dns/resolver.h
index 593274953f5b7764103e80e20adbdf663a4c49bc..5c190aa995acd337e9fd17351a06b543e1797f52 100644 (file)
--- a/lib/dns/include/dns/resolver.h
+++ b/lib/dns/include/dns/resolver.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.h,v 1.55 2007/02/06 00:01:23 marka Exp $ */
+/* $Id: resolver.h,v 1.56 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_RESOLVER_H
 #define DNS_RESOLVER_H 1

diff --git a/lib/dns/include/dns/result.h b/lib/dns/include/dns/result.h
index a2b9b13e364b3daaae43618286c2f2ff9877d9f8..6afed52330f1d4444ea0938c388fbdbf575ca0ed 100644 (file)
--- a/lib/dns/include/dns/result.h
+++ b/lib/dns/include/dns/result.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: result.h,v 1.112 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: result.h,v 1.113 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_RESULT_H
 #define DNS_RESULT_H 1

diff --git a/lib/dns/include/dns/rootns.h b/lib/dns/include/dns/rootns.h
index 56e75ec0f1e509c2928d220a185742e6abfe4961..71ef38674b57961b51a305be1d5cda706ee95174 100644 (file)
--- a/lib/dns/include/dns/rootns.h
+++ b/lib/dns/include/dns/rootns.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rootns.h,v 1.14 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: rootns.h,v 1.15 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_ROOTNS_H
 #define DNS_ROOTNS_H 1

diff --git a/lib/dns/include/dns/sdb.h b/lib/dns/include/dns/sdb.h
index c62efc705e653b85f143fab23988459e484b47c2..c3b66ee721b390491b2cb8cefaaed0bb28cfad44 100644 (file)
--- a/lib/dns/include/dns/sdb.h
+++ b/lib/dns/include/dns/sdb.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sdb.h,v 1.19 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: sdb.h,v 1.20 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_SDB_H
 #define DNS_SDB_H 1

diff --git a/lib/dns/include/dns/sdlz.h b/lib/dns/include/dns/sdlz.h
index ef8bb2ece3aaa32536aa326ba1330e9ac9e49cee..3e4ad40e5033059f072d56de97b24568e8364455 100644 (file)
--- a/lib/dns/include/dns/sdlz.h
+++ b/lib/dns/include/dns/sdlz.h
@@ -2,7 +2,7 @@
  * Portions Copyright (C) 2005, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -50,7 +50,7 @@
  * USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sdlz.h,v 1.5 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: sdlz.h,v 1.6 2007/06/18 23:47:42 tbox Exp $ */
 
 /*! \file dns/sdlz.h */
 

diff --git a/lib/dns/include/dns/secalg.h b/lib/dns/include/dns/secalg.h
index 3a16b5f5a372459758fa29d09e18f730676c3b79..414487a7f4bb4f0d2451505b1e5e5532bcf2366c 100644 (file)
--- a/lib/dns/include/dns/secalg.h
+++ b/lib/dns/include/dns/secalg.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: secalg.h,v 1.17 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: secalg.h,v 1.18 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_SECALG_H
 #define DNS_SECALG_H 1

diff --git a/lib/dns/include/dns/secproto.h b/lib/dns/include/dns/secproto.h
index 14a0024307c3030ef0d555d9dc9618e198766813..dc53807a7f4f37d56fbbda8a7f2f6ff2ee270bcd 100644 (file)
--- a/lib/dns/include/dns/secproto.h
+++ b/lib/dns/include/dns/secproto.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: secproto.h,v 1.14 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: secproto.h,v 1.15 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_SECPROTO_H
 #define DNS_SECPROTO_H 1

diff --git a/lib/dns/include/dns/soa.h b/lib/dns/include/dns/soa.h
index b056ffc1017992c61657587eb4362a6179848198..d021e8f8599d3ebe6557943d88d388a9c523f3c2 100644 (file)
--- a/lib/dns/include/dns/soa.h
+++ b/lib/dns/include/dns/soa.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: soa.h,v 1.7 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: soa.h,v 1.8 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_SOA_H
 #define DNS_SOA_H 1

diff --git a/lib/dns/include/dns/ssu.h b/lib/dns/include/dns/ssu.h
index 0519590308ce01ceb84cea474db4a62be0e1d8c1..1527315429880edeb2b5905a9f804710c1ad70dd 100644 (file)
--- a/lib/dns/include/dns/ssu.h
+++ b/lib/dns/include/dns/ssu.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ssu.h,v 1.19 2006/12/22 01:45:00 marka Exp $ */
+/* $Id: ssu.h,v 1.20 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_SSU_H
 #define DNS_SSU_H 1

diff --git a/lib/dns/include/dns/stats.h b/lib/dns/include/dns/stats.h
index 68903d71142ecf512d4e0dbc8b156132fdbabe86..f54017a8006d17f483b23332d25a6af2d3a8b3c6 100644 (file)
--- a/lib/dns/include/dns/stats.h
+++ b/lib/dns/include/dns/stats.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: stats.h,v 1.11 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: stats.h,v 1.12 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_STATS_H
 #define DNS_STATS_H 1

diff --git a/lib/dns/include/dns/tcpmsg.h b/lib/dns/include/dns/tcpmsg.h
index ca66897579b0c3a9aaf1a8fcf32e42b5dbcf09b4..9073bd7793ccf8a32ffb8b406102d92ccc425457 100644 (file)
--- a/lib/dns/include/dns/tcpmsg.h
+++ b/lib/dns/include/dns/tcpmsg.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tcpmsg.h,v 1.20 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: tcpmsg.h,v 1.21 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_TCPMSG_H
 #define DNS_TCPMSG_H 1

diff --git a/lib/dns/include/dns/time.h b/lib/dns/include/dns/time.h
index 6bb16ec4d6a2d0949f14505de94159f5ed2798b7..dd8f91d36b50dcbaae0515088a9360ccef84600e 100644 (file)
--- a/lib/dns/include/dns/time.h
+++ b/lib/dns/include/dns/time.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: time.h,v 1.15 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: time.h,v 1.16 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_TIME_H
 #define DNS_TIME_H 1

diff --git a/lib/dns/include/dns/timer.h b/lib/dns/include/dns/timer.h
index 0af25ce710216a3823b3fa7537b8ed8b34f81eaa..d735a83d2b3ab83986f3094736f70d912db3ad64 100644 (file)
--- a/lib/dns/include/dns/timer.h
+++ b/lib/dns/include/dns/timer.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: timer.h,v 1.7 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: timer.h,v 1.8 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_TIMER_H
 #define DNS_TIMER_H 1

diff --git a/lib/dns/include/dns/tkey.h b/lib/dns/include/dns/tkey.h
index 65658eb940a7b8ed158731bb2cacc701c15e5df8..865b1e58f89e4244e535f2eae4989659ebb108a0 100644 (file)
--- a/lib/dns/include/dns/tkey.h
+++ b/lib/dns/include/dns/tkey.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tkey.h,v 1.24 2006/12/22 01:45:00 marka Exp $ */
+/* $Id: tkey.h,v 1.25 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_TKEY_H
 #define DNS_TKEY_H 1

diff --git a/lib/dns/include/dns/tsig.h b/lib/dns/include/dns/tsig.h
index 95d5386a760b686cfb48dc62cdde58382ee29506..4a8bf2ecbd5dc86628d33ccf3e18b368e6970659 100644 (file)
--- a/lib/dns/include/dns/tsig.h
+++ b/lib/dns/include/dns/tsig.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tsig.h,v 1.49 2006/12/22 01:45:00 marka Exp $ */
+/* $Id: tsig.h,v 1.50 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_TSIG_H
 #define DNS_TSIG_H 1

diff --git a/lib/dns/include/dns/ttl.h b/lib/dns/include/dns/ttl.h
index 6583498ef41d9440f6b30273e0e843128490e311..b75c87e8a5220954a99592f3ff9c08c4d7ff9384 100644 (file)
--- a/lib/dns/include/dns/ttl.h
+++ b/lib/dns/include/dns/ttl.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ttl.h,v 1.17 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: ttl.h,v 1.18 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_TTL_H
 #define DNS_TTL_H 1

diff --git a/lib/dns/include/dns/types.h b/lib/dns/include/dns/types.h
index d384da62ab4ce49c233fb42de2295656f441244c..37f2930841fd48b4a62ab4643b6d8dc62715b8bf 100644 (file)
--- a/lib/dns/include/dns/types.h
+++ b/lib/dns/include/dns/types.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: types.h,v 1.123 2006/12/22 01:45:00 marka Exp $ */
+/* $Id: types.h,v 1.124 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_TYPES_H
 #define DNS_TYPES_H 1

diff --git a/lib/dns/include/dns/validator.h b/lib/dns/include/dns/validator.h
index 443dec2d36a832dd9dec6c213c54d96e888d8729..e749c7f3bcdb454ccef6e413764a6f0df849fe44 100644 (file)
--- a/lib/dns/include/dns/validator.h
+++ b/lib/dns/include/dns/validator.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: validator.h,v 1.37 2007/01/08 02:45:04 marka Exp $ */
+/* $Id: validator.h,v 1.38 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_VALIDATOR_H
 #define DNS_VALIDATOR_H 1

diff --git a/lib/dns/include/dns/version.h b/lib/dns/include/dns/version.h
index 8de6f29f5301fb9459b8d2f6ba983e24f45f6769..4df4697ef21709d0f621de9842b2efea84519c4c 100644 (file)
--- a/lib/dns/include/dns/version.h
+++ b/lib/dns/include/dns/version.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: version.h,v 1.7 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: version.h,v 1.8 2007/06/18 23:47:42 tbox Exp $ */
 
 /*! \file dns/version.h */
 

diff --git a/lib/dns/include/dns/view.h b/lib/dns/include/dns/view.h
index 1f3a01125724727c4093d342834ac5e85827d00d..4964bd1f6df7acae88fd72a467b1ef0eadf74bd5 100644 (file)
--- a/lib/dns/include/dns/view.h
+++ b/lib/dns/include/dns/view.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: view.h,v 1.106 2007/05/15 02:38:34 marka Exp $ */
+/* $Id: view.h,v 1.107 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_VIEW_H
 #define DNS_VIEW_H 1

diff --git a/lib/dns/include/dns/xfrin.h b/lib/dns/include/dns/xfrin.h
index 8cf468354de45a6e3a11150e3f76bd6d0dcd9e56..50082d554d2a5b68fc22a7765a90fef62e7b3cb0 100644 (file)
--- a/lib/dns/include/dns/xfrin.h
+++ b/lib/dns/include/dns/xfrin.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: xfrin.h,v 1.26 2006/12/22 01:45:00 marka Exp $ */
+/* $Id: xfrin.h,v 1.27 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_XFRIN_H
 #define DNS_XFRIN_H 1

diff --git a/lib/dns/include/dns/zone.h b/lib/dns/include/dns/zone.h
index 9418468df7bff2550988301da1a307770b595954..2c57a4018243423cb1cf4cd1afda48545dd8a4cf 100644 (file)
--- a/lib/dns/include/dns/zone.h
+++ b/lib/dns/include/dns/zone.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.h,v 1.151 2007/03/29 23:47:04 tbox Exp $ */
+/* $Id: zone.h,v 1.152 2007/06/18 23:47:42 tbox Exp $ */
 
 #ifndef DNS_ZONE_H
 #define DNS_ZONE_H 1

diff --git a/lib/dns/include/dns/zonekey.h b/lib/dns/include/dns/zonekey.h
index c8c4f4eb5200b5bfa4cb7e37656f6019b2167fd8..0dbe3a784f3b59471f5f793cf9a9b8a3709257b2 100644 (file)
--- a/lib/dns/include/dns/zonekey.h
+++ b/lib/dns/include/dns/zonekey.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zonekey.h,v 1.8 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: zonekey.h,v 1.9 2007/06/18 23:47:43 tbox Exp $ */
 
 #ifndef DNS_ZONEKEY_H
 #define DNS_ZONEKEY_H 1

diff --git a/lib/dns/include/dns/zt.h b/lib/dns/include/dns/zt.h
index 47565d375005a0656c8ac4f16da9e4fccba93b95..96ee7722e27c2484f498ce03481eb0aac0d4019e 100644 (file)
--- a/lib/dns/include/dns/zt.h
+++ b/lib/dns/include/dns/zt.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zt.h,v 1.36 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: zt.h,v 1.37 2007/06/18 23:47:43 tbox Exp $ */
 
 #ifndef DNS_ZT_H
 #define DNS_ZT_H 1

diff --git a/lib/dns/include/dst/Makefile.in b/lib/dns/include/dst/Makefile.in
index 953199e8b649c2abf4fc333c0551365f9bc23ede..f70da3b6bfeb5065ff24d86f90e39795199fd977 100644 (file)
--- a/lib/dns/include/dst/Makefile.in
+++ b/lib/dns/include/dst/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.1 2004/12/09 01:41:05 marka Exp $
+# $Id: Makefile.in,v 1.2 2007/06/18 23:47:43 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/dns/include/dst/dst.h b/lib/dns/include/dst/dst.h
index 6a034bdcbf81396336bb3069f1bf355840f4c44a..faa78455b8b47e764f3c6fcee5231819cf7ac79e 100644 (file)
--- a/lib/dns/include/dst/dst.h
+++ b/lib/dns/include/dst/dst.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dst.h,v 1.7 2006/12/22 01:45:00 marka Exp $ */
+/* $Id: dst.h,v 1.8 2007/06/18 23:47:43 tbox Exp $ */
 
 #ifndef DST_DST_H
 #define DST_DST_H 1

diff --git a/lib/dns/include/dst/gssapi.h b/lib/dns/include/dst/gssapi.h
index 1c02facf3f2e584b93d74ef404695d96a8dd753f..4852f386ae17351f9c4ccb73f1ed4a9cda5f750b 100644 (file)
--- a/lib/dns/include/dst/gssapi.h
+++ b/lib/dns/include/dst/gssapi.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: gssapi.h,v 1.7 2006/12/22 01:45:00 marka Exp $ */
+/* $Id: gssapi.h,v 1.8 2007/06/18 23:47:43 tbox Exp $ */
 
 #ifndef DST_GSSAPI_H
 #define DST_GSSAPI_H 1

diff --git a/lib/dns/include/dst/lib.h b/lib/dns/include/dst/lib.h
index 31c28d1f5d0627a617450805d8a4947baeaa7ee9..11a7799e4f910eaa471e4f7196e4e91d26a7f234 100644 (file)
--- a/lib/dns/include/dst/lib.h
+++ b/lib/dns/include/dst/lib.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lib.h,v 1.5 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: lib.h,v 1.6 2007/06/18 23:47:43 tbox Exp $ */
 
 #ifndef DST_LIB_H
 #define DST_LIB_H 1

diff --git a/lib/dns/include/dst/result.h b/lib/dns/include/dst/result.h
index cff49f37a83a9300a9545333ca2f9374ee7f5cb8..13eee6f18fc75e7b2777ebda44ae4a063d14bfbe 100644 (file)
--- a/lib/dns/include/dst/result.h
+++ b/lib/dns/include/dst/result.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: result.h,v 1.5 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: result.h,v 1.6 2007/06/18 23:47:43 tbox Exp $ */
 
 #ifndef DST_RESULT_H
 #define DST_RESULT_H 1

diff --git a/lib/dns/journal.c b/lib/dns/journal.c
index bdaa0cba8faaa7f2c2c276b4e98ccf77d0f7f995..e5f3fab9ad5e293c48b2287ed4882b45ddf9611c 100644 (file)
--- a/lib/dns/journal.c
+++ b/lib/dns/journal.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: journal.c,v 1.94 2005/11/03 22:59:52 marka Exp $ */
+/* $Id: journal.c,v 1.95 2007/06/18 23:47:40 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/lib/dns/key.c b/lib/dns/key.c
index 5789ddefc77c63fc7f2f9cadeba07d20afebc4d9..4f91fb7b0dc8974bcda8180bc071ef36d7cc58b6 100644 (file)
--- a/lib/dns/key.c
+++ b/lib/dns/key.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: key.c,v 1.6 2006/01/27 23:57:46 marka Exp $ */
+/* $Id: key.c,v 1.7 2007/06/18 23:47:40 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/lib/dns/keytable.c b/lib/dns/keytable.c
index a37b57698182b2346bcb56077c132b1c05b8ce2c..d951fcb1e8fcb25a96be7d380ca296517c747878 100644 (file)
--- a/lib/dns/keytable.c
+++ b/lib/dns/keytable.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: keytable.c,v 1.32 2005/12/04 23:54:00 marka Exp $ */
+/* $Id: keytable.c,v 1.33 2007/06/18 23:47:40 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/lib.c b/lib/dns/lib.c
index 255d9b2c399eeb1a11d2872fe602dd51c3750461..569aed82b9626219300b6332da5fa78d33587677 100644 (file)
--- a/lib/dns/lib.c
+++ b/lib/dns/lib.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lib.c,v 1.14 2005/08/15 01:21:06 marka Exp $ */
+/* $Id: lib.c,v 1.15 2007/06/18 23:47:40 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/log.c b/lib/dns/log.c
index e8ffe29d86873a981af11819aaecc1e8ce4f6a73..7551e15f2520b742e34e1111750d9492afc9d29b 100644 (file)
--- a/lib/dns/log.c
+++ b/lib/dns/log.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: log.c,v 1.44 2007/05/21 03:46:42 tbox Exp $ */
+/* $Id: log.c,v 1.45 2007/06/18 23:47:40 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/lookup.c b/lib/dns/lookup.c
index b414e2bd6aeea03e3ca09b748706ed67302dae42..d5fc7aae4767d94ef567344a18fd6e65c2bc864e 100644 (file)
--- a/lib/dns/lookup.c
+++ b/lib/dns/lookup.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lookup.c,v 1.20 2007/03/06 02:12:39 tbox Exp $ */
+/* $Id: lookup.c,v 1.21 2007/06/18 23:47:40 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/master.c b/lib/dns/master.c
index 46681d2587e82288a7b05aa0511edef4f107c01a..84e946a23a762a5d6e0ce7b014c4982465cacdb7 100644 (file)
--- a/lib/dns/master.c
+++ b/lib/dns/master.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: master.c,v 1.164 2007/05/16 06:58:33 marka Exp $ */
+/* $Id: master.c,v 1.165 2007/06/18 23:47:40 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/masterdump.c b/lib/dns/masterdump.c
index aeb8a2c6cb7e803dada3e66650077c1b6144961e..d91bd65694b16104533e9012d12d43ccd99471ed 100644 (file)
--- a/lib/dns/masterdump.c
+++ b/lib/dns/masterdump.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: masterdump.c,v 1.87 2006/08/08 06:37:12 marka Exp $ */
+/* $Id: masterdump.c,v 1.88 2007/06/18 23:47:40 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/message.c b/lib/dns/message.c
index cba6639dabbf85a79f1b97f57d43e57a2491ae0a..dd15e522e8bf9d4f8f2dae7820eba69f4bc59239 100644 (file)
--- a/lib/dns/message.c
+++ b/lib/dns/message.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: message.c,v 1.235 2007/05/15 23:46:57 tbox Exp $ */
+/* $Id: message.c,v 1.236 2007/06/18 23:47:40 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/name.c b/lib/dns/name.c
index b2d0998d0dcd19dfff2ad49f96d0fc016606297a..4b448cd08302a179330a116e13582fa8ba930e1f 100644 (file)
--- a/lib/dns/name.c
+++ b/lib/dns/name.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: name.c,v 1.161 2006/12/07 06:57:46 marka Exp $ */
+/* $Id: name.c,v 1.162 2007/06/18 23:47:41 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/ncache.c b/lib/dns/ncache.c
index d267184d945fef2c574e62ca77c76ca332baa8d7..88df5da6d7e73ea30e41bcb9b486006babe2419a 100644 (file)
--- a/lib/dns/ncache.c
+++ b/lib/dns/ncache.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ncache.c,v 1.39 2005/04/29 00:22:48 marka Exp $ */
+/* $Id: ncache.c,v 1.40 2007/06/18 23:47:41 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/nsec.c b/lib/dns/nsec.c
index aaf8566a14cba29f2849f95030ab4589c4347a6b..56da09fb40190693032bc1a2b818d6bb83de161f 100644 (file)
--- a/lib/dns/nsec.c
+++ b/lib/dns/nsec.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsec.c,v 1.7 2005/04/29 00:22:48 marka Exp $ */
+/* $Id: nsec.c,v 1.8 2007/06/18 23:47:41 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/openssl_link.c b/lib/dns/openssl_link.c
index b12e3ea20ed2e92945d3a0def43dd49f13f11038..2871a192db2811ff0884ba291540f9cd4e833e2e 100644 (file)
--- a/lib/dns/openssl_link.c
+++ b/lib/dns/openssl_link.c
@@ -1,6 +1,19 @@
 /*
  * Portions Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2003  Internet Software Consortium.
+ *
+ * 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 AND NETWORK ASSOCIATES 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.
+ *
  * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -18,7 +31,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: openssl_link.c,v 1.12 2006/12/13 23:56:24 marka Exp $
+ * $Id: openssl_link.c,v 1.13 2007/06/18 23:47:41 tbox Exp $
  */
 #ifdef OPENSSL
 

diff --git a/lib/dns/openssldh_link.c b/lib/dns/openssldh_link.c
index a8b4d4d8703c89e3059fd6b16889762229d66ec1..ccd5b076984278df5a7f4aa4ac4461a35589a301 100644 (file)
--- a/lib/dns/openssldh_link.c
+++ b/lib/dns/openssldh_link.c
@@ -1,6 +1,19 @@
 /*
  * Portions Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2002  Internet Software Consortium.
+ *
+ * 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 AND NETWORK ASSOCIATES 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.
+ *
  * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -18,7 +31,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: openssldh_link.c,v 1.10 2007/01/08 02:45:04 marka Exp $
+ * $Id: openssldh_link.c,v 1.11 2007/06/18 23:47:41 tbox Exp $
  */
 
 #ifdef OPENSSL

diff --git a/lib/dns/openssldsa_link.c b/lib/dns/openssldsa_link.c
index 9422683ff125d2328eaf66b6b48fcd2c0d7335fa..83558fabcf1ebac4d8492bb7f7c9f9d311db7053 100644 (file)
--- a/lib/dns/openssldsa_link.c
+++ b/lib/dns/openssldsa_link.c
@@ -1,6 +1,19 @@
 /*
  * Portions Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2002  Internet Software Consortium.
+ *
+ * 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 AND NETWORK ASSOCIATES 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.
+ *
  * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -16,7 +29,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: openssldsa_link.c,v 1.9 2007/01/08 03:02:32 marka Exp $ */
+/* $Id: openssldsa_link.c,v 1.10 2007/06/18 23:47:41 tbox Exp $ */
 
 #ifdef OPENSSL
 

diff --git a/lib/dns/opensslrsa_link.c b/lib/dns/opensslrsa_link.c
index 25e9d00cba2361c20e507f9a7961611f8333127b..2d325fa7ce0277d374789294175522c4783b3913 100644 (file)
--- a/lib/dns/opensslrsa_link.c
+++ b/lib/dns/opensslrsa_link.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
- * 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.
  *
@@ -17,7 +17,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: opensslrsa_link.c,v 1.14 2006/12/04 02:26:05 marka Exp $
+ * $Id: opensslrsa_link.c,v 1.15 2007/06/18 23:47:41 tbox Exp $
  */
 #ifdef OPENSSL
 

diff --git a/lib/dns/order.c b/lib/dns/order.c
index e981684269061877e089bba383270d765094d657..e6f33f2791b3d799f61381810329d2d8c512d90a 100644 (file)
--- a/lib/dns/order.c
+++ b/lib/dns/order.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: order.c,v 1.8 2005/07/12 01:00:15 marka Exp $ */
+/* $Id: order.c,v 1.9 2007/06/18 23:47:41 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/peer.c b/lib/dns/peer.c
index 86a85b7dbd525fca8a2e8aea6667a2cb7d8e4ecd..11f13c05ca873f54e9a31d78cda4bf7a16cc02d5 100644 (file)
--- a/lib/dns/peer.c
+++ b/lib/dns/peer.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: peer.c,v 1.27 2006/02/28 02:39:51 marka Exp $ */
+/* $Id: peer.c,v 1.28 2007/06/18 23:47:41 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/portlist.c b/lib/dns/portlist.c
index f85d4e0a87961d11f94144b046d576e7eb9fa8a2..880e18fc205182e32fb1b71555b0d5b442685468 100644 (file)
--- a/lib/dns/portlist.c
+++ b/lib/dns/portlist.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: portlist.c,v 1.11 2006/08/25 05:25:52 marka Exp $ */
+/* $Id: portlist.c,v 1.12 2007/06/18 23:47:41 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/rbt.c b/lib/dns/rbt.c
index 0720e3121a576c1781cbc253887aa7a39971542c..21eca47fad7d98195b8dec5d6b74c649243a72b7 100644 (file)
--- a/lib/dns/rbt.c
+++ b/lib/dns/rbt.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rbt.c,v 1.135 2005/10/13 01:19:12 marka Exp $ */
+/* $Id: rbt.c,v 1.136 2007/06/18 23:47:41 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index a6809ecb70f54744333e8f31828eaca1a7abbb7d..5367d1c2d000f65b9aa80c8d87e1f5b3dd4e79af 100644 (file)
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rbtdb.c,v 1.244 2007/03/14 05:57:10 marka Exp $ */
+/* $Id: rbtdb.c,v 1.245 2007/06/18 23:47:41 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/rbtdb.h b/lib/dns/rbtdb.h
index f1a6b30a81bdce6c0ad48791b3cd77e032c586ad..3ab8b33ed580886a40b1d82e06e49756bb425f13 100644 (file)
--- a/lib/dns/rbtdb.h
+++ b/lib/dns/rbtdb.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rbtdb.h,v 1.16 2005/04/29 00:22:50 marka Exp $ */
+/* $Id: rbtdb.h,v 1.17 2007/06/18 23:47:41 tbox Exp $ */
 
 #ifndef DNS_RBTDB_H
 #define DNS_RBTDB_H 1

diff --git a/lib/dns/rbtdb64.c b/lib/dns/rbtdb64.c
index e564b4ce4cd817ab40d31f70a5b82be2233d35e4..db4c2ef738d245c39f88215769e1ba13a4cc9734 100644 (file)
--- a/lib/dns/rbtdb64.c
+++ b/lib/dns/rbtdb64.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rbtdb64.c,v 1.9 2005/04/29 00:22:50 marka Exp $ */
+/* $Id: rbtdb64.c,v 1.10 2007/06/18 23:47:41 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/rbtdb64.h b/lib/dns/rbtdb64.h
index 27fcfb56598562ea8f7797c27cf81104bda5ec93..585973fa028cc462bc7ff0493a1608ac504c9924 100644 (file)
--- a/lib/dns/rbtdb64.h
+++ b/lib/dns/rbtdb64.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rbtdb64.h,v 1.15 2005/04/29 00:22:50 marka Exp $ */
+/* $Id: rbtdb64.h,v 1.16 2007/06/18 23:47:41 tbox Exp $ */
 
 #ifndef DNS_RBTDB64_H
 #define DNS_RBTDB64_H 1

diff --git a/lib/dns/rcode.c b/lib/dns/rcode.c
index fffed7ae943e206d42cd4c41a20b13cde920563c..3eb63261a4140e36b38450385b5f8f19e1f0d68c 100644 (file)
--- a/lib/dns/rcode.c
+++ b/lib/dns/rcode.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rcode.c,v 1.4 2006/01/27 23:57:46 marka Exp $ */
+/* $Id: rcode.c,v 1.5 2007/06/18 23:47:41 tbox Exp $ */
 
 #include <config.h>
 #include <ctype.h>

diff --git a/lib/dns/rdata.c b/lib/dns/rdata.c
index bafed4bb7b27289bafde1f30bcb77f3b5c30f4a8..38f1473c5199acf539b914cd0e0b17f606232ff9 100644 (file)
--- a/lib/dns/rdata.c
+++ b/lib/dns/rdata.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdata.c,v 1.194 2006/12/22 01:44:59 marka Exp $ */
+/* $Id: rdata.c,v 1.195 2007/06/18 23:47:41 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/rdata/any_255/tsig_250.c b/lib/dns/rdata/any_255/tsig_250.c
index 72cd63720272441ced35d41a8d9da409bc166e34..468e7c3eb50fdceb103f774aa4d5c58e8c11ae75 100644 (file)
--- a/lib/dns/rdata/any_255/tsig_250.c
+++ b/lib/dns/rdata/any_255/tsig_250.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tsig_250.c,v 1.61 2005/03/20 22:32:57 marka Exp $ */
+/* $Id: tsig_250.c,v 1.62 2007/06/18 23:47:43 tbox Exp $ */
 
 /* Reviewed: Thu Mar 16 13:39:43 PST 2000 by gson */
 

diff --git a/lib/dns/rdata/any_255/tsig_250.h b/lib/dns/rdata/any_255/tsig_250.h
index 5a94256232638dd07cacd6625435badddb31b975..d0f9704d60732cec345fbca0a1c03e1bd23d490c 100644 (file)
--- a/lib/dns/rdata/any_255/tsig_250.h
+++ b/lib/dns/rdata/any_255/tsig_250.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tsig_250.h,v 1.23 2005/04/29 00:23:07 marka Exp $ */
+/* $Id: tsig_250.h,v 1.24 2007/06/18 23:47:43 tbox Exp $ */
 
 #ifndef ANY_255_TSIG_250_H
 #define ANY_255_TSIG_250_H 1

diff --git a/lib/dns/rdata/ch_3/a_1.c b/lib/dns/rdata/ch_3/a_1.c
index 7ca02c5ae6fdd6203f27c72a079b48388d47e237..6e00b8ec22387be72a699feba08c6c214fc4f602 100644 (file)
--- a/lib/dns/rdata/ch_3/a_1.c
+++ b/lib/dns/rdata/ch_3/a_1.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2005  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: a_1.c,v 1.4 2005/08/23 04:05:49 marka Exp $ */
+/* $Id: a_1.c,v 1.5 2007/06/18 23:47:43 tbox Exp $ */
 
 /* by Bjorn.Victor@it.uu.se, 2005-05-07 */
 /* Based on generic/soa_6.c and generic/mx_15.c */

diff --git a/lib/dns/rdata/ch_3/a_1.h b/lib/dns/rdata/ch_3/a_1.h
index 2471c7509e6c5976e0ae819aeeb32afea7dca4d9..812bce7e2fe496cbf43cd3c80fec3f9475ef62df 100644 (file)
--- a/lib/dns/rdata/ch_3/a_1.h
+++ b/lib/dns/rdata/ch_3/a_1.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2005  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: a_1.h,v 1.3 2005/06/05 00:01:54 marka Exp $ */
+/* $Id: a_1.h,v 1.4 2007/06/18 23:47:43 tbox Exp $ */
 
 /* by Bjorn.Victor@it.uu.se, 2005-05-07 */
 /* Based on generic/mx_15.h */

diff --git a/lib/dns/rdata/generic/afsdb_18.c b/lib/dns/rdata/generic/afsdb_18.c
index b6991d0dce9f0cdac8f879a7fa0c3727fb3bb122..f5099268786eafd6ec1af79f362772c7582fbc30 100644 (file)
--- a/lib/dns/rdata/generic/afsdb_18.c
+++ b/lib/dns/rdata/generic/afsdb_18.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: afsdb_18.c,v 1.45 2005/04/29 00:23:08 marka Exp $ */
+/* $Id: afsdb_18.c,v 1.46 2007/06/18 23:47:43 tbox Exp $ */
 
 /* Reviewed: Wed Mar 15 14:59:00 PST 2000 by explorer */
 

diff --git a/lib/dns/rdata/generic/afsdb_18.h b/lib/dns/rdata/generic/afsdb_18.h
index b3823df36207f424743e9641d916d45ab3f17dfc..e5142848a0bb7a3caa4a406173aa6341a1bc820b 100644 (file)
--- a/lib/dns/rdata/generic/afsdb_18.h
+++ b/lib/dns/rdata/generic/afsdb_18.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -18,7 +18,7 @@
 #ifndef GENERIC_AFSDB_18_H
 #define GENERIC_AFSDB_18_H 1
 
-/* $Id: afsdb_18.h,v 1.18 2005/04/29 00:23:08 marka Exp $ */
+/* $Id: afsdb_18.h,v 1.19 2007/06/18 23:47:43 tbox Exp $ */
 
 /*!
  *  \brief Per RFC1183 */

diff --git a/lib/dns/rdata/generic/cert_37.c b/lib/dns/rdata/generic/cert_37.c
index 39d81717b908e75f910929740a696543395e890b..a63a6983c190b355e913758eb4b0a90bf10f12be 100644 (file)
--- a/lib/dns/rdata/generic/cert_37.c
+++ b/lib/dns/rdata/generic/cert_37.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: cert_37.c,v 1.48 2005/04/29 00:23:08 marka Exp $ */
+/* $Id: cert_37.c,v 1.49 2007/06/18 23:47:43 tbox Exp $ */
 
 /* Reviewed: Wed Mar 15 21:14:32 EST 2000 by tale */
 

diff --git a/lib/dns/rdata/generic/cert_37.h b/lib/dns/rdata/generic/cert_37.h
index bdcab45c0ee4442db47043f7d29eb8e420f714bd..b9cf098f2c4a55e8f0b24cd729e22d1f11edd42f 100644 (file)
--- a/lib/dns/rdata/generic/cert_37.h
+++ b/lib/dns/rdata/generic/cert_37.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: cert_37.h,v 1.18 2005/04/29 00:23:08 marka Exp $ */
+/* $Id: cert_37.h,v 1.19 2007/06/18 23:47:43 tbox Exp $ */
 
 #ifndef GENERIC_CERT_37_H
 #define GENERIC_CERT_37_H 1

diff --git a/lib/dns/rdata/generic/cname_5.c b/lib/dns/rdata/generic/cname_5.c
index 6ea1db17d1a5b2ef0bed9314f47dfbd3dd5f38f8..d708da7b956b715f9404338bfb3489751ad4452a 100644 (file)
--- a/lib/dns/rdata/generic/cname_5.c
+++ b/lib/dns/rdata/generic/cname_5.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: cname_5.c,v 1.45 2004/03/05 05:10:10 marka Exp $ */
+/* $Id: cname_5.c,v 1.46 2007/06/18 23:47:43 tbox Exp $ */
 
 /* reviewed: Wed Mar 15 16:48:45 PST 2000 by brister */
 

diff --git a/lib/dns/rdata/generic/cname_5.h b/lib/dns/rdata/generic/cname_5.h
index dc243836468ec5f265cba071afc3903b8979301a..50a4c5449466f0c02b32dbbe29324797a09e5667 100644 (file)
--- a/lib/dns/rdata/generic/cname_5.h
+++ b/lib/dns/rdata/generic/cname_5.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: cname_5.h,v 1.24 2004/03/05 05:10:10 marka Exp $ */
+/* $Id: cname_5.h,v 1.25 2007/06/18 23:47:43 tbox Exp $ */
 
 #ifndef GENERIC_CNAME_5_H
 #define GENERIC_CNAME_5_H 1

diff --git a/lib/dns/rdata/generic/dlv_32769.c b/lib/dns/rdata/generic/dlv_32769.c
index 31d042e47c7d2586b9fb3330c5b13a3838335e5d..957f038f87785e927f5134286e6b733e3d839888 100644 (file)
--- a/lib/dns/rdata/generic/dlv_32769.c
+++ b/lib/dns/rdata/generic/dlv_32769.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2004, 2006, 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.
  *
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dlv_32769.c,v 1.5 2007/02/26 23:46:54 tbox Exp $ */
+/* $Id: dlv_32769.c,v 1.6 2007/06/18 23:47:43 tbox Exp $ */
 
 /* draft-ietf-dnsext-delegation-signer-05.txt */
 

diff --git a/lib/dns/rdata/generic/dlv_32769.h b/lib/dns/rdata/generic/dlv_32769.h
index 050a628333fd08e6c7b2d36acae068b1c7896c85..cef2493ae42ebfb91d587d8301053825ada9f4d0 100644 (file)
--- a/lib/dns/rdata/generic/dlv_32769.h
+++ b/lib/dns/rdata/generic/dlv_32769.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2004, 2006  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dlv_32769.h,v 1.3 2006/02/19 06:50:48 marka Exp $ */
+/* $Id: dlv_32769.h,v 1.4 2007/06/18 23:47:43 tbox Exp $ */
 
 /* draft-ietf-dnsext-delegation-signer-05.txt */
 #ifndef GENERIC_DLV_32769_H

diff --git a/lib/dns/rdata/generic/dname_39.c b/lib/dns/rdata/generic/dname_39.c
index ed3133ce7605c4087e9eda6fa799d5865e5c4b97..a7e6ddef3d6cae26596f40a86164aa1f11ca2d5a 100644 (file)
--- a/lib/dns/rdata/generic/dname_39.c
+++ b/lib/dns/rdata/generic/dname_39.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dname_39.c,v 1.36 2004/03/05 05:10:10 marka Exp $ */
+/* $Id: dname_39.c,v 1.37 2007/06/18 23:47:43 tbox Exp $ */
 
 /* Reviewed: Wed Mar 15 16:52:38 PST 2000 by explorer */
 

diff --git a/lib/dns/rdata/generic/dname_39.h b/lib/dns/rdata/generic/dname_39.h
index ea6d5a977918acd7e55b8b5c9fdefe82540daba7..892383b5743fb3faf535b4376e962577f57b4612 100644 (file)
--- a/lib/dns/rdata/generic/dname_39.h
+++ b/lib/dns/rdata/generic/dname_39.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -18,7 +18,7 @@
 #ifndef GENERIC_DNAME_39_H
 #define GENERIC_DNAME_39_H 1
 
-/* $Id: dname_39.h,v 1.19 2005/04/29 00:23:09 marka Exp $ */
+/* $Id: dname_39.h,v 1.20 2007/06/18 23:47:43 tbox Exp $ */
 
 /*! 
  *  \brief per RFC2672 */

diff --git a/lib/dns/rdata/generic/dnskey_48.c b/lib/dns/rdata/generic/dnskey_48.c
index 0d925d95853e58fd1368cfc74d86b9f0e8b2a720..00c649485fa852e66d408fd9bbbe1239db5d7aca 100644 (file)
--- a/lib/dns/rdata/generic/dnskey_48.c
+++ b/lib/dns/rdata/generic/dnskey_48.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnskey_48.c,v 1.6 2005/04/29 00:23:09 marka Exp $ */
+/* $Id: dnskey_48.c,v 1.7 2007/06/18 23:47:43 tbox Exp $ */
 
 /*
  * Reviewed: Wed Mar 15 16:47:10 PST 2000 by halley.

diff --git a/lib/dns/rdata/generic/dnskey_48.h b/lib/dns/rdata/generic/dnskey_48.h
index d6e2c83e9896dfc13db7113903d510801f3bf6db..662b4cd011fb6166256a42da9450d81999004f80 100644 (file)
--- a/lib/dns/rdata/generic/dnskey_48.h
+++ b/lib/dns/rdata/generic/dnskey_48.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2003  Internet Software Consortium.
  *
- * 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.
  *
@@ -18,7 +18,7 @@
 #ifndef GENERIC_DNSKEY_48_H
 #define GENERIC_DNSKEY_48_H 1
 
-/* $Id: dnskey_48.h,v 1.5 2005/04/29 00:23:10 marka Exp $ */
+/* $Id: dnskey_48.h,v 1.6 2007/06/18 23:47:43 tbox Exp $ */
 
 /*!
  *  \brief per RFC2535 */

diff --git a/lib/dns/rdata/generic/ds_43.c b/lib/dns/rdata/generic/ds_43.c
index e613b4c0b394d7c270aea93e0e03eb75b9dc016b..08e5d5f7393b0371b2a5ce544ee9ea3bea35a87a 100644 (file)
--- a/lib/dns/rdata/generic/ds_43.c
+++ b/lib/dns/rdata/generic/ds_43.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ds_43.c,v 1.11 2007/02/26 23:46:54 tbox Exp $ */
+/* $Id: ds_43.c,v 1.12 2007/06/18 23:47:43 tbox Exp $ */
 
 /* draft-ietf-dnsext-delegation-signer-05.txt */
 

diff --git a/lib/dns/rdata/generic/ds_43.h b/lib/dns/rdata/generic/ds_43.h
index c2c5b7211f07e5b69936f7bdd6dcaca87c2928ea..d471f4ad5182e2657ccb857cbb4438bc78a33542 100644 (file)
--- a/lib/dns/rdata/generic/ds_43.h
+++ b/lib/dns/rdata/generic/ds_43.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ds_43.h,v 1.5 2005/04/29 00:23:10 marka Exp $ */
+/* $Id: ds_43.h,v 1.6 2007/06/18 23:47:43 tbox Exp $ */
 
 #ifndef GENERIC_DS_43_H
 #define GENERIC_DS_43_H 1

diff --git a/lib/dns/rdata/generic/gpos_27.c b/lib/dns/rdata/generic/gpos_27.c
index 0d18628b6e97684ce378c2c9d8e6d03558df9ed7..31ff8bbaf8d3442155dc7c931a6f0d0e08b483e7 100644 (file)
--- a/lib/dns/rdata/generic/gpos_27.c
+++ b/lib/dns/rdata/generic/gpos_27.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: gpos_27.c,v 1.39 2005/04/29 00:23:10 marka Exp $ */
+/* $Id: gpos_27.c,v 1.40 2007/06/18 23:47:43 tbox Exp $ */
 
 /* reviewed: Wed Mar 15 16:48:45 PST 2000 by brister */
 

diff --git a/lib/dns/rdata/generic/gpos_27.h b/lib/dns/rdata/generic/gpos_27.h
index 54d1b883dd2a30c9af535c32eecc8633cf72ea05..fc5c454cce4877370e1e4dbf1a13d10a102044fc 100644 (file)
--- a/lib/dns/rdata/generic/gpos_27.h
+++ b/lib/dns/rdata/generic/gpos_27.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -18,7 +18,7 @@
 #ifndef GENERIC_GPOS_27_H
 #define GENERIC_GPOS_27_H 1
 
-/* $Id: gpos_27.h,v 1.15 2005/04/29 00:23:10 marka Exp $ */
+/* $Id: gpos_27.h,v 1.16 2007/06/18 23:47:43 tbox Exp $ */
 
 /*!
  *  \brief per RFC1712 */

diff --git a/lib/dns/rdata/generic/hinfo_13.c b/lib/dns/rdata/generic/hinfo_13.c
index 70c433caa95f663a5e8441af13a9496d9c45306b..93dde756a03c6c8ae4d02930db87a3beefe898ee 100644 (file)
--- a/lib/dns/rdata/generic/hinfo_13.c
+++ b/lib/dns/rdata/generic/hinfo_13.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: hinfo_13.c,v 1.42 2004/03/05 05:10:11 marka Exp $ */
+/* $Id: hinfo_13.c,v 1.43 2007/06/18 23:47:43 tbox Exp $ */
 
 /*
  * Reviewed: Wed Mar 15 16:47:10 PST 2000 by halley.

diff --git a/lib/dns/rdata/generic/hinfo_13.h b/lib/dns/rdata/generic/hinfo_13.h
index e542c48d49adbbb7a5f3b53a7f5e85c3d7db3b8d..feb9d54642b8000b6beaf9b41a242c5c9c91b5a9 100644 (file)
--- a/lib/dns/rdata/generic/hinfo_13.h
+++ b/lib/dns/rdata/generic/hinfo_13.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -18,7 +18,7 @@
 #ifndef GENERIC_HINFO_13_H
 #define GENERIC_HINFO_13_H 1
 
-/* $Id: hinfo_13.h,v 1.23 2004/03/05 05:10:12 marka Exp $ */
+/* $Id: hinfo_13.h,v 1.24 2007/06/18 23:47:43 tbox Exp $ */
 
 typedef struct dns_rdata_hinfo {
        dns_rdatacommon_t       common;

diff --git a/lib/dns/rdata/generic/ipseckey_45.c b/lib/dns/rdata/generic/ipseckey_45.c
index bf4ba6f02c5bb16916b6dbeb83247237d0e968c8..8a8e52bcd9af7ea1e40a0d17a8d1297e17b4cdab 100644 (file)
--- a/lib/dns/rdata/generic/ipseckey_45.c
+++ b/lib/dns/rdata/generic/ipseckey_45.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2005  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ipseckey_45.c,v 1.2 2005/07/07 03:12:56 marka Exp $ */
+/* $Id: ipseckey_45.c,v 1.3 2007/06/18 23:47:43 tbox Exp $ */
 
 #ifndef RDATA_GENERIC_IPSECKEY_45_C
 #define RDATA_GENERIC_IPSECKEY_45_C

diff --git a/lib/dns/rdata/generic/ipseckey_45.h b/lib/dns/rdata/generic/ipseckey_45.h
index f00df2005926b0fe85ed2763f697d9c1a5b84bf4..682cda1e09ec1d63c31472617a4c080c8786ccb4 100644 (file)
--- a/lib/dns/rdata/generic/ipseckey_45.h
+++ b/lib/dns/rdata/generic/ipseckey_45.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2005  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ipseckey_45.h,v 1.2 2005/07/07 03:12:57 marka Exp $ */
+/* $Id: ipseckey_45.h,v 1.3 2007/06/18 23:47:43 tbox Exp $ */
 
 #ifndef GENERIC_IPSECKEY_45_H
 #define GENERIC_IPSECKEY_45_H 1

diff --git a/lib/dns/rdata/generic/isdn_20.c b/lib/dns/rdata/generic/isdn_20.c
index 8d2732e583319b9d98526e166f4b071bdcbeb279..ae38069e45d75e9aa9f5a9b2ec0134c241cf8f7d 100644 (file)
--- a/lib/dns/rdata/generic/isdn_20.c
+++ b/lib/dns/rdata/generic/isdn_20.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: isdn_20.c,v 1.36 2005/04/29 00:23:10 marka Exp $ */
+/* $Id: isdn_20.c,v 1.37 2007/06/18 23:47:43 tbox Exp $ */
 
 /* Reviewed: Wed Mar 15 16:53:11 PST 2000 by bwelling */
 

diff --git a/lib/dns/rdata/generic/isdn_20.h b/lib/dns/rdata/generic/isdn_20.h
index 942a058dec2f051dd60cedfea1a09710b89b6c26..7b500c224ab46d9d5b8bee950bb7b1864b2a9a96 100644 (file)
--- a/lib/dns/rdata/generic/isdn_20.h
+++ b/lib/dns/rdata/generic/isdn_20.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -18,7 +18,7 @@
 #ifndef GENERIC_ISDN_20_H
 #define GENERIC_ISDN_20_H 1
 
-/* $Id: isdn_20.h,v 1.16 2005/04/29 00:23:11 marka Exp $ */
+/* $Id: isdn_20.h,v 1.17 2007/06/18 23:47:43 tbox Exp $ */
 
 /*!
  * \brief Per RFC1183 */

diff --git a/lib/dns/rdata/generic/key_25.c b/lib/dns/rdata/generic/key_25.c
index 701716d471131e2d0c7476028b9e856916bd6228..7f13238ea5dba3208eaba05773fed95c86f606ba 100644 (file)
--- a/lib/dns/rdata/generic/key_25.c
+++ b/lib/dns/rdata/generic/key_25.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: key_25.c,v 1.49 2005/04/29 00:23:11 marka Exp $ */
+/* $Id: key_25.c,v 1.50 2007/06/18 23:47:43 tbox Exp $ */
 
 /*
  * Reviewed: Wed Mar 15 16:47:10 PST 2000 by halley.

diff --git a/lib/dns/rdata/generic/key_25.h b/lib/dns/rdata/generic/key_25.h
index 724a26e72c0ca2abfff0c8ac4104ac8528c6299f..a41e8383511d83c9853e2edb41b0a201da020df4 100644 (file)
--- a/lib/dns/rdata/generic/key_25.h
+++ b/lib/dns/rdata/generic/key_25.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -18,7 +18,7 @@
 #ifndef GENERIC_KEY_25_H
 #define GENERIC_KEY_25_H 1
 
-/* $Id: key_25.h,v 1.17 2005/04/29 00:23:11 marka Exp $ */
+/* $Id: key_25.h,v 1.18 2007/06/18 23:47:43 tbox Exp $ */
 
 /*!
  * \brief Per RFC2535 */

diff --git a/lib/dns/rdata/generic/loc_29.c b/lib/dns/rdata/generic/loc_29.c
index 9260326033761d436f7b62cd7a96f68f538de6f2..2d5d4c527e3d02368ea4d5964f9fafbd140c7f88 100644 (file)
--- a/lib/dns/rdata/generic/loc_29.c
+++ b/lib/dns/rdata/generic/loc_29.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: loc_29.c,v 1.43 2005/04/29 00:23:11 marka Exp $ */
+/* $Id: loc_29.c,v 1.44 2007/06/18 23:47:43 tbox Exp $ */
 
 /* Reviewed: Wed Mar 15 18:13:09 PST 2000 by explorer */
 

diff --git a/lib/dns/rdata/generic/loc_29.h b/lib/dns/rdata/generic/loc_29.h
index 80a9c1d22b9c8d2e6a947983b1261cacb01b88ac..e211bd0ada246e74355271197397e39d61703de6 100644 (file)
--- a/lib/dns/rdata/generic/loc_29.h
+++ b/lib/dns/rdata/generic/loc_29.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -18,7 +18,7 @@
 #ifndef GENERIC_LOC_29_H
 #define GENERIC_LOC_29_H 1
 
-/* $Id: loc_29.h,v 1.17 2005/04/29 00:23:11 marka Exp $ */
+/* $Id: loc_29.h,v 1.18 2007/06/18 23:47:43 tbox Exp $ */
 
 /*!
  * \brief Per RFC1876 */

diff --git a/lib/dns/rdata/generic/mb_7.c b/lib/dns/rdata/generic/mb_7.c
index 94c622d4b232e47dd1a8fa2f996b0af582c247e5..4997b9ff40e3011146cc081aeae4a7c5d52d349f 100644 (file)
--- a/lib/dns/rdata/generic/mb_7.c
+++ b/lib/dns/rdata/generic/mb_7.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mb_7.c,v 1.43 2004/03/05 05:10:13 marka Exp $ */
+/* $Id: mb_7.c,v 1.44 2007/06/18 23:47:43 tbox Exp $ */
 
 /* Reviewed: Wed Mar 15 17:31:26 PST 2000 by bwelling */
 

diff --git a/lib/dns/rdata/generic/mb_7.h b/lib/dns/rdata/generic/mb_7.h
index dc768a0ff03c0fa5321c1281030552db8f7130ff..0cc5f8da422b8915c43bbf6eba79658b3546ba4f 100644 (file)
--- a/lib/dns/rdata/generic/mb_7.h
+++ b/lib/dns/rdata/generic/mb_7.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -19,7 +19,7 @@
 #ifndef GENERIC_MB_7_H
 #define GENERIC_MB_7_H 1
 
-/* $Id: mb_7.h,v 1.25 2005/04/29 00:23:12 marka Exp $ */
+/* $Id: mb_7.h,v 1.26 2007/06/18 23:47:43 tbox Exp $ */
 
 typedef struct dns_rdata_mb {
        dns_rdatacommon_t       common;

diff --git a/lib/dns/rdata/generic/md_3.c b/lib/dns/rdata/generic/md_3.c
index 75e4970bad09e51eadb031be207d4ecc40987159..72a3c14ec9f6e4edebc666ee83a2d7801ff41286 100644 (file)
--- a/lib/dns/rdata/generic/md_3.c
+++ b/lib/dns/rdata/generic/md_3.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: md_3.c,v 1.45 2004/03/05 05:10:13 marka Exp $ */
+/* $Id: md_3.c,v 1.46 2007/06/18 23:47:43 tbox Exp $ */
 
 /* Reviewed: Wed Mar 15 17:48:20 PST 2000 by bwelling */
 

diff --git a/lib/dns/rdata/generic/md_3.h b/lib/dns/rdata/generic/md_3.h
index 8b9bf4af3097bd7678ffcee884d5f9991a313674..13984465d1292eac7b9dd0f348a2b2c3b05e14c0 100644 (file)
--- a/lib/dns/rdata/generic/md_3.h
+++ b/lib/dns/rdata/generic/md_3.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -19,7 +19,7 @@
 #ifndef GENERIC_MD_3_H
 #define GENERIC_MD_3_H 1
 
-/* $Id: md_3.h,v 1.26 2005/04/29 00:23:12 marka Exp $ */
+/* $Id: md_3.h,v 1.27 2007/06/18 23:47:43 tbox Exp $ */
 
 typedef struct dns_rdata_md {
        dns_rdatacommon_t       common;

diff --git a/lib/dns/rdata/generic/mf_4.c b/lib/dns/rdata/generic/mf_4.c
index 362d3005c8790d5638dbc5026922abb9caad82f3..ff2c112d42392116fd92fda15cad9595d265b847 100644 (file)
--- a/lib/dns/rdata/generic/mf_4.c
+++ b/lib/dns/rdata/generic/mf_4.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mf_4.c,v 1.43 2004/03/05 05:10:14 marka Exp $ */
+/* $Id: mf_4.c,v 1.44 2007/06/18 23:47:43 tbox Exp $ */
 
 /* reviewed: Wed Mar 15 17:47:33 PST 2000 by brister */
 

diff --git a/lib/dns/rdata/generic/mf_4.h b/lib/dns/rdata/generic/mf_4.h
index 5a705d8dc0f0cdd1c35f719a64daeccc52efe9e9..7a42962afee3b43dc35654d2b9d93c584ae1f496 100644 (file)
--- a/lib/dns/rdata/generic/mf_4.h
+++ b/lib/dns/rdata/generic/mf_4.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -19,7 +19,7 @@
 #ifndef GENERIC_MF_4_H
 #define GENERIC_MF_4_H 1
 
-/* $Id: mf_4.h,v 1.24 2005/04/29 00:23:12 marka Exp $ */
+/* $Id: mf_4.h,v 1.25 2007/06/18 23:47:43 tbox Exp $ */
 
 typedef struct dns_rdata_mf {
        dns_rdatacommon_t       common;

diff --git a/lib/dns/rdata/generic/mg_8.c b/lib/dns/rdata/generic/mg_8.c
index 602d820b640b60aa28d2ceea9a184e7e82d1e92f..f12d903bbd1041e6b718f8ef9bfd3ccdf25dd006 100644 (file)
--- a/lib/dns/rdata/generic/mg_8.c
+++ b/lib/dns/rdata/generic/mg_8.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mg_8.c,v 1.41 2004/03/05 05:10:14 marka Exp $ */
+/* $Id: mg_8.c,v 1.42 2007/06/18 23:47:43 tbox Exp $ */
 
 /* reviewed: Wed Mar 15 17:49:21 PST 2000 by brister */
 

diff --git a/lib/dns/rdata/generic/mg_8.h b/lib/dns/rdata/generic/mg_8.h
index afd368b7405d818e643032574cc4d53386cb7045..367ad5505ad5506a13cf0e3bf0c44651aacdea31 100644 (file)
--- a/lib/dns/rdata/generic/mg_8.h
+++ b/lib/dns/rdata/generic/mg_8.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -19,7 +19,7 @@
 #ifndef GENERIC_MG_8_H
 #define GENERIC_MG_8_H 1
 
-/* $Id: mg_8.h,v 1.24 2005/04/29 00:23:12 marka Exp $ */
+/* $Id: mg_8.h,v 1.25 2007/06/18 23:47:43 tbox Exp $ */
 
 typedef struct dns_rdata_mg {
        dns_rdatacommon_t       common;

diff --git a/lib/dns/rdata/generic/minfo_14.c b/lib/dns/rdata/generic/minfo_14.c
index b757480cf7bcbbd881bb8b77097d3837d277a544..3412d8ce9f02c900c054b744ff462f869d0b9938 100644 (file)
--- a/lib/dns/rdata/generic/minfo_14.c
+++ b/lib/dns/rdata/generic/minfo_14.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: minfo_14.c,v 1.43 2004/03/05 05:10:14 marka Exp $ */
+/* $Id: minfo_14.c,v 1.44 2007/06/18 23:47:43 tbox Exp $ */
 
 /* reviewed: Wed Mar 15 17:45:32 PST 2000 by brister */
 

diff --git a/lib/dns/rdata/generic/minfo_14.h b/lib/dns/rdata/generic/minfo_14.h
index fde1ba55ec38f1300a7e4d200c66212bcc93cd23..b5b4e83a90d1f7d8801716bea398ec6a74a6aa9e 100644 (file)
--- a/lib/dns/rdata/generic/minfo_14.h
+++ b/lib/dns/rdata/generic/minfo_14.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -19,7 +19,7 @@
 #ifndef GENERIC_MINFO_14_H
 #define GENERIC_MINFO_14_H 1
 
-/* $Id: minfo_14.h,v 1.25 2005/04/29 00:23:12 marka Exp $ */
+/* $Id: minfo_14.h,v 1.26 2007/06/18 23:47:43 tbox Exp $ */
 
 typedef struct dns_rdata_minfo {
        dns_rdatacommon_t       common;

diff --git a/lib/dns/rdata/generic/mr_9.c b/lib/dns/rdata/generic/mr_9.c
index ab4c6e0e4afc1713e39d2a00afb8aaad3e83ca55..4e717f3fba1caa309349c48f6a3e1f084170cd34 100644 (file)
--- a/lib/dns/rdata/generic/mr_9.c
+++ b/lib/dns/rdata/generic/mr_9.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mr_9.c,v 1.40 2004/03/05 05:10:15 marka Exp $ */
+/* $Id: mr_9.c,v 1.41 2007/06/18 23:47:43 tbox Exp $ */
 
 /* Reviewed: Wed Mar 15 21:30:35 EST 2000 by tale */
 

diff --git a/lib/dns/rdata/generic/mr_9.h b/lib/dns/rdata/generic/mr_9.h
index addec36809076301429fa0ac9fa7bbaa2decb91b..ec45141782a59136a350be0323809f501b7fb49f 100644 (file)
--- a/lib/dns/rdata/generic/mr_9.h
+++ b/lib/dns/rdata/generic/mr_9.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -19,7 +19,7 @@
 #ifndef GENERIC_MR_9_H
 #define GENERIC_MR_9_H 1
 
-/* $Id: mr_9.h,v 1.24 2005/04/29 00:23:12 marka Exp $ */
+/* $Id: mr_9.h,v 1.25 2007/06/18 23:47:43 tbox Exp $ */
 
 typedef struct dns_rdata_mr {
        dns_rdatacommon_t       common;

diff --git a/lib/dns/rdata/generic/mx_15.c b/lib/dns/rdata/generic/mx_15.c
index 7ec44f3000d003a7a03ea8d495d01130ac939050..5b720d48e010b5c4f4b13afbf5096d898b00fcd1 100644 (file)
--- a/lib/dns/rdata/generic/mx_15.c
+++ b/lib/dns/rdata/generic/mx_15.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mx_15.c,v 1.54 2005/05/20 01:09:36 marka Exp $ */
+/* $Id: mx_15.c,v 1.55 2007/06/18 23:47:43 tbox Exp $ */
 
 /* reviewed: Wed Mar 15 18:05:46 PST 2000 by brister */
 

diff --git a/lib/dns/rdata/generic/mx_15.h b/lib/dns/rdata/generic/mx_15.h
index 9c8d1617601b89570cba6661d7ad9a290bee4f74..d7e8cc96b53c220cc1264e4646e523aba3a06d8b 100644 (file)
--- a/lib/dns/rdata/generic/mx_15.h
+++ b/lib/dns/rdata/generic/mx_15.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -19,7 +19,7 @@
 #ifndef GENERIC_MX_15_H
 #define GENERIC_MX_15_H 1
 
-/* $Id: mx_15.h,v 1.27 2005/04/29 00:23:13 marka Exp $ */
+/* $Id: mx_15.h,v 1.28 2007/06/18 23:47:43 tbox Exp $ */
 
 typedef struct dns_rdata_mx {
        dns_rdatacommon_t       common;

diff --git a/lib/dns/rdata/generic/ns_2.c b/lib/dns/rdata/generic/ns_2.c
index 237943377ef8b5e375894c3013582afc90728800..3a6eeaca38210b0372f5ef3ec8350c816aa95e0a 100644 (file)
--- a/lib/dns/rdata/generic/ns_2.c
+++ b/lib/dns/rdata/generic/ns_2.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ns_2.c,v 1.44 2004/03/05 05:10:15 marka Exp $ */
+/* $Id: ns_2.c,v 1.45 2007/06/18 23:47:43 tbox Exp $ */
 
 /* Reviewed: Wed Mar 15 18:15:00 PST 2000 by bwelling */
 

diff --git a/lib/dns/rdata/generic/ns_2.h b/lib/dns/rdata/generic/ns_2.h
index 55067235a6028019ae61c2db1d2b68d1d9f0340b..6c06e920ab09583e1991882794c966044acddff1 100644 (file)
--- a/lib/dns/rdata/generic/ns_2.h
+++ b/lib/dns/rdata/generic/ns_2.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -19,7 +19,7 @@
 #ifndef GENERIC_NS_2_H
 #define GENERIC_NS_2_H 1
 
-/* $Id: ns_2.h,v 1.25 2005/04/29 00:23:13 marka Exp $ */
+/* $Id: ns_2.h,v 1.26 2007/06/18 23:47:43 tbox Exp $ */
 
 typedef struct dns_rdata_ns {
        dns_rdatacommon_t       common;

diff --git a/lib/dns/rdata/generic/nsec_47.c b/lib/dns/rdata/generic/nsec_47.c
index f3e56ca237ad26e75f7f50e3520ec2f106d02335..d8f07e703bf33c5656114b8988e2dc4a57801f1d 100644 (file)
--- a/lib/dns/rdata/generic/nsec_47.c
+++ b/lib/dns/rdata/generic/nsec_47.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsec_47.c,v 1.7 2004/03/05 05:10:15 marka Exp $ */
+/* $Id: nsec_47.c,v 1.8 2007/06/18 23:47:43 tbox Exp $ */
 
 /* reviewed: Wed Mar 15 18:21:15 PST 2000 by brister */
 

diff --git a/lib/dns/rdata/generic/nsec_47.h b/lib/dns/rdata/generic/nsec_47.h
index 3e75600b1a17ad43761b1a95133d078324656cf5..cd337e6310b1fc8e68a0adc03df250f187ca48a1 100644 (file)
--- a/lib/dns/rdata/generic/nsec_47.h
+++ b/lib/dns/rdata/generic/nsec_47.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2003  Internet Software Consortium.
  *
- * 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.
  *
@@ -18,7 +18,7 @@
 #ifndef GENERIC_NSEC_47_H
 #define GENERIC_NSEC_47_H 1
 
-/* $Id: nsec_47.h,v 1.6 2005/04/29 00:23:13 marka Exp $ */
+/* $Id: nsec_47.h,v 1.7 2007/06/18 23:47:43 tbox Exp $ */
 
 /*!
  * \brief Per draft-ietf-dnsext-nsec-rdata-01.txt */

diff --git a/lib/dns/rdata/generic/null_10.c b/lib/dns/rdata/generic/null_10.c
index a6f8f9f4ce05799723480822b1190d7831c71ead..5ecb38bbd0c76dabedc4edaf6821b333d4872654 100644 (file)
--- a/lib/dns/rdata/generic/null_10.c
+++ b/lib/dns/rdata/generic/null_10.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: null_10.c,v 1.40 2004/03/05 05:10:16 marka Exp $ */
+/* $Id: null_10.c,v 1.41 2007/06/18 23:47:43 tbox Exp $ */
 
 /* Reviewed: Thu Mar 16 13:57:50 PST 2000 by explorer */
 

diff --git a/lib/dns/rdata/generic/null_10.h b/lib/dns/rdata/generic/null_10.h
index 06a91640e0b2693e78f460a04508d4edc9bb3f88..2b23d4438a0f0434bab1386ccc83a2e050c82e5a 100644 (file)
--- a/lib/dns/rdata/generic/null_10.h
+++ b/lib/dns/rdata/generic/null_10.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -19,7 +19,7 @@
 #ifndef GENERIC_NULL_10_H
 #define GENERIC_NULL_10_H 1
 
-/* $Id: null_10.h,v 1.23 2005/04/29 00:23:13 marka Exp $ */
+/* $Id: null_10.h,v 1.24 2007/06/18 23:47:43 tbox Exp $ */
 
 typedef struct dns_rdata_null {
        dns_rdatacommon_t       common;

diff --git a/lib/dns/rdata/generic/nxt_30.c b/lib/dns/rdata/generic/nxt_30.c
index bb5c40c57404d933f503eb82bc45167f0012b966..833f3ebfcd7d28f931389ab7f7bd2f7ff7284016 100644 (file)
--- a/lib/dns/rdata/generic/nxt_30.c
+++ b/lib/dns/rdata/generic/nxt_30.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nxt_30.c,v 1.61 2005/04/29 00:23:13 marka Exp $ */
+/* $Id: nxt_30.c,v 1.62 2007/06/18 23:47:43 tbox Exp $ */
 
 /* reviewed: Wed Mar 15 18:21:15 PST 2000 by brister */
 

diff --git a/lib/dns/rdata/generic/nxt_30.h b/lib/dns/rdata/generic/nxt_30.h
index 00a36b4f3887a723684a302f7a14ab4f8aa6bcf8..09feb88597c1d4b377e92dff42876ca68bcef128 100644 (file)
--- a/lib/dns/rdata/generic/nxt_30.h
+++ b/lib/dns/rdata/generic/nxt_30.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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.
  *
@@ -18,7 +18,7 @@
 #ifndef GENERIC_NXT_30_H
 #define GENERIC_NXT_30_H 1
 
-/* $Id: nxt_30.h,v 1.23 2005/04/29 00:23:14 marka Exp $ */
+/* $Id: nxt_30.h,v 1.24 2007/06/18 23:47:43 tbox Exp $ */
 
 /*!
  *  \brief RFC2535 */

diff --git a/lib/dns/rdata/generic/opt_41.c b/lib/dns/rdata/generic/opt_41.c
index 04dca115014c8f215150e69d03a185c4be42f411..cef1b9c44adbce9095401d7ee39e8b885e9b7baf 100644 (file)
--- a/lib/dns/rdata/generic/opt_41.c
+++ b/lib/dns/rdata/generic/opt_41.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: opt_41.c,v 1.31 2005/04/29 00:23:14 marka Exp $ */
+/* $Id: opt_41.c,v 1.32 2007/06/18 23:47:43 tbox Exp $ */
 
 /* Reviewed: Thu Mar 16 14:06:44 PST 2000 by gson */
 

diff --git a/lib/dns/rdata/generic/opt_41.h b/lib/dns/rdata/generic/opt_41.h
index 2925acd6e90bccd1d17f68362db726d43d5014d6..46e0abd3024fdaa60e4b3b1f6ecd8296cbd451a5 100644 (file)
--- a/lib/dns/rdata/generic/opt_41.h
+++ b/lib/dns/rdata/generic/opt_41.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -18,7 +18,7 @@
 #ifndef GENERIC_OPT_41_H
 #define GENERIC_OPT_41_H 1
 
-/* $Id: opt_41.h,v 1.16 2005/04/29 00:23:14 marka Exp $ */
+/* $Id: opt_41.h,v 1.17 2007/06/18 23:47:43 tbox Exp $ */
 
 /*!
  *  \brief Per RFC2671 */

diff --git a/lib/dns/rdata/generic/proforma.c b/lib/dns/rdata/generic/proforma.c
index bf8b2fdfb871ed5f6e0ab338eb26fba121811d81..ef6b5fb84c4138cebc5dbb0aa77d1d7bf3150dcd 100644 (file)
--- a/lib/dns/rdata/generic/proforma.c
+++ b/lib/dns/rdata/generic/proforma.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: proforma.c,v 1.34 2004/03/05 05:10:17 marka Exp $ */
+/* $Id: proforma.c,v 1.35 2007/06/18 23:47:43 tbox Exp $ */
 
 #ifndef RDATA_GENERIC_#_#_C
 #define RDATA_GENERIC_#_#_C

diff --git a/lib/dns/rdata/generic/proforma.h b/lib/dns/rdata/generic/proforma.h
index ad4f4a543229b3326404e8012130223945b87481..0855a5b546a390985df100fd6a9c31f6df408c76 100644 (file)
--- a/lib/dns/rdata/generic/proforma.h
+++ b/lib/dns/rdata/generic/proforma.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -19,7 +19,7 @@
 #ifndef GENERIC_PROFORMA_H
 #define GENERIC_PROFORMA_H 1
 
-/* $Id: proforma.h,v 1.21 2005/04/29 00:23:14 marka Exp $ */
+/* $Id: proforma.h,v 1.22 2007/06/18 23:47:43 tbox Exp $ */
 
 typedef struct dns_rdata_# {
        dns_rdatacommon_t       common;

diff --git a/lib/dns/rdata/generic/ptr_12.c b/lib/dns/rdata/generic/ptr_12.c
index 16d5706bcecb557cac9bfaddf12032fddb221c09..1dd8b6115d13b39e397a009cff9eb3fac7f7ec18 100644 (file)
--- a/lib/dns/rdata/generic/ptr_12.c
+++ b/lib/dns/rdata/generic/ptr_12.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ptr_12.c,v 1.41 2004/03/05 05:10:17 marka Exp $ */
+/* $Id: ptr_12.c,v 1.42 2007/06/18 23:47:43 tbox Exp $ */
 
 /* Reviewed: Thu Mar 16 14:05:12 PST 2000 by explorer */
 

diff --git a/lib/dns/rdata/generic/ptr_12.h b/lib/dns/rdata/generic/ptr_12.h
index 56cd959b47596997327f469ed2d85fa8be778082..2f5d975933f65896ab1c2078b902a8a76de334b3 100644 (file)
--- a/lib/dns/rdata/generic/ptr_12.h
+++ b/lib/dns/rdata/generic/ptr_12.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -19,7 +19,7 @@
 #ifndef GENERIC_PTR_12_H
 #define GENERIC_PTR_12_H 1
 
-/* $Id: ptr_12.h,v 1.25 2005/04/29 00:23:14 marka Exp $ */
+/* $Id: ptr_12.h,v 1.26 2007/06/18 23:47:43 tbox Exp $ */
 
 typedef struct dns_rdata_ptr {
         dns_rdatacommon_t       common;

diff --git a/lib/dns/rdata/generic/rp_17.c b/lib/dns/rdata/generic/rp_17.c
index 3f982265c8b5f12f9fea7b210c90ffc9a6ffa2ca..4450467c30e16c36ffbdc606e05f0a10df21c855 100644 (file)
--- a/lib/dns/rdata/generic/rp_17.c
+++ b/lib/dns/rdata/generic/rp_17.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rp_17.c,v 1.40 2005/04/29 00:23:15 marka Exp $ */
+/* $Id: rp_17.c,v 1.41 2007/06/18 23:47:43 tbox Exp $ */
 
 /* RFC1183 */
 

diff --git a/lib/dns/rdata/generic/rp_17.h b/lib/dns/rdata/generic/rp_17.h
index 32f1b13e1df9117cebdb9583246b656e83073504..eabcb8c7454cf14fa157d839c404d531a2527261 100644 (file)
--- a/lib/dns/rdata/generic/rp_17.h
+++ b/lib/dns/rdata/generic/rp_17.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -18,7 +18,7 @@
 #ifndef GENERIC_RP_17_H
 #define GENERIC_RP_17_H 1
 
-/* $Id: rp_17.h,v 1.19 2005/04/29 00:23:15 marka Exp $ */
+/* $Id: rp_17.h,v 1.20 2007/06/18 23:47:43 tbox Exp $ */
 
 /*!
  *  \brief Per RFC1183 */

diff --git a/lib/dns/rdata/generic/rrsig_46.c b/lib/dns/rdata/generic/rrsig_46.c
index 8b26f56ce1e8c45e767cecc21248fd0e73f97a8a..9d9125282c349ec4a6dc2913cae8b98bb953c1da 100644 (file)
--- a/lib/dns/rdata/generic/rrsig_46.c
+++ b/lib/dns/rdata/generic/rrsig_46.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rrsig_46.c,v 1.8 2005/04/29 00:23:15 marka Exp $ */
+/* $Id: rrsig_46.c,v 1.9 2007/06/18 23:47:43 tbox Exp $ */
 
 /* Reviewed: Fri Mar 17 09:05:02 PST 2000 by gson */
 

diff --git a/lib/dns/rdata/generic/rrsig_46.h b/lib/dns/rdata/generic/rrsig_46.h
index c7c6f481775cd38201004451d338b726b15fa539..021c23c7d21fee6af3090be070b6521c9e379a36 100644 (file)
--- a/lib/dns/rdata/generic/rrsig_46.h
+++ b/lib/dns/rdata/generic/rrsig_46.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2003  Internet Software Consortium.
  *
- * 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.
  *
@@ -18,7 +18,7 @@
 #ifndef GENERIC_DNSSIG_46_H
 #define GENERIC_DNSSIG_46_H 1
 
-/* $Id: rrsig_46.h,v 1.5 2005/04/29 00:23:15 marka Exp $ */
+/* $Id: rrsig_46.h,v 1.6 2007/06/18 23:47:43 tbox Exp $ */
 
 /*!
  *  \brief Per RFC2535 */

diff --git a/lib/dns/rdata/generic/rt_21.c b/lib/dns/rdata/generic/rt_21.c
index 04d15c2fb5198576a032d238f670d78ee9c5265c..de4fafae05546b79a7a1eb975bc4cabffda00fa0 100644 (file)
--- a/lib/dns/rdata/generic/rt_21.c
+++ b/lib/dns/rdata/generic/rt_21.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rt_21.c,v 1.44 2005/04/27 04:57:05 sra Exp $ */
+/* $Id: rt_21.c,v 1.45 2007/06/18 23:47:43 tbox Exp $ */
 
 /* reviewed: Thu Mar 16 15:02:31 PST 2000 by brister */
 

diff --git a/lib/dns/rdata/generic/rt_21.h b/lib/dns/rdata/generic/rt_21.h
index ecd20e750a42575097c0823f7dc11ff1fc796102..93c00221e8d2622c04537c91b0e1890e1e89c244 100644 (file)
--- a/lib/dns/rdata/generic/rt_21.h
+++ b/lib/dns/rdata/generic/rt_21.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -18,7 +18,7 @@
 #ifndef GENERIC_RT_21_H
 #define GENERIC_RT_21_H 1
 
-/* $Id: rt_21.h,v 1.19 2005/04/29 00:23:15 marka Exp $ */
+/* $Id: rt_21.h,v 1.20 2007/06/18 23:47:43 tbox Exp $ */
 
 /*!
  *  \brief Per RFC1183 */

diff --git a/lib/dns/rdata/generic/sig_24.c b/lib/dns/rdata/generic/sig_24.c
index 11872ba4ca84a158a5efe291c16963edb7348a79..e782ae73255c41126e2c6169c4a78bfe81fe229a 100644 (file)
--- a/lib/dns/rdata/generic/sig_24.c
+++ b/lib/dns/rdata/generic/sig_24.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sig_24.c,v 1.64 2005/04/29 00:23:16 marka Exp $ */
+/* $Id: sig_24.c,v 1.65 2007/06/18 23:47:43 tbox Exp $ */
 
 /* Reviewed: Fri Mar 17 09:05:02 PST 2000 by gson */
 

diff --git a/lib/dns/rdata/generic/sig_24.h b/lib/dns/rdata/generic/sig_24.h
index 61bfc85aad19533b7dab15d355357b7c280575f9..2075fea8425aa20d1a02feace3a3ece4b58a44ff 100644 (file)
--- a/lib/dns/rdata/generic/sig_24.h
+++ b/lib/dns/rdata/generic/sig_24.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -18,7 +18,7 @@
 #ifndef GENERIC_SIG_24_H
 #define GENERIC_SIG_24_H 1
 
-/* $Id: sig_24.h,v 1.24 2005/04/29 00:23:16 marka Exp $ */
+/* $Id: sig_24.h,v 1.25 2007/06/18 23:47:43 tbox Exp $ */
 
 /*!
  *  \brief Per RFC2535 */

diff --git a/lib/dns/rdata/generic/soa_6.c b/lib/dns/rdata/generic/soa_6.c
index 8de678c581bab694bc570aa7c1c97b135ac08b47..1330abff72b5ca15cb54c2a18fd1fec0bda7481c 100644 (file)
--- a/lib/dns/rdata/generic/soa_6.c
+++ b/lib/dns/rdata/generic/soa_6.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: soa_6.c,v 1.59 2004/03/05 05:10:18 marka Exp $ */
+/* $Id: soa_6.c,v 1.60 2007/06/18 23:47:43 tbox Exp $ */
 
 /* Reviewed: Thu Mar 16 15:18:32 PST 2000 by explorer */
 

diff --git a/lib/dns/rdata/generic/soa_6.h b/lib/dns/rdata/generic/soa_6.h
index 5e6d981853323a70201a1ae20e5f9933728737e3..5bc3cc1817a2214f7e17190c7951562cfbb3a8aa 100644 (file)
--- a/lib/dns/rdata/generic/soa_6.h
+++ b/lib/dns/rdata/generic/soa_6.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -19,7 +19,7 @@
 #ifndef GENERIC_SOA_6_H
 #define GENERIC_SOA_6_H 1
 
-/* $Id: soa_6.h,v 1.30 2005/04/29 00:23:16 marka Exp $ */
+/* $Id: soa_6.h,v 1.31 2007/06/18 23:47:43 tbox Exp $ */
 
 typedef struct dns_rdata_soa {
        dns_rdatacommon_t       common;

diff --git a/lib/dns/rdata/generic/spf_99.c b/lib/dns/rdata/generic/spf_99.c
index 57ebc6aeae3fdc73023084fc48fe7d3fa4eccaf2..69307583ea85aa631f2e1a4c39943e3bbe5462b4 100644 (file)
--- a/lib/dns/rdata/generic/spf_99.c
+++ b/lib/dns/rdata/generic/spf_99.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: spf_99.c,v 1.2 2005/07/16 00:40:43 marka Exp $ */
+/* $Id: spf_99.c,v 1.3 2007/06/18 23:47:43 tbox Exp $ */
 
 /* Reviewed: Thu Mar 16 15:40:00 PST 2000 by bwelling */
 

diff --git a/lib/dns/rdata/generic/spf_99.h b/lib/dns/rdata/generic/spf_99.h
index a6b54595bdcbcbb004b35acabb36cb31089b0150..540d825493bfc7ceb8c2be21d1005d7d9a90139c 100644 (file)
--- a/lib/dns/rdata/generic/spf_99.h
+++ b/lib/dns/rdata/generic/spf_99.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -18,7 +18,7 @@
 #ifndef GENERIC_SPF_99_H
 #define GENERIC_SPF_99_H 1
 
-/* $Id: spf_99.h,v 1.2 2005/07/16 00:40:43 marka Exp $ */
+/* $Id: spf_99.h,v 1.3 2007/06/18 23:47:43 tbox Exp $ */
 
 typedef struct dns_rdata_spf_string {
                 isc_uint8_t    length;

diff --git a/lib/dns/rdata/generic/sshfp_44.c b/lib/dns/rdata/generic/sshfp_44.c
index 1fcec781ffd772fed517e0793657ab8bdf7bcaa7..1dffa97980004c3598e49f9a3e1ad4fb3f09b010 100644 (file)
--- a/lib/dns/rdata/generic/sshfp_44.c
+++ b/lib/dns/rdata/generic/sshfp_44.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sshfp_44.c,v 1.5 2006/01/07 00:23:35 marka Exp $ */
+/* $Id: sshfp_44.c,v 1.6 2007/06/18 23:47:43 tbox Exp $ */
 
 /* RFC 4255 */
 

diff --git a/lib/dns/rdata/generic/sshfp_44.h b/lib/dns/rdata/generic/sshfp_44.h
index 22812dc1256809119aa79a4e86719169c62f5f73..c14d2883859cdc6ff73ed3fd60748bb8eab8220b 100644 (file)
--- a/lib/dns/rdata/generic/sshfp_44.h
+++ b/lib/dns/rdata/generic/sshfp_44.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sshfp_44.h,v 1.6 2006/01/07 00:23:35 marka Exp $ */
+/* $Id: sshfp_44.h,v 1.7 2007/06/18 23:47:43 tbox Exp $ */
 
 /*!
  *  \brief Per RFC 4255 */

diff --git a/lib/dns/rdata/generic/tkey_249.c b/lib/dns/rdata/generic/tkey_249.c
index cee16ab70927c929029419d63d350c87f0c897e8..358551daeefec68942d57374bcc9ba11e892c3ac 100644 (file)
--- a/lib/dns/rdata/generic/tkey_249.c
+++ b/lib/dns/rdata/generic/tkey_249.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tkey_249.c,v 1.55 2004/03/05 05:10:18 marka Exp $ */
+/* $Id: tkey_249.c,v 1.56 2007/06/18 23:47:43 tbox Exp $ */
 
 /*
  * Reviewed: Thu Mar 16 17:35:30 PST 2000 by halley.

diff --git a/lib/dns/rdata/generic/tkey_249.h b/lib/dns/rdata/generic/tkey_249.h
index fa55f53cbb87e8efcc6c05368f78d702654dafb9..97ecf9d88226d9150ce3683674ef1abaf9b1e187 100644 (file)
--- a/lib/dns/rdata/generic/tkey_249.h
+++ b/lib/dns/rdata/generic/tkey_249.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
- * 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.
  *
@@ -18,7 +18,7 @@
 #ifndef GENERIC_TKEY_249_H
 #define GENERIC_TKEY_249_H 1
 
-/* $Id: tkey_249.h,v 1.22 2005/04/29 00:23:17 marka Exp $ */
+/* $Id: tkey_249.h,v 1.23 2007/06/18 23:47:43 tbox Exp $ */
 
 /*!
  *  \brief Per draft-ietf-dnsind-tkey-00.txt */

diff --git a/lib/dns/rdata/generic/txt_16.c b/lib/dns/rdata/generic/txt_16.c
index fa3ffef8d59af66ac7a6c76015a3688dbd990e01..7741a989b53c2869535cb643be9bf257041b2616 100644 (file)
--- a/lib/dns/rdata/generic/txt_16.c
+++ b/lib/dns/rdata/generic/txt_16.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: txt_16.c,v 1.41 2004/03/05 05:10:18 marka Exp $ */
+/* $Id: txt_16.c,v 1.42 2007/06/18 23:47:43 tbox Exp $ */
 
 /* Reviewed: Thu Mar 16 15:40:00 PST 2000 by bwelling */
 

diff --git a/lib/dns/rdata/generic/txt_16.h b/lib/dns/rdata/generic/txt_16.h
index 04e37201d7399d7731d7e39bdb96ad2a94cc427f..3aec9407ef3b71bcf7528840d6ded868bfa486eb 100644 (file)
--- a/lib/dns/rdata/generic/txt_16.h
+++ b/lib/dns/rdata/generic/txt_16.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -19,7 +19,7 @@
 #ifndef GENERIC_TXT_16_H
 #define GENERIC_TXT_16_H 1
 
-/* $Id: txt_16.h,v 1.26 2005/04/29 00:23:17 marka Exp $ */
+/* $Id: txt_16.h,v 1.27 2007/06/18 23:47:43 tbox Exp $ */
 
 typedef struct dns_rdata_txt_string {
                 isc_uint8_t    length;

diff --git a/lib/dns/rdata/generic/unspec_103.c b/lib/dns/rdata/generic/unspec_103.c
index f316ad917a2976f81c60a5f2e4b8d17ee058337e..8fc833e0e0b05bdfaa63892208e2b8257919a0ec 100644 (file)
--- a/lib/dns/rdata/generic/unspec_103.c
+++ b/lib/dns/rdata/generic/unspec_103.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: unspec_103.c,v 1.33 2004/03/05 05:10:18 marka Exp $ */
+/* $Id: unspec_103.c,v 1.34 2007/06/18 23:47:43 tbox Exp $ */
 
 #ifndef RDATA_GENERIC_UNSPEC_103_C
 #define RDATA_GENERIC_UNSPEC_103_C

diff --git a/lib/dns/rdata/generic/unspec_103.h b/lib/dns/rdata/generic/unspec_103.h
index 727e14cab5b2f212dd6ffe87e164a3e1317ad028..898eccc45f21816f1d1341b884b117711eb3013d 100644 (file)
--- a/lib/dns/rdata/generic/unspec_103.h
+++ b/lib/dns/rdata/generic/unspec_103.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -19,7 +19,7 @@
 #ifndef GENERIC_UNSPEC_103_H
 #define GENERIC_UNSPEC_103_H 1
 
-/* $Id: unspec_103.h,v 1.15 2005/04/29 00:23:17 marka Exp $ */
+/* $Id: unspec_103.h,v 1.16 2007/06/18 23:47:43 tbox Exp $ */
 
 typedef struct dns_rdata_unspec_t {
        dns_rdatacommon_t       common;

diff --git a/lib/dns/rdata/generic/x25_19.c b/lib/dns/rdata/generic/x25_19.c
index 7d91613e3c9fa7d01c306d89233cd8517748f9c7..8294e317821e2e7f86059261c69dba7d4bcdb086 100644 (file)
--- a/lib/dns/rdata/generic/x25_19.c
+++ b/lib/dns/rdata/generic/x25_19.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: x25_19.c,v 1.37 2005/04/29 00:23:17 marka Exp $ */
+/* $Id: x25_19.c,v 1.38 2007/06/18 23:47:43 tbox Exp $ */
 
 /* Reviewed: Thu Mar 16 16:15:57 PST 2000 by bwelling */
 

diff --git a/lib/dns/rdata/generic/x25_19.h b/lib/dns/rdata/generic/x25_19.h
index 1cf50c75ed0ca799765e1e30416c5d248ef04c27..88ee9b7cef66830a296c678bd56b5a8cec671dfc 100644 (file)
--- a/lib/dns/rdata/generic/x25_19.h
+++ b/lib/dns/rdata/generic/x25_19.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -18,7 +18,7 @@
 #ifndef GENERIC_X25_19_H
 #define GENERIC_X25_19_H 1
 
-/* $Id: x25_19.h,v 1.16 2005/04/29 00:23:17 marka Exp $ */
+/* $Id: x25_19.h,v 1.17 2007/06/18 23:47:43 tbox Exp $ */
 
 /*!
  *  \brief Per RFC1183 */

diff --git a/lib/dns/rdata/hs_4/a_1.c b/lib/dns/rdata/hs_4/a_1.c
index 5d3ddae3e82b5fee358e38fd01c56282cf5203ff..e5a5ec76e8a06317d2b0d582ee99e43e02b831bb 100644 (file)
--- a/lib/dns/rdata/hs_4/a_1.c
+++ b/lib/dns/rdata/hs_4/a_1.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: a_1.c,v 1.29 2004/03/05 05:10:20 marka Exp $ */
+/* $Id: a_1.c,v 1.30 2007/06/18 23:47:43 tbox Exp $ */
 
 /* reviewed: Thu Mar 16 15:58:36 PST 2000 by brister */
 

diff --git a/lib/dns/rdata/hs_4/a_1.h b/lib/dns/rdata/hs_4/a_1.h
index eb7533f3060194b9ebd773a56354e49093b4985b..edc0298d5d4dbb9466639d862526097cab784060 100644 (file)
--- a/lib/dns/rdata/hs_4/a_1.h
+++ b/lib/dns/rdata/hs_4/a_1.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -19,7 +19,7 @@
 #ifndef HS_4_A_1_H
 #define HS_4_A_1_H 1
 
-/* $Id: a_1.h,v 1.10 2005/04/29 00:23:18 marka Exp $ */
+/* $Id: a_1.h,v 1.11 2007/06/18 23:47:43 tbox Exp $ */
 
 typedef struct dns_rdata_hs_a {
        dns_rdatacommon_t       common;

diff --git a/lib/dns/rdata/in_1/a6_38.c b/lib/dns/rdata/in_1/a6_38.c
index 50017e16de814e65ff7aaf431a702b79893c2000..8ddb1bcbe9e79fe38cc62376f302ee00d542effd 100644 (file)
--- a/lib/dns/rdata/in_1/a6_38.c
+++ b/lib/dns/rdata/in_1/a6_38.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: a6_38.c,v 1.52 2004/03/05 05:10:23 marka Exp $ */
+/* $Id: a6_38.c,v 1.53 2007/06/18 23:47:44 tbox Exp $ */
 
 /* RFC2874 */
 

diff --git a/lib/dns/rdata/in_1/a6_38.h b/lib/dns/rdata/in_1/a6_38.h
index a509ff064b2c946611d69a958c85821fd4c62719..d6df221fa609dd594130370245bd9c9016090ab5 100644 (file)
--- a/lib/dns/rdata/in_1/a6_38.h
+++ b/lib/dns/rdata/in_1/a6_38.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -18,7 +18,7 @@
 #ifndef IN_1_A6_38_H
 #define IN_1_A6_38_H 1
 
-/* $Id: a6_38.h,v 1.22 2005/04/29 00:23:18 marka Exp $ */
+/* $Id: a6_38.h,v 1.23 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! 
  *  \brief Per RFC2874 */

diff --git a/lib/dns/rdata/in_1/a_1.c b/lib/dns/rdata/in_1/a_1.c
index e8cb8ce1edf856e96af688ddf97dbd710b592602..1712706ca4f1970fc61da2913c6e3494ec137b0d 100644 (file)
--- a/lib/dns/rdata/in_1/a_1.c
+++ b/lib/dns/rdata/in_1/a_1.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: a_1.c,v 1.51 2004/03/05 05:10:23 marka Exp $ */
+/* $Id: a_1.c,v 1.52 2007/06/18 23:47:44 tbox Exp $ */
 
 /* Reviewed: Thu Mar 16 16:52:50 PST 2000 by bwelling */
 

diff --git a/lib/dns/rdata/in_1/a_1.h b/lib/dns/rdata/in_1/a_1.h
index af6c0df19cf48a78eeabcbc2d6afefb3f1411b9f..03779f17359617bce93f8c3b2da87002d1af18c1 100644 (file)
--- a/lib/dns/rdata/in_1/a_1.h
+++ b/lib/dns/rdata/in_1/a_1.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -19,7 +19,7 @@
 #ifndef IN_1_A_1_H
 #define IN_1_A_1_H 1
 
-/* $Id: a_1.h,v 1.26 2005/04/29 00:23:18 marka Exp $ */
+/* $Id: a_1.h,v 1.27 2007/06/18 23:47:44 tbox Exp $ */
 
 typedef struct dns_rdata_in_a {
        dns_rdatacommon_t       common;

diff --git a/lib/dns/rdata/in_1/aaaa_28.c b/lib/dns/rdata/in_1/aaaa_28.c
index dd372b4458c83b74d3c772b45ef231ec54ec80f7..c0e138f9cb0b5ac2f69336dea4a70aae2b0b39e8 100644 (file)
--- a/lib/dns/rdata/in_1/aaaa_28.c
+++ b/lib/dns/rdata/in_1/aaaa_28.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: aaaa_28.c,v 1.43 2005/04/29 00:23:19 marka Exp $ */
+/* $Id: aaaa_28.c,v 1.44 2007/06/18 23:47:44 tbox Exp $ */
 
 /* Reviewed: Thu Mar 16 16:52:50 PST 2000 by bwelling */
 

diff --git a/lib/dns/rdata/in_1/aaaa_28.h b/lib/dns/rdata/in_1/aaaa_28.h
index 38e749a607c1465b651a160a9b8b6fc77328cd23..cd808b836ab87fd781cfcc7bf1bab827af03f216 100644 (file)
--- a/lib/dns/rdata/in_1/aaaa_28.h
+++ b/lib/dns/rdata/in_1/aaaa_28.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -18,7 +18,7 @@
 #ifndef IN_1_AAAA_28_H
 #define IN_1_AAAA_28_H 1
 
-/* $Id: aaaa_28.h,v 1.19 2005/04/29 00:23:19 marka Exp $ */
+/* $Id: aaaa_28.h,v 1.20 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! 
  *  \brief Per RFC1886 */

diff --git a/lib/dns/rdata/in_1/apl_42.c b/lib/dns/rdata/in_1/apl_42.c
index f6d0d909b924980fbc3b9518613a54b9e77ad1ef..5e5d717b9d9d6c01b17505a2292a39a8e26fcf75 100644 (file)
--- a/lib/dns/rdata/in_1/apl_42.c
+++ b/lib/dns/rdata/in_1/apl_42.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: apl_42.c,v 1.10 2005/04/29 00:23:19 marka Exp $ */
+/* $Id: apl_42.c,v 1.11 2007/06/18 23:47:44 tbox Exp $ */
 
 /* RFC3123 */
 

diff --git a/lib/dns/rdata/in_1/apl_42.h b/lib/dns/rdata/in_1/apl_42.h
index d8af1e95b8b42a630ddf2c873a8032015b232dab..4ea21fbb39ba9b4ed954a15011645708b38d3620 100644 (file)
--- a/lib/dns/rdata/in_1/apl_42.h
+++ b/lib/dns/rdata/in_1/apl_42.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2002  Internet Software Consortium.
  *
- * 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.
  *
@@ -19,7 +19,7 @@
 #ifndef IN_1_APL_42_H
 #define IN_1_APL_42_H 1
 
-/* $Id: apl_42.h,v 1.4 2005/04/29 00:23:19 marka Exp $ */
+/* $Id: apl_42.h,v 1.5 2007/06/18 23:47:44 tbox Exp $ */
 
 typedef struct dns_rdata_apl_ent {
        isc_boolean_t   negative;

diff --git a/lib/dns/rdata/in_1/dhcid_49.c b/lib/dns/rdata/in_1/dhcid_49.c
index ff7f1317d815a302ea7f14a8c3696bb461cfd8c4..4149be22f5f0cc655ff550350573a88338fffb65 100644 (file)
--- a/lib/dns/rdata/in_1/dhcid_49.c
+++ b/lib/dns/rdata/in_1/dhcid_49.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2006  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dhcid_49.c,v 1.3 2006/12/07 23:57:59 marka Exp $ */
+/* $Id: dhcid_49.c,v 1.4 2007/06/18 23:47:44 tbox Exp $ */
 
 /* RFC 4701 */
 

diff --git a/lib/dns/rdata/in_1/dhcid_49.h b/lib/dns/rdata/in_1/dhcid_49.h
index b2e4c24a5d6856cc0b2079c3c85c81ed9f6f63f3..a52fcca80a186207979bbd68c2c948610bad46f8 100644 (file)
--- a/lib/dns/rdata/in_1/dhcid_49.h
+++ b/lib/dns/rdata/in_1/dhcid_49.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2006  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.
  *
@@ -18,7 +18,7 @@
 #ifndef IN_1_DHCID_49_H
 #define IN_1_DHCID_49_H 1
 
-/* $Id: dhcid_49.h,v 1.3 2006/12/07 23:57:59 marka Exp $ */
+/* $Id: dhcid_49.h,v 1.4 2007/06/18 23:47:44 tbox Exp $ */
 
 typedef struct dns_rdata_in_dhcid {
        dns_rdatacommon_t       common;

diff --git a/lib/dns/rdata/in_1/kx_36.c b/lib/dns/rdata/in_1/kx_36.c
index 9b77ba0f6ea2a5313a6595f739079a22c8a288a1..096925a98f27166cbdab623694bf7a2a55760bf0 100644 (file)
--- a/lib/dns/rdata/in_1/kx_36.c
+++ b/lib/dns/rdata/in_1/kx_36.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: kx_36.c,v 1.43 2005/04/29 00:23:19 marka Exp $ */
+/* $Id: kx_36.c,v 1.44 2007/06/18 23:47:44 tbox Exp $ */
 
 /* Reviewed: Thu Mar 16 17:24:54 PST 2000 by explorer */
 

diff --git a/lib/dns/rdata/in_1/kx_36.h b/lib/dns/rdata/in_1/kx_36.h
index 8878e5d3ef364eba47cf67419b73df47ae75bcda..6b5c911a3b2389254576d7998ba279a1c5bc8f9e 100644 (file)
--- a/lib/dns/rdata/in_1/kx_36.h
+++ b/lib/dns/rdata/in_1/kx_36.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -18,7 +18,7 @@
 #ifndef IN_1_KX_36_H
 #define IN_1_KX_36_H 1
 
-/* $Id: kx_36.h,v 1.18 2005/04/29 00:23:20 marka Exp $ */
+/* $Id: kx_36.h,v 1.19 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! 
  *  \brief Per RFC2230 */

diff --git a/lib/dns/rdata/in_1/naptr_35.c b/lib/dns/rdata/in_1/naptr_35.c
index 7a2d9754423cc917e02b04911d886cfe4f4a03ee..d8dea5b9e424f266eb1d26b8f4a4e05be5925a84 100644 (file)
--- a/lib/dns/rdata/in_1/naptr_35.c
+++ b/lib/dns/rdata/in_1/naptr_35.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: naptr_35.c,v 1.49 2005/04/29 00:23:20 marka Exp $ */
+/* $Id: naptr_35.c,v 1.50 2007/06/18 23:47:44 tbox Exp $ */
 
 /* Reviewed: Thu Mar 16 16:52:50 PST 2000 by bwelling */
 

diff --git a/lib/dns/rdata/in_1/naptr_35.h b/lib/dns/rdata/in_1/naptr_35.h
index 8b741fe477cae1bf5f4bea44ddbe4c802354025c..dd5c893e7d5c172de6ba285a03f03a54c5648c6a 100644 (file)
--- a/lib/dns/rdata/in_1/naptr_35.h
+++ b/lib/dns/rdata/in_1/naptr_35.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -18,7 +18,7 @@
 #ifndef IN_1_NAPTR_35_H
 #define IN_1_NAPTR_35_H 1
 
-/* $Id: naptr_35.h,v 1.21 2005/04/29 00:23:20 marka Exp $ */
+/* $Id: naptr_35.h,v 1.22 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! 
  *  \brief Per RFC2915 */

diff --git a/lib/dns/rdata/in_1/nsap-ptr_23.c b/lib/dns/rdata/in_1/nsap-ptr_23.c
index 5f1d9cf299b13657a0ba5c87b2c3ddb8bac97962..e2b22936faef706b3360b95a327b6813f8f754da 100644 (file)
--- a/lib/dns/rdata/in_1/nsap-ptr_23.c
+++ b/lib/dns/rdata/in_1/nsap-ptr_23.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsap-ptr_23.c,v 1.36 2005/04/29 00:23:20 marka Exp $ */
+/* $Id: nsap-ptr_23.c,v 1.37 2007/06/18 23:47:44 tbox Exp $ */
 
 /* Reviewed: Fri Mar 17 10:16:02 PST 2000 by gson */
 

diff --git a/lib/dns/rdata/in_1/nsap-ptr_23.h b/lib/dns/rdata/in_1/nsap-ptr_23.h
index 346ebdb85602c71e60ebb4ba1963e26e74a5d748..e9f5ee812052713eafde28682dda4ffe16b97c7a 100644 (file)
--- a/lib/dns/rdata/in_1/nsap-ptr_23.h
+++ b/lib/dns/rdata/in_1/nsap-ptr_23.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -18,7 +18,7 @@
 #ifndef IN_1_NSAP_PTR_23_H
 #define IN_1_NSAP_PTR_23_H 1
 
-/* $Id: nsap-ptr_23.h,v 1.17 2005/04/29 00:23:20 marka Exp $ */
+/* $Id: nsap-ptr_23.h,v 1.18 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! 
  *  \brief Per RFC1348.  Obsoleted in RFC 1706 - use PTR instead. */

diff --git a/lib/dns/rdata/in_1/nsap_22.c b/lib/dns/rdata/in_1/nsap_22.c
index 8b9ee74bba602fd878068a5d3151ed52f3440474..57e868f2579da0cf3fe63adec7fb292e5037432d 100644 (file)
--- a/lib/dns/rdata/in_1/nsap_22.c
+++ b/lib/dns/rdata/in_1/nsap_22.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsap_22.c,v 1.40 2005/04/29 00:23:21 marka Exp $ */
+/* $Id: nsap_22.c,v 1.41 2007/06/18 23:47:44 tbox Exp $ */
 
 /* Reviewed: Fri Mar 17 10:41:07 PST 2000 by gson */
 

diff --git a/lib/dns/rdata/in_1/nsap_22.h b/lib/dns/rdata/in_1/nsap_22.h
index 929f05f43cdf713fbdab51d57423fd346383e88f..5096fd754b6c9cc8ad8ced3ebddb473d8c666e6a 100644 (file)
--- a/lib/dns/rdata/in_1/nsap_22.h
+++ b/lib/dns/rdata/in_1/nsap_22.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -18,7 +18,7 @@
 #ifndef IN_1_NSAP_22_H
 #define IN_1_NSAP_22_H 1
 
-/* $Id: nsap_22.h,v 1.16 2005/04/29 00:23:21 marka Exp $ */
+/* $Id: nsap_22.h,v 1.17 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! 
  *  \brief Per RFC1706 */

diff --git a/lib/dns/rdata/in_1/px_26.c b/lib/dns/rdata/in_1/px_26.c
index 6e739c2c87b3d82281a09e266450fc62f13f4c7f..d7282d4a1c34371c5b9d5333d9db11025013befc 100644 (file)
--- a/lib/dns/rdata/in_1/px_26.c
+++ b/lib/dns/rdata/in_1/px_26.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: px_26.c,v 1.41 2005/04/29 00:23:21 marka Exp $ */
+/* $Id: px_26.c,v 1.42 2007/06/18 23:47:44 tbox Exp $ */
 
 /* Reviewed: Mon Mar 20 10:44:27 PST 2000 */
 

diff --git a/lib/dns/rdata/in_1/px_26.h b/lib/dns/rdata/in_1/px_26.h
index 103fbb5bec9a31f60db97c5b47e225f99b3a4466..597aaabbaa22ef92d4c306e11499f1c733900a43 100644 (file)
--- a/lib/dns/rdata/in_1/px_26.h
+++ b/lib/dns/rdata/in_1/px_26.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -18,7 +18,7 @@
 #ifndef IN_1_PX_26_H
 #define IN_1_PX_26_H 1
 
-/* $Id: px_26.h,v 1.17 2005/04/29 00:23:21 marka Exp $ */
+/* $Id: px_26.h,v 1.18 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! 
  *  \brief Per RFC2163 */

diff --git a/lib/dns/rdata/in_1/srv_33.c b/lib/dns/rdata/in_1/srv_33.c
index 085cc42b7ac3ae3d48131f82af6d7505bd0a045e..52066fc056caca80c38a0767981033a13aa55456 100644 (file)
--- a/lib/dns/rdata/in_1/srv_33.c
+++ b/lib/dns/rdata/in_1/srv_33.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: srv_33.c,v 1.43 2005/04/29 00:23:21 marka Exp $ */
+/* $Id: srv_33.c,v 1.44 2007/06/18 23:47:44 tbox Exp $ */
 
 /* Reviewed: Fri Mar 17 13:01:00 PST 2000 by bwelling */
 

diff --git a/lib/dns/rdata/in_1/srv_33.h b/lib/dns/rdata/in_1/srv_33.h
index ade114c76b7ad6f99ec5d9d01c046eea376db791..9c7cd8cdf2667c3ec15c744564603a9a365d5677 100644 (file)
--- a/lib/dns/rdata/in_1/srv_33.h
+++ b/lib/dns/rdata/in_1/srv_33.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -18,7 +18,7 @@
 #ifndef IN_1_SRV_33_H
 #define IN_1_SRV_33_H 1
 
-/* $Id: srv_33.h,v 1.17 2005/04/29 00:23:22 marka Exp $ */
+/* $Id: srv_33.h,v 1.18 2007/06/18 23:47:44 tbox Exp $ */
 
 /* Reviewed: Fri Mar 17 13:01:00 PST 2000 by bwelling */
 

diff --git a/lib/dns/rdata/in_1/wks_11.c b/lib/dns/rdata/in_1/wks_11.c
index 233c4b29ab1f9894d7e7fa5dde4150a770e32342..82aabc0e9f8cf00c726d9d4da58830a6fda688fc 100644 (file)
--- a/lib/dns/rdata/in_1/wks_11.c
+++ b/lib/dns/rdata/in_1/wks_11.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: wks_11.c,v 1.52 2004/09/16 01:01:26 marka Exp $ */
+/* $Id: wks_11.c,v 1.53 2007/06/18 23:47:44 tbox Exp $ */
 
 /* Reviewed: Fri Mar 17 15:01:49 PST 2000 by explorer */
 

diff --git a/lib/dns/rdata/in_1/wks_11.h b/lib/dns/rdata/in_1/wks_11.h
index a0093b968ca65baf83a616f2e0e27fe63a7b90f6..e87ee664b51024758a00c306008f41f66dadab63 100644 (file)
--- a/lib/dns/rdata/in_1/wks_11.h
+++ b/lib/dns/rdata/in_1/wks_11.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -18,7 +18,7 @@
 #ifndef IN_1_WKS_11_H
 #define IN_1_WKS_11_H 1
 
-/* $Id: wks_11.h,v 1.20 2004/03/05 05:10:25 marka Exp $ */
+/* $Id: wks_11.h,v 1.21 2007/06/18 23:47:44 tbox Exp $ */
 
 typedef        struct dns_rdata_in_wks {
        dns_rdatacommon_t       common;

diff --git a/lib/dns/rdata/rdatastructpre.h b/lib/dns/rdata/rdatastructpre.h
index d641ef5f878b06e769b12b81f1d54fa21aaefb6f..4e97cb908517cdf952126ae3eb1e432159a0fd9d 100644 (file)
--- a/lib/dns/rdata/rdatastructpre.h
+++ b/lib/dns/rdata/rdatastructpre.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdatastructpre.h,v 1.14 2004/03/05 05:10:04 marka Exp $ */
+/* $Id: rdatastructpre.h,v 1.15 2007/06/18 23:47:43 tbox Exp $ */
 
 #ifndef DNS_RDATASTRUCT_H
 #define DNS_RDATASTRUCT_H 1

diff --git a/lib/dns/rdata/rdatastructsuf.h b/lib/dns/rdata/rdatastructsuf.h
index 1ab1b0acf8693e13f5d7e4cda2e75baafaff4898..f52bd8d0237f00fd544d08138e59ecfc9518ba10 100644 (file)
--- a/lib/dns/rdata/rdatastructsuf.h
+++ b/lib/dns/rdata/rdatastructsuf.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdatastructsuf.h,v 1.8 2004/03/05 05:10:04 marka Exp $ */
+/* $Id: rdatastructsuf.h,v 1.9 2007/06/18 23:47:43 tbox Exp $ */
 
 ISC_LANG_ENDDECLS
 

diff --git a/lib/dns/rdatalist.c b/lib/dns/rdatalist.c
index 2bfcde799a6a4f4de8f5f38ab008f7c5c5a80e00..fcf4a7a3473aded5e76a84bdc0467eef98455680 100644 (file)
--- a/lib/dns/rdatalist.c
+++ b/lib/dns/rdatalist.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdatalist.c,v 1.31 2005/04/29 00:22:50 marka Exp $ */
+/* $Id: rdatalist.c,v 1.32 2007/06/18 23:47:41 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/rdatalist_p.h b/lib/dns/rdatalist_p.h
index 5a0fd02bc8c269441a024befd21b30be55f72ed0..4ee1d06d7ddecf5e4e907c17b5c2333cfc121601 100644 (file)
--- a/lib/dns/rdatalist_p.h
+++ b/lib/dns/rdatalist_p.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdatalist_p.h,v 1.7 2005/04/29 00:22:50 marka Exp $ */
+/* $Id: rdatalist_p.h,v 1.8 2007/06/18 23:47:41 tbox Exp $ */
 
 #ifndef DNS_RDATALIST_P_H
 #define DNS_RDATALIST_P_H

diff --git a/lib/dns/rdataset.c b/lib/dns/rdataset.c
index 661343c9b54c52a3d04f6f972bda3a70a6794965..9f75a17b8d22991102aa6aec394304c8efeb53d4 100644 (file)
--- a/lib/dns/rdataset.c
+++ b/lib/dns/rdataset.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdataset.c,v 1.77 2006/03/02 00:37:23 marka Exp $ */
+/* $Id: rdataset.c,v 1.78 2007/06/18 23:47:41 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/rdatasetiter.c b/lib/dns/rdatasetiter.c
index 7afebaa02247566275453750333e8d2aeaa8b169..b14e2295c88f374981578b4213b64bfe5fc1057c 100644 (file)
--- a/lib/dns/rdatasetiter.c
+++ b/lib/dns/rdatasetiter.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdatasetiter.c,v 1.14 2005/04/29 00:22:51 marka Exp $ */
+/* $Id: rdatasetiter.c,v 1.15 2007/06/18 23:47:41 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/rdataslab.c b/lib/dns/rdataslab.c
index b2c595a83ec5530f2ab95877a22fa883b10a8ffb..6de77bac8d01679a26539173dacfe028153d00b9 100644 (file)
--- a/lib/dns/rdataslab.c
+++ b/lib/dns/rdataslab.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdataslab.c,v 1.42 2007/03/14 23:46:54 tbox Exp $ */
+/* $Id: rdataslab.c,v 1.43 2007/06/18 23:47:41 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/request.c b/lib/dns/request.c
index 58a93fd7ed21d079297949ed564cc4a3449dd27c..ac6b42a31f2281cb8b71dad9655f272e8aa63f30 100644 (file)
--- a/lib/dns/request.c
+++ b/lib/dns/request.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: request.c,v 1.77 2006/08/21 00:35:36 marka Exp $ */
+/* $Id: request.c,v 1.78 2007/06/18 23:47:41 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index e5739834346145c8dffee39821aee5b010fdf66e..330b9f78e65599a1fb2c5f19b9469ea718cd5954 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.c,v 1.348 2007/06/18 02:34:21 marka Exp $ */
+/* $Id: resolver.c,v 1.349 2007/06/18 23:47:41 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/result.c b/lib/dns/result.c
index c6cc5fe2e391366cead49aa07599eb4a8a2e039f..0d6aa3ffa78e54ac86510271d4b79daa3bcf96d7 100644 (file)
--- a/lib/dns/result.c
+++ b/lib/dns/result.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: result.c,v 1.121 2005/06/17 01:58:22 marka Exp $ */
+/* $Id: result.c,v 1.122 2007/06/18 23:47:41 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/rootns.c b/lib/dns/rootns.c
index d7ae94f707782137ac84f3e375bf148b770332a9..7f7c47541bdd1a59b0c16b22cd0d4b27af58d039 100644 (file)
--- a/lib/dns/rootns.c
+++ b/lib/dns/rootns.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rootns.c,v 1.29 2005/04/27 04:56:51 sra Exp $ */
+/* $Id: rootns.c,v 1.30 2007/06/18 23:47:41 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/sdb.c b/lib/dns/sdb.c
index 03d83161b2e9578e7a8de8002e6b09c81de28636..3a1c0ee86dc3ef8057bbcc2fcad6260e9eab0e95 100644 (file)
--- a/lib/dns/sdb.c
+++ b/lib/dns/sdb.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sdb.c,v 1.57 2007/03/06 02:12:39 tbox Exp $ */
+/* $Id: sdb.c,v 1.58 2007/06/18 23:47:41 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/sdlz.c b/lib/dns/sdlz.c
index 5a0686044511262dd3cdd5715bc1071d25d4b0c0..314d0e16d6b94fe2cadbf7b64715ae131205074b 100644 (file)
--- a/lib/dns/sdlz.c
+++ b/lib/dns/sdlz.c
@@ -2,7 +2,7 @@
  * Portions Copyright (C) 2005-2007  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -50,7 +50,7 @@
  * USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sdlz.c,v 1.12 2007/03/06 00:38:57 marka Exp $ */
+/* $Id: sdlz.c,v 1.13 2007/06/18 23:47:41 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/soa.c b/lib/dns/soa.c
index ace496d26890622d6b1df1c3eb066466c11325fd..398daa382c1043cc7aebe61af36777272b3ee553 100644 (file)
--- a/lib/dns/soa.c
+++ b/lib/dns/soa.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: soa.c,v 1.6 2005/04/29 00:22:52 marka Exp $ */
+/* $Id: soa.c,v 1.7 2007/06/18 23:47:41 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/spnego.c b/lib/dns/spnego.c
index 9206f9207f7285e24e36b4af9b71736614e3405a..8383e43368cd491a7e392762b57d4d970f509e0d 100644 (file)
--- a/lib/dns/spnego.c
+++ b/lib/dns/spnego.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2006  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: spnego.c,v 1.3 2006/12/22 01:44:59 marka Exp $ */
+/* $Id: spnego.c,v 1.4 2007/06/18 23:47:41 tbox Exp $ */
 
 /*! \file
  * \brief

diff --git a/lib/dns/spnego.h b/lib/dns/spnego.h
index 69a0f44fbc5ac0bed956188b695c49054bdb80e4..04fc9018049abbe611fd00054d1f535d8057b468 100644 (file)
--- a/lib/dns/spnego.h
+++ b/lib/dns/spnego.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2006  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: spnego.h,v 1.2 2006/12/04 01:52:46 marka Exp $ */
+/* $Id: spnego.h,v 1.3 2007/06/18 23:47:41 tbox Exp $ */
 
 /*! \file
  * \brief

diff --git a/lib/dns/spnego_asn1.c b/lib/dns/spnego_asn1.c
index eb9c39bb29245934786e2abcebbb57a82b3e8dfb..ad60ef7e3aa39e41c078bc1bd755d6fc38be028e 100644 (file)
--- a/lib/dns/spnego_asn1.c
+++ b/lib/dns/spnego_asn1.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2006  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: spnego_asn1.c,v 1.2 2006/12/04 01:52:46 marka Exp $ */
+/* $Id: spnego_asn1.c,v 1.3 2007/06/18 23:47:41 tbox Exp $ */
 
 /*! \file
  * \brief Method routines generated from SPNEGO ASN.1 module.

diff --git a/lib/dns/spnego_asn1.pl b/lib/dns/spnego_asn1.pl
index f66fa2aee585861cda2b22d2b2a70c0846dc6402..d01297f4bf84f04a1a6cf2244f09f88542fd6415 100644 (file)
--- a/lib/dns/spnego_asn1.pl
+++ b/lib/dns/spnego_asn1.pl
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2006  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: spnego_asn1.pl,v 1.2 2006/12/04 01:52:46 marka Exp $
+# $Id: spnego_asn1.pl,v 1.3 2007/06/18 23:47:41 tbox Exp $
 
 # Our SPNEGO implementation uses some functions generated by the
 # Heimdal ASN.1 compiler, which this script then whacks a bit to make
@@ -99,7 +99,7 @@ print(q~/*
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: spnego_asn1.pl,v 1.2 2006/12/04 01:52:46 marka Exp $ */
+/* $Id: spnego_asn1.pl,v 1.3 2007/06/18 23:47:41 tbox Exp $ */
 
 /*! \file
  * \brief Method routines generated from SPNEGO ASN.1 module.

diff --git a/lib/dns/ssu.c b/lib/dns/ssu.c
index 7664d5a1cb4138bfb53ad0d79528918065c72672..565ab2bc449130035985b08c7bda9cf3d7be57a4 100644 (file)
--- a/lib/dns/ssu.c
+++ b/lib/dns/ssu.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
  *
- * 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.
  *
@@ -17,7 +17,7 @@
 
 /*! \file */
 /*
- * $Id: ssu.c,v 1.29 2006/12/04 01:52:46 marka Exp $
+ * $Id: ssu.c,v 1.30 2007/06/18 23:47:41 tbox Exp $
  * Principal Author: Brian Wellington
  */
 

diff --git a/lib/dns/stats.c b/lib/dns/stats.c
index 89815fb862303025e765ed477ae3080d10303fda..597fcc57029ced7625fdc3c6be30ab90625987b3 100644 (file)
--- a/lib/dns/stats.c
+++ b/lib/dns/stats.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: stats.c,v 1.10 2005/06/27 00:15:44 marka Exp $ */
+/* $Id: stats.c,v 1.11 2007/06/18 23:47:41 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/tcpmsg.c b/lib/dns/tcpmsg.c
index 66ab67a0f238e03ac6ca3e0478a0631b90e88cc2..6810adff242a567db40e4cfa7d9aeba32fd93c35 100644 (file)
--- a/lib/dns/tcpmsg.c
+++ b/lib/dns/tcpmsg.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tcpmsg.c,v 1.29 2006/08/10 23:59:30 marka Exp $ */
+/* $Id: tcpmsg.c,v 1.30 2007/06/18 23:47:41 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/time.c b/lib/dns/time.c
index 755c53784854ccecaf394d27f5390f2239b2bc67..d33d58b7084b33d44fb6396aacb84781b2c86b62 100644 (file)
--- a/lib/dns/time.c
+++ b/lib/dns/time.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: time.c,v 1.29 2005/04/29 00:22:52 marka Exp $ */
+/* $Id: time.c,v 1.30 2007/06/18 23:47:41 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/timer.c b/lib/dns/timer.c
index cdcaaa8d73131447c030d00bbfc39fe264d40533..ef0d38b4e95e01cf77da16f583e946b96f79cc0c 100644 (file)
--- a/lib/dns/timer.c
+++ b/lib/dns/timer.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: timer.c,v 1.5 2005/04/29 00:22:52 marka Exp $ */
+/* $Id: timer.c,v 1.6 2007/06/18 23:47:41 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/tkey.c b/lib/dns/tkey.c
index 0edea571e2f88afb176e94833c3bdf955eb6aff8..f8e154af87af089b35e76c757ab4385cdad79804 100644 (file)
--- a/lib/dns/tkey.c
+++ b/lib/dns/tkey.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
- * 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.
  *
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: tkey.c,v 1.84 2006/12/05 21:59:12 marka Exp $
+ * $Id: tkey.c,v 1.85 2007/06/18 23:47:41 tbox Exp $
  */
 /*! \file */
 #include <config.h>

diff --git a/lib/dns/tsig.c b/lib/dns/tsig.c
index e2b5885cf95b0792a4c3e7c2f26a66467251b9e1..3a34f0ee92c776facbf44245b4b001d2c64e6581 100644 (file)
--- a/lib/dns/tsig.c
+++ b/lib/dns/tsig.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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.
  *
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: tsig.c,v 1.127 2006/12/04 01:52:46 marka Exp $
+ * $Id: tsig.c,v 1.128 2007/06/18 23:47:41 tbox Exp $
  */
 /*! \file */
 #include <config.h>

diff --git a/lib/dns/ttl.c b/lib/dns/ttl.c
index cfdaa56be878705c5c52f463fc19b8d229215b07..bfe0a40c7f33c6542e6a06d5cf061fc3cc601ab7 100644 (file)
--- a/lib/dns/ttl.c
+++ b/lib/dns/ttl.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ttl.c,v 1.27 2005/04/29 00:22:53 marka Exp $ */
+/* $Id: ttl.c,v 1.28 2007/06/18 23:47:41 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/validator.c b/lib/dns/validator.c
index 8e614c970b4faa0a1418149f1356e7baf709257e..560355868752dfb17da35f090641004c3a63747e 100644 (file)
--- a/lib/dns/validator.c
+++ b/lib/dns/validator.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: validator.c,v 1.151 2007/04/27 06:13:29 marka Exp $ */
+/* $Id: validator.c,v 1.152 2007/06/18 23:47:41 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/lib/dns/version.c b/lib/dns/version.c
index 98cf95a85901e3594ad50a8500684312eb623f4b..0a5ded862b7d0e94731150156fc82371327bb2b2 100644 (file)
--- a/lib/dns/version.c
+++ b/lib/dns/version.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: version.c,v 1.13 2005/04/29 00:22:53 marka Exp $ */
+/* $Id: version.c,v 1.14 2007/06/18 23:47:42 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/view.c b/lib/dns/view.c
index 48ac79ac00821ee76d146bdb40577e7ced75d12b..762b1922ff96d5c2bd61bf3c9dc9006eb21e79b6 100644 (file)
--- a/lib/dns/view.c
+++ b/lib/dns/view.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: view.c,v 1.142 2007/05/15 02:38:34 marka Exp $ */
+/* $Id: view.c,v 1.143 2007/06/18 23:47:42 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/win32/DLLMain.c b/lib/dns/win32/DLLMain.c
index 08801b562a9653ffa36db223a699fe2b1931488c..7c1e1293fbe72533f3bf4a03d13e498b97845a03 100644 (file)
--- a/lib/dns/win32/DLLMain.c
+++ b/lib/dns/win32/DLLMain.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: DLLMain.c,v 1.5 2007/06/18 03:36:50 marka Exp $ */
+/* $Id: DLLMain.c,v 1.6 2007/06/18 23:47:44 tbox Exp $ */
 
 #include <windows.h>
 #include <signal.h>

diff --git a/lib/dns/win32/version.c b/lib/dns/win32/version.c
index 6e20c63f62d9c450946bae8acc3f410f71835621..d8bd6ab747a98747436a860ff998a6c4d8ebe2b7 100644 (file)
--- a/lib/dns/win32/version.c
+++ b/lib/dns/win32/version.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: version.c,v 1.4 2004/03/05 05:10:41 marka Exp $ */
+/* $Id: version.c,v 1.5 2007/06/18 23:47:44 tbox Exp $ */
 
 #include <versions.h>
 

diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c
index 200b67099f55fc64aeed048553171a0cc192d39d..18a3cc8e23b36bf438078c726fc4448d19eddf80 100644 (file)
--- a/lib/dns/xfrin.c
+++ b/lib/dns/xfrin.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: xfrin.c,v 1.152 2007/05/24 02:55:05 marka Exp $ */
+/* $Id: xfrin.c,v 1.153 2007/06/18 23:47:42 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index f7a343c09841a9501bb3b37500c186c82a2044bd..d12895edd6ae09b03151d078bc53f8f1e65f7f9b 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.464 2007/03/29 06:36:30 marka Exp $ */
+/* $Id: zone.c,v 1.465 2007/06/18 23:47:42 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/zonekey.c b/lib/dns/zonekey.c
index e726022a10f54bbe81cb362b758036545ca0bdf1..d5c3a823dc006c9d43c4bf073f3bccb1f0a7088a 100644 (file)
--- a/lib/dns/zonekey.c
+++ b/lib/dns/zonekey.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zonekey.c,v 1.7 2005/04/29 00:22:53 marka Exp $ */
+/* $Id: zonekey.c,v 1.8 2007/06/18 23:47:42 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/zt.c b/lib/dns/zt.c
index 048445b10a2089dc9b2c248fbfe20f67341e4e7b..45569518a162f2fd30254f6b48715f2310a28687 100644 (file)
--- a/lib/dns/zt.c
+++ b/lib/dns/zt.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zt.c,v 1.45 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: zt.c,v 1.46 2007/06/18 23:47:42 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/Makefile.in b/lib/isc/Makefile.in
index 19144b34c70fb2cde5b6af191d2255e5c3db68fe..6ea6f13f6feb827b73c8ab38725d43907cf5ad1e 100644 (file)
--- a/lib/isc/Makefile.in
+++ b/lib/isc/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2003  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.89 2006/12/22 03:07:57 explorer Exp $
+# $Id: Makefile.in,v 1.90 2007/06/18 23:47:44 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/isc/alpha/include/isc/atomic.h b/lib/isc/alpha/include/isc/atomic.h
index 2eb4a1715d7e31f4da5a03e57fb7fb8772f7c469..dc1352caf0a742870592ef7f4ac7b49209c209bf 100644 (file)
--- a/lib/isc/alpha/include/isc/atomic.h
+++ b/lib/isc/alpha/include/isc/atomic.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2005  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: atomic.h,v 1.3 2005/06/16 21:57:59 jinmei Exp $ */
+/* $Id: atomic.h,v 1.4 2007/06/18 23:47:44 tbox Exp $ */
 
 /*
  * This code was written based on FreeBSD's kernel source whose copyright

diff --git a/lib/isc/assertions.c b/lib/isc/assertions.c
index 4f59a5817477f1b4edaea1e6ef879791e74bd143..9f0499cce26f888e3580654f5959bf600a27c6fd 100644 (file)
--- a/lib/isc/assertions.c
+++ b/lib/isc/assertions.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1997-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: assertions.c,v 1.19 2005/04/29 00:23:22 marka Exp $ */
+/* $Id: assertions.c,v 1.20 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/base64.c b/lib/isc/base64.c
index 2dba0b20e20b526a37a3ba8d244ef28a29e78efd..9aa0f419878da779b4a7b93d89957088a4729a74 100644 (file)
--- a/lib/isc/base64.c
+++ b/lib/isc/base64.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: base64.c,v 1.30 2005/04/29 00:23:22 marka Exp $ */
+/* $Id: base64.c,v 1.31 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/bitstring.c b/lib/isc/bitstring.c
index 2ce11ac31f35ff32d8a5cb4ce8211edcb00c4bb3..dc526b490f2fbb070c146d92967613c9886ab9a5 100644 (file)
--- a/lib/isc/bitstring.c
+++ b/lib/isc/bitstring.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: bitstring.c,v 1.15 2005/04/29 00:23:23 marka Exp $ */
+/* $Id: bitstring.c,v 1.16 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/buffer.c b/lib/isc/buffer.c
index e36407fc7c7c9943d55097a7495a582c22b3b600..971810d9cc4b9f7ce60d5615cccca4be481b5701 100644 (file)
--- a/lib/isc/buffer.c
+++ b/lib/isc/buffer.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: buffer.c,v 1.45 2006/12/21 06:02:30 marka Exp $ */
+/* $Id: buffer.c,v 1.46 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/bufferlist.c b/lib/isc/bufferlist.c
index 7cbe86fbb22622aca8b2b46f14eb268ba3f16c0a..becfa73cea7b2af3779b73edcd10f91d9777a970 100644 (file)
--- a/lib/isc/bufferlist.c
+++ b/lib/isc/bufferlist.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: bufferlist.c,v 1.15 2005/04/29 00:23:23 marka Exp $ */
+/* $Id: bufferlist.c,v 1.16 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/commandline.c b/lib/isc/commandline.c
index ef3dd3d608e5ebfbe8ffba64cecb9d989f213c47..ed9ce834a95ee02c5deef32477b6f2fd34662de3 100644 (file)
--- a/lib/isc/commandline.c
+++ b/lib/isc/commandline.c
@@ -2,7 +2,7 @@
  * Portions Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -48,7 +48,7 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: commandline.c,v 1.18 2005/04/29 00:23:23 marka Exp $ */
+/* $Id: commandline.c,v 1.19 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! \file
  * This file was adapted from the NetBSD project's source tree, RCS ID:

diff --git a/lib/isc/entropy.c b/lib/isc/entropy.c
index db61b3ef013901159b8dd405ed5493435a785e29..bb4f482b146e39757c49c8dbb984df4f9500960f 100644 (file)
--- a/lib/isc/entropy.c
+++ b/lib/isc/entropy.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: entropy.c,v 1.16 2006/12/05 00:13:48 marka Exp $ */
+/* $Id: entropy.c,v 1.17 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! \file
  * \brief

diff --git a/lib/isc/error.c b/lib/isc/error.c
index 6934eaf6cb2e387108995b5d324a731de4097830..ffe7736b93642cc22afb7006f8e59beeea429e36 100644 (file)
--- a/lib/isc/error.c
+++ b/lib/isc/error.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: error.c,v 1.19 2005/04/29 00:23:24 marka Exp $ */
+/* $Id: error.c,v 1.20 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/event.c b/lib/isc/event.c
index 7f024719e303c501e970fa8003fd6b68f4e161cc..4778544036f07c7f26bfd24de75a3f2e10710a0d 100644 (file)
--- a/lib/isc/event.c
+++ b/lib/isc/event.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: event.c,v 1.19 2005/04/29 00:23:24 marka Exp $ */
+/* $Id: event.c,v 1.20 2007/06/18 23:47:44 tbox Exp $ */
 
 /*!
  * \file

diff --git a/lib/isc/fsaccess.c b/lib/isc/fsaccess.c
index 3c96f0bc428b320ab14c7ffaf9fbfe1f689290a6..4345262212a7ca35d331fbb92c5f4e4c04272074 100644 (file)
--- a/lib/isc/fsaccess.c
+++ b/lib/isc/fsaccess.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: fsaccess.c,v 1.8 2005/04/29 00:23:24 marka Exp $ */
+/* $Id: fsaccess.c,v 1.9 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! \file
  * \brief

diff --git a/lib/isc/hash.c b/lib/isc/hash.c
index b858315aab84f9225ddd3b3ee078b1ea7bd4c5b9..043b9803667e1ce705daea01adb3631dde07770c 100644 (file)
--- a/lib/isc/hash.c
+++ b/lib/isc/hash.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: hash.c,v 1.11 2006/01/04 00:37:24 marka Exp $ */
+/* $Id: hash.c,v 1.12 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! \file
  * Some portion of this code was derived from universal hash function

diff --git a/lib/isc/heap.c b/lib/isc/heap.c
index 34dbc89cc45a23168661f4fd79cd7623a3e30692..9d6161add38951dcb51a004cd61c50bcec9e714c 100644 (file)
--- a/lib/isc/heap.c
+++ b/lib/isc/heap.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1997-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: heap.c,v 1.34 2006/04/15 01:30:16 marka Exp $ */
+/* $Id: heap.c,v 1.35 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! \file
  * Heap implementation of priority queues adapted from the following:

diff --git a/lib/isc/hex.c b/lib/isc/hex.c
index 19160654e18f9952130eea3d275dd1a7db099ea3..cf1b29a20f6a0e56051f26dfac16a78d36f2dfe6 100644 (file)
--- a/lib/isc/hex.c
+++ b/lib/isc/hex.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: hex.c,v 1.16 2005/04/29 00:23:25 marka Exp $ */
+/* $Id: hex.c,v 1.17 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/hmacmd5.c b/lib/isc/hmacmd5.c
index 2f21a36dd1341ef9a2d55e7e049ff904b266d4f5..7359aa18d55e0f4bf3a3f5c8a8b34cbfd0853aa3 100644 (file)
--- a/lib/isc/hmacmd5.c
+++ b/lib/isc/hmacmd5.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: hmacmd5.c,v 1.12 2006/02/26 22:28:22 marka Exp $ */
+/* $Id: hmacmd5.c,v 1.13 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! \file
  * This code implements the HMAC-MD5 keyed hash algorithm

diff --git a/lib/isc/hmacsha.c b/lib/isc/hmacsha.c
index ac4c0d663f6a77e3e8faa7bc05b18cfd87a841be..0927046bddf9194345d46338b7ec90aa83fc9819 100644 (file)
--- a/lib/isc/hmacsha.c
+++ b/lib/isc/hmacsha.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2005, 2006  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: hmacsha.c,v 1.5 2006/08/16 03:15:09 marka Exp $ */
+/* $Id: hmacsha.c,v 1.6 2007/06/18 23:47:44 tbox Exp $ */
 
 /*
  * This code implements the HMAC-SHA1, HMAC-SHA224, HMAC-SHA256, HMAC-SHA384

diff --git a/lib/isc/httpd.c b/lib/isc/httpd.c
index 072cb319f40de6b56d75951eff1d03b0bc928898..dfdf112288d212c87279e7428ae696be8bc9e205 100644 (file)
--- a/lib/isc/httpd.c
+++ b/lib/isc/httpd.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2006, 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.
  *
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: httpd.c,v 1.9 2007/02/14 00:27:26 marka Exp $ */
+/* $Id: httpd.c,v 1.10 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/ia64/include/isc/atomic.h b/lib/isc/ia64/include/isc/atomic.h
index 94b0f7b7b85994d40b15687b35aac510b50799fa..0badc895c41e95f0a6e513cdcbb9e0d4e4e9e076 100644 (file)
--- a/lib/isc/ia64/include/isc/atomic.h
+++ b/lib/isc/ia64/include/isc/atomic.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2006  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: atomic.h,v 1.2 2006/06/21 03:36:54 marka Exp $ */
+/* $Id: atomic.h,v 1.3 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_ATOMIC_H
 #define ISC_ATOMIC_H 1

diff --git a/lib/isc/include/Makefile.in b/lib/isc/include/Makefile.in
index ceb8eb6061fd23e64300a52240c447300bf31e18..8571d642ad39108d8fa5db3a725b70ff68da43b5 100644 (file)
--- a/lib/isc/include/Makefile.in
+++ b/lib/isc/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.11 2004/03/05 05:10:53 marka Exp $
+# $Id: Makefile.in,v 1.12 2007/06/18 23:47:44 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/isc/include/isc/Makefile.in b/lib/isc/include/isc/Makefile.in
index cd7cf82ef31d7409d57022641c209521f880fd96..e698e856bab871f686008787599e6377deac5309 100644 (file)
--- a/lib/isc/include/isc/Makefile.in
+++ b/lib/isc/include/isc/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2001, 2003  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.60 2006/12/22 03:07:57 explorer Exp $
+# $Id: Makefile.in,v 1.61 2007/06/18 23:47:44 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/isc/include/isc/app.h b/lib/isc/include/isc/app.h
index 373959bea3f233993b2f4ad0c89644f5af28a438..14e6e55331bbc9dc9866074b78cfc325f87b3177 100644 (file)
--- a/lib/isc/include/isc/app.h
+++ b/lib/isc/include/isc/app.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: app.h,v 1.6 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: app.h,v 1.7 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_APP_H
 #define ISC_APP_H 1

diff --git a/lib/isc/include/isc/assertions.h b/lib/isc/include/isc/assertions.h
index 64ffc91fecb9c0212f50772194d0fe17e33cc33e..daf971d3def815648673b42c625bc4eb07515175 100644 (file)
--- a/lib/isc/include/isc/assertions.h
+++ b/lib/isc/include/isc/assertions.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1997-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: assertions.h,v 1.22 2006/12/22 01:59:43 marka Exp $
+ * $Id: assertions.h,v 1.23 2007/06/18 23:47:44 tbox Exp $
  */
 /*! \file isc/assertions.h
  */

diff --git a/lib/isc/include/isc/base64.h b/lib/isc/include/isc/base64.h
index 2c332e0e632ab1bb6cf2e5836114cccdf116b244..6cce417f9649db680201176504d07fcec858c195 100644 (file)
--- a/lib/isc/include/isc/base64.h
+++ b/lib/isc/include/isc/base64.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: base64.h,v 1.20 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: base64.h,v 1.21 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_BASE64_H
 #define ISC_BASE64_H 1

diff --git a/lib/isc/include/isc/bitstring.h b/lib/isc/include/isc/bitstring.h
index a244cfb043202991bb069c88c3cfd2aabc59c723..918cf26a7426fdfbd58dbc481f7784640dec3616 100644 (file)
--- a/lib/isc/include/isc/bitstring.h
+++ b/lib/isc/include/isc/bitstring.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: bitstring.h,v 1.12 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: bitstring.h,v 1.13 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_BITSTRING_H
 #define ISC_BITSTRING_H 1

diff --git a/lib/isc/include/isc/boolean.h b/lib/isc/include/isc/boolean.h
index 17bef0b344db1c1d8155c36e2c9b1629f996e911..160e34334b2bb02cd78c86fe546fa5d08daaf7a0 100644 (file)
--- a/lib/isc/include/isc/boolean.h
+++ b/lib/isc/include/isc/boolean.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: boolean.h,v 1.17 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: boolean.h,v 1.18 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_BOOLEAN_H
 #define ISC_BOOLEAN_H 1

diff --git a/lib/isc/include/isc/buffer.h b/lib/isc/include/isc/buffer.h
index 4fbf52b776c2adb3ff43f235702afc55f8a7eef0..67748699f12e8c24df0008145e93cc66fb947398 100644 (file)
--- a/lib/isc/include/isc/buffer.h
+++ b/lib/isc/include/isc/buffer.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: buffer.h,v 1.49 2006/12/22 01:45:00 marka Exp $ */
+/* $Id: buffer.h,v 1.50 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_BUFFER_H
 #define ISC_BUFFER_H 1

diff --git a/lib/isc/include/isc/bufferlist.h b/lib/isc/include/isc/bufferlist.h
index 561734f73675c832c21f9b628a28b9733a324066..6192fa1303e0784f11c59274bed7cd3691d1babb 100644 (file)
--- a/lib/isc/include/isc/bufferlist.h
+++ b/lib/isc/include/isc/bufferlist.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: bufferlist.h,v 1.15 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: bufferlist.h,v 1.16 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_BUFFERLIST_H
 #define ISC_BUFFERLIST_H 1

diff --git a/lib/isc/include/isc/commandline.h b/lib/isc/include/isc/commandline.h
index 4804d261b0b7285263c1f2c0793bd6e0012fc5b7..57fcd083e21bca4a8d49a79b4e3fd7bfba34894d 100644 (file)
--- a/lib/isc/include/isc/commandline.h
+++ b/lib/isc/include/isc/commandline.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: commandline.h,v 1.14 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: commandline.h,v 1.15 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_COMMANDLINE_H
 #define ISC_COMMANDLINE_H 1

diff --git a/lib/isc/include/isc/entropy.h b/lib/isc/include/isc/entropy.h
index 8079caf710d8a0910ac01412056b5f4b0999c678..770a22c4b739dbc9087ebe13ba75352524f075c7 100644 (file)
--- a/lib/isc/include/isc/entropy.h
+++ b/lib/isc/include/isc/entropy.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: entropy.h,v 1.30 2006/12/22 01:45:00 marka Exp $ */
+/* $Id: entropy.h,v 1.31 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_ENTROPY_H
 #define ISC_ENTROPY_H 1

diff --git a/lib/isc/include/isc/error.h b/lib/isc/include/isc/error.h
index b4b127240a5c0b56daca9d17b7a8ffe089e4f717..f4df097c0dc3c30237738ebf6a707ade649576f3 100644 (file)
--- a/lib/isc/include/isc/error.h
+++ b/lib/isc/include/isc/error.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: error.h,v 1.18 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: error.h,v 1.19 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_ERROR_H
 #define ISC_ERROR_H 1

diff --git a/lib/isc/include/isc/event.h b/lib/isc/include/isc/event.h
index c4fa0aa1265a794b0d85cfa777d29dc700695167..60b76bbedb80bb7760ec03b28223c4af89bc2bad 100644 (file)
--- a/lib/isc/include/isc/event.h
+++ b/lib/isc/include/isc/event.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: event.h,v 1.32 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: event.h,v 1.33 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_EVENT_H
 #define ISC_EVENT_H 1

diff --git a/lib/isc/include/isc/eventclass.h b/lib/isc/include/isc/eventclass.h
index ffac253a937f48abcec5501502e7699feb25836c..c24e99828bf589e1db714c3c167ba5ecbf5dd263 100644 (file)
--- a/lib/isc/include/isc/eventclass.h
+++ b/lib/isc/include/isc/eventclass.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: eventclass.h,v 1.16 2005/04/29 00:23:36 marka Exp $ */
+/* $Id: eventclass.h,v 1.17 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_EVENTCLASS_H
 #define ISC_EVENTCLASS_H 1

diff --git a/lib/isc/include/isc/file.h b/lib/isc/include/isc/file.h
index 4093d6e8cf13438e4d53d9098811ffbf04cb4257..651da92ee25aeebd29f62fc8e08f690b3562c402 100644 (file)
--- a/lib/isc/include/isc/file.h
+++ b/lib/isc/include/isc/file.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: file.h,v 1.31 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: file.h,v 1.32 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_FILE_H
 #define ISC_FILE_H 1

diff --git a/lib/isc/include/isc/formatcheck.h b/lib/isc/include/isc/formatcheck.h
index eed63fb994b6801575afd178a563a5cf4215defc..5b6e79105b53d18ccb5fd10ceb609403a1f5cc2f 100644 (file)
--- a/lib/isc/include/isc/formatcheck.h
+++ b/lib/isc/include/isc/formatcheck.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: formatcheck.h,v 1.11 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: formatcheck.h,v 1.12 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_FORMATCHECK_H
 #define ISC_FORMATCHECK_H 1

diff --git a/lib/isc/include/isc/fsaccess.h b/lib/isc/include/isc/fsaccess.h
index 521af15df5e4bc36f26939000aef1f2893ba8c28..1d7a80cfc9358f577425ee9b42ace12daebf450c 100644 (file)
--- a/lib/isc/include/isc/fsaccess.h
+++ b/lib/isc/include/isc/fsaccess.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: fsaccess.h,v 1.12 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: fsaccess.h,v 1.13 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_FSACCESS_H
 #define ISC_FSACCESS_H 1

diff --git a/lib/isc/include/isc/hash.h b/lib/isc/include/isc/hash.h
index 7c23b27bd423c51be188c4d2373f2ff77e0cae54..a9e1d6de4617dae0ba9555bc76aa5899e7f547de 100644 (file)
--- a/lib/isc/include/isc/hash.h
+++ b/lib/isc/include/isc/hash.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: hash.h,v 1.8 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: hash.h,v 1.9 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_HASH_H
 #define ISC_HASH_H 1

diff --git a/lib/isc/include/isc/heap.h b/lib/isc/include/isc/heap.h
index 1f26c42c5af734190f3dbd63cbd478229a0feb2f..035d6f932b116bee78fa96a7d538bdb42bed489c 100644 (file)
--- a/lib/isc/include/isc/heap.h
+++ b/lib/isc/include/isc/heap.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1997-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: heap.h,v 1.22 2006/12/22 01:45:00 marka Exp $ */
+/* $Id: heap.h,v 1.23 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_HEAP_H
 #define ISC_HEAP_H 1

diff --git a/lib/isc/include/isc/hex.h b/lib/isc/include/isc/hex.h
index 8cedb7bd623cefe62d260049ca3fdc7c02948780..ec533409cc41720ab153693fc33165e4313b4cf7 100644 (file)
--- a/lib/isc/include/isc/hex.h
+++ b/lib/isc/include/isc/hex.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: hex.h,v 1.9 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: hex.h,v 1.10 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_HEX_H
 #define ISC_HEX_H 1

diff --git a/lib/isc/include/isc/hmacmd5.h b/lib/isc/include/isc/hmacmd5.h
index f11a848f3e57d1920acfa0c58ea69ef09ea80ddd..cbff28406e4eeb0266e269fd0ccb672ac4d8fc01 100644 (file)
--- a/lib/isc/include/isc/hmacmd5.h
+++ b/lib/isc/include/isc/hmacmd5.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: hmacmd5.h,v 1.10 2006/12/22 01:45:00 marka Exp $ */
+/* $Id: hmacmd5.h,v 1.11 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! \file isc/hmacmd5.h
  * \brief This is the header file for the HMAC-MD5 keyed hash algorithm

diff --git a/lib/isc/include/isc/hmacsha.h b/lib/isc/include/isc/hmacsha.h
index d9c05c4a5849d8ca98a6d577d287bf48f9db3f92..ea47e5c827c001675e9b6c4d0357fb9ae50e3e4f 100644 (file)
--- a/lib/isc/include/isc/hmacsha.h
+++ b/lib/isc/include/isc/hmacsha.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2005, 2006  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: hmacsha.h,v 1.5 2006/12/22 01:45:00 marka Exp $ */
+/* $Id: hmacsha.h,v 1.6 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! \file isc/hmacsha.h
  * This is the header file for the HMAC-SHA1, HMAC-SHA224, HMAC-SHA256,

diff --git a/lib/isc/include/isc/httpd.h b/lib/isc/include/isc/httpd.h
index 92c1948fbbf9d53fac3d87a8ae646b2bec10e420..5c23fdb6121de35243eb8a82b18177b18072b112 100644 (file)
--- a/lib/isc/include/isc/httpd.h
+++ b/lib/isc/include/isc/httpd.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2006  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: httpd.h,v 1.4 2006/12/21 06:02:30 marka Exp $ */
+/* $Id: httpd.h,v 1.5 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_HTTPD_H
 #define ISC_HTTPD_H 1

diff --git a/lib/isc/include/isc/interfaceiter.h b/lib/isc/include/isc/interfaceiter.h
index 537cebb4ef544611afcdce2d95f41d2060d8fe44..d94ab1dbeff5d82e59dd47af23b2465e2be516cd 100644 (file)
--- a/lib/isc/include/isc/interfaceiter.h
+++ b/lib/isc/include/isc/interfaceiter.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: interfaceiter.h,v 1.15 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: interfaceiter.h,v 1.16 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_INTERFACEITER_H
 #define ISC_INTERFACEITER_H 1

diff --git a/lib/isc/include/isc/ipv6.h b/lib/isc/include/isc/ipv6.h
index 5b91cee7fb3d7980c5a311714066a3f1595c6606..9506401350f7fb024050f510c99844203514566c 100644 (file)
--- a/lib/isc/include/isc/ipv6.h
+++ b/lib/isc/include/isc/ipv6.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ipv6.h,v 1.22 2005/04/29 00:23:37 marka Exp $ */
+/* $Id: ipv6.h,v 1.23 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_IPV6_H
 #define ISC_IPV6_H 1

diff --git a/lib/isc/include/isc/lang.h b/lib/isc/include/isc/lang.h
index 2694e332f8437f0a4003cd822d5cec7a12c6c50e..17b442a2c1374db978020752ee128367b30fd0ac 100644 (file)
--- a/lib/isc/include/isc/lang.h
+++ b/lib/isc/include/isc/lang.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lang.h,v 1.11 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: lang.h,v 1.12 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_LANG_H
 #define ISC_LANG_H 1

diff --git a/lib/isc/include/isc/lex.h b/lib/isc/include/isc/lex.h
index fe7269bc955a27a395d52c467892c9d6923e5bdc..0a2cff0ac94ec4877085436426bf69c585c3f065 100644 (file)
--- a/lib/isc/include/isc/lex.h
+++ b/lib/isc/include/isc/lex.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lex.h,v 1.33 2005/06/04 00:18:55 marka Exp $ */
+/* $Id: lex.h,v 1.34 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_LEX_H
 #define ISC_LEX_H 1

diff --git a/lib/isc/include/isc/lfsr.h b/lib/isc/include/isc/lfsr.h
index 543fbf8407451b11583c867f46c00d91df92ba9b..baa6a038f35e5e71011cb67f6d288c85c5627400 100644 (file)
--- a/lib/isc/include/isc/lfsr.h
+++ b/lib/isc/include/isc/lfsr.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lfsr.h,v 1.15 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: lfsr.h,v 1.16 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_LFSR_H
 #define ISC_LFSR_H 1

diff --git a/lib/isc/include/isc/lib.h b/lib/isc/include/isc/lib.h
index 1cdf447d10cfc93390d2a3bb1f84ba70872c1fd0..eca22197ac00eec67113c466e203a44d1dcf98bc 100644 (file)
--- a/lib/isc/include/isc/lib.h
+++ b/lib/isc/include/isc/lib.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lib.h,v 1.12 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: lib.h,v 1.13 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_LIB_H
 #define ISC_LIB_H 1

diff --git a/lib/isc/include/isc/list.h b/lib/isc/include/isc/list.h
index 230f2bd67e966d5d1ca3d21088f78cc5f1cd9f16..d29d89be061655e7157d9193e7d6a6529355b2a0 100644 (file)
--- a/lib/isc/include/isc/list.h
+++ b/lib/isc/include/isc/list.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1997-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: list.h,v 1.22 2006/06/06 00:11:42 marka Exp $ */
+/* $Id: list.h,v 1.23 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_LIST_H
 #define ISC_LIST_H 1

diff --git a/lib/isc/include/isc/log.h b/lib/isc/include/isc/log.h
index 3977446787945d8da08cd65bfeaa5bf5511247df..d0dcd7d8fd3e0b663285fcdf8d8f95a118e8005a 100644 (file)
--- a/lib/isc/include/isc/log.h
+++ b/lib/isc/include/isc/log.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: log.h,v 1.52 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: log.h,v 1.53 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_LOG_H
 #define ISC_LOG_H 1

diff --git a/lib/isc/include/isc/magic.h b/lib/isc/include/isc/magic.h
index 384d8550cd2e0442cfba14eb24da979f692381f2..a4cf32a4f912e388bea7982e8a2a7fb703f941a1 100644 (file)
--- a/lib/isc/include/isc/magic.h
+++ b/lib/isc/include/isc/magic.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: magic.h,v 1.16 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: magic.h,v 1.17 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_MAGIC_H
 #define ISC_MAGIC_H 1

diff --git a/lib/isc/include/isc/md5.h b/lib/isc/include/isc/md5.h
index a6721fa37db297d7e82d7a33829a7ebc583d0b41..f9da500a661f4777122d96f066e51b878c007608 100644 (file)
--- a/lib/isc/include/isc/md5.h
+++ b/lib/isc/include/isc/md5.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: md5.h,v 1.14 2006/12/22 01:45:00 marka Exp $ */
+/* $Id: md5.h,v 1.15 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! \file isc/md5.h
  * \brief This is the header file for the MD5 message-digest algorithm.

diff --git a/lib/isc/include/isc/mem.h b/lib/isc/include/isc/mem.h
index 39c6a8258a00f06ba639219154bf2c5fee4e2efa..ade0794a32b38e5e26e58127b700cd5b72cd856a 100644 (file)
--- a/lib/isc/include/isc/mem.h
+++ b/lib/isc/include/isc/mem.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1997-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mem.h,v 1.71 2007/02/14 00:27:26 marka Exp $ */
+/* $Id: mem.h,v 1.72 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_MEM_H
 #define ISC_MEM_H 1

diff --git a/lib/isc/include/isc/msgcat.h b/lib/isc/include/isc/msgcat.h
index aad6d174571294aff3c4e9e72b687f7e7dff8f05..c94ebed6489df5d660399abf3ed2ef059b6d4bfb 100644 (file)
--- a/lib/isc/include/isc/msgcat.h
+++ b/lib/isc/include/isc/msgcat.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: msgcat.h,v 1.11 2005/04/29 00:23:40 marka Exp $ */
+/* $Id: msgcat.h,v 1.12 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_MSGCAT_H
 #define ISC_MSGCAT_H 1

diff --git a/lib/isc/include/isc/msgs.h b/lib/isc/include/isc/msgs.h
index b2adbc892ac605f32d14a01bc317f14a07e0e614..6b5dfa8562aeba62d23be27b0f662c11f249d727 100644 (file)
--- a/lib/isc/include/isc/msgs.h
+++ b/lib/isc/include/isc/msgs.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: msgs.h,v 1.13 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: msgs.h,v 1.14 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_MSGS_H
 #define ISC_MSGS_H 1

diff --git a/lib/isc/include/isc/mutexblock.h b/lib/isc/include/isc/mutexblock.h
index e9dca5a9640d6d3b98638228d43cd691a497761b..53b2d3abeff11006539e3af3b64377f32ae59f7f 100644 (file)
--- a/lib/isc/include/isc/mutexblock.h
+++ b/lib/isc/include/isc/mutexblock.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mutexblock.h,v 1.15 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: mutexblock.h,v 1.16 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_MUTEXBLOCK_H
 #define ISC_MUTEXBLOCK_H 1

diff --git a/lib/isc/include/isc/netaddr.h b/lib/isc/include/isc/netaddr.h
index 8e78bbcac46e9c3fbc9b9b0276852c4ec32367b6..ecd9f70689c4af346b9845686c2d3cea01d5c317 100644 (file)
--- a/lib/isc/include/isc/netaddr.h
+++ b/lib/isc/include/isc/netaddr.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: netaddr.h,v 1.34 2007/03/05 23:46:52 tbox Exp $ */
+/* $Id: netaddr.h,v 1.35 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_NETADDR_H
 #define ISC_NETADDR_H 1

diff --git a/lib/isc/include/isc/netscope.h b/lib/isc/include/isc/netscope.h
index 0853a79874fdb51fc35233597180c78d3503d926..046e08cfb415c0a2168234a936be74bf78d3adc9 100644 (file)
--- a/lib/isc/include/isc/netscope.h
+++ b/lib/isc/include/isc/netscope.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: netscope.h,v 1.9 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: netscope.h,v 1.10 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_NETSCOPE_H
 #define ISC_NETSCOPE_H 1

diff --git a/lib/isc/include/isc/ondestroy.h b/lib/isc/include/isc/ondestroy.h
index 52fc926ef0923b3227ced255400555d952a49736..7a77160465bc5d356444ffb03b195617e6aaf27a 100644 (file)
--- a/lib/isc/include/isc/ondestroy.h
+++ b/lib/isc/include/isc/ondestroy.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ondestroy.h,v 1.12 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: ondestroy.h,v 1.13 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_ONDESTROY_H
 #define ISC_ONDESTROY_H 1

diff --git a/lib/isc/include/isc/os.h b/lib/isc/include/isc/os.h
index c811be54d1887f3b47d1f184eb6e7fdf1e2ca429..ed26b68c51c725c845196e99bb5d345d6bb6ebb1 100644 (file)
--- a/lib/isc/include/isc/os.h
+++ b/lib/isc/include/isc/os.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: os.h,v 1.10 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: os.h,v 1.11 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_OS_H
 #define ISC_OS_H 1

diff --git a/lib/isc/include/isc/parseint.h b/lib/isc/include/isc/parseint.h
index ca351a6bc437c72e3c286d30da58ff1389181a85..144028c07dcea8fcbd0bf8eba472a188df283545 100644 (file)
--- a/lib/isc/include/isc/parseint.h
+++ b/lib/isc/include/isc/parseint.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001, 2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: parseint.h,v 1.7 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: parseint.h,v 1.8 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_PARSEINT_H
 #define ISC_PARSEINT_H 1

diff --git a/lib/isc/include/isc/platform.h.in b/lib/isc/include/isc/platform.h.in
index f6ead466bcde34f8d281d59604e8e23019543071..6e20b14452732abcf11130ac6c2fdfa9bf933108 100644 (file)
--- a/lib/isc/include/isc/platform.h.in
+++ b/lib/isc/include/isc/platform.h.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: platform.h.in,v 1.43 2007/02/13 00:04:51 marka Exp $ */
+/* $Id: platform.h.in,v 1.44 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_PLATFORM_H
 #define ISC_PLATFORM_H 1

diff --git a/lib/isc/include/isc/print.h b/lib/isc/include/isc/print.h
index 68efaa2e2984cff77424f560751886258c2b3ec3..8e5d578cd8693e84784c9b643e26f17084fb69d0 100644 (file)
--- a/lib/isc/include/isc/print.h
+++ b/lib/isc/include/isc/print.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: print.h,v 1.24 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: print.h,v 1.25 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_PRINT_H
 #define ISC_PRINT_H 1

diff --git a/lib/isc/include/isc/quota.h b/lib/isc/include/isc/quota.h
index 2839ed547188888a2006507d24c0d363028f7c69..aef723da85c1b55c091f1f5c697ca43a57fcd168 100644 (file)
--- a/lib/isc/include/isc/quota.h
+++ b/lib/isc/include/isc/quota.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: quota.h,v 1.14 2005/08/11 15:03:20 marka Exp $ */
+/* $Id: quota.h,v 1.15 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_QUOTA_H
 #define ISC_QUOTA_H 1

diff --git a/lib/isc/include/isc/random.h b/lib/isc/include/isc/random.h
index 8eec6d0c2d154a8abd9f9138cc395d491304b0c0..e50bb5e1f3787a704ce27cc1d2881a011a60fa78 100644 (file)
--- a/lib/isc/include/isc/random.h
+++ b/lib/isc/include/isc/random.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: random.h,v 1.16 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: random.h,v 1.17 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_RANDOM_H
 #define ISC_RANDOM_H 1

diff --git a/lib/isc/include/isc/ratelimiter.h b/lib/isc/include/isc/ratelimiter.h
index 2249f16e8f9ebb5c11b216f07d60a4fffeafeac6..a4e0345f1c9b9750e50aa660e264e755fe012580 100644 (file)
--- a/lib/isc/include/isc/ratelimiter.h
+++ b/lib/isc/include/isc/ratelimiter.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ratelimiter.h,v 1.19 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: ratelimiter.h,v 1.20 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_RATELIMITER_H
 #define ISC_RATELIMITER_H 1

diff --git a/lib/isc/include/isc/refcount.h b/lib/isc/include/isc/refcount.h
index f5fc17308650e1738cdcb7f01a42940aaf3da132..e36c5ba70f8cd838eedccb29247a225c05554205 100644 (file)
--- a/lib/isc/include/isc/refcount.h
+++ b/lib/isc/include/isc/refcount.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: refcount.h,v 1.13 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: refcount.h,v 1.14 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_REFCOUNT_H
 #define ISC_REFCOUNT_H 1

diff --git a/lib/isc/include/isc/region.h b/lib/isc/include/isc/region.h
index 39e412d5f02e31d924e70aee9822fe9a2501d75d..40482091149d800b20031244897c5745cda2f948 100644 (file)
--- a/lib/isc/include/isc/region.h
+++ b/lib/isc/include/isc/region.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: region.h,v 1.23 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: region.h,v 1.24 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_REGION_H
 #define ISC_REGION_H 1

diff --git a/lib/isc/include/isc/resource.h b/lib/isc/include/isc/resource.h
index 4ca17304037ed535f3124b513235d651a4e8c921..8a4dc3b6f8d88075313b964425bb571ec1f63e11 100644 (file)
--- a/lib/isc/include/isc/resource.h
+++ b/lib/isc/include/isc/resource.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resource.h,v 1.9 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: resource.h,v 1.10 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_RESOURCE_H
 #define ISC_RESOURCE_H 1

diff --git a/lib/isc/include/isc/result.h b/lib/isc/include/isc/result.h
index d231dde7950203fe3e6ff84cc6c620a7080deda2..00d6c734e00a9c1a93f773070f039ae0dc4c61a9 100644 (file)
--- a/lib/isc/include/isc/result.h
+++ b/lib/isc/include/isc/result.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: result.h,v 1.67 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: result.h,v 1.68 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_RESULT_H
 #define ISC_RESULT_H 1

diff --git a/lib/isc/include/isc/resultclass.h b/lib/isc/include/isc/resultclass.h
index fd37c6e70e2d6ee691bbc9888c02f426e8689a13..9a45119ce3506508434083922e6e6ffd1b8119f9 100644 (file)
--- a/lib/isc/include/isc/resultclass.h
+++ b/lib/isc/include/isc/resultclass.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resultclass.h,v 1.16 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: resultclass.h,v 1.17 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_RESULTCLASS_H
 #define ISC_RESULTCLASS_H 1

diff --git a/lib/isc/include/isc/rwlock.h b/lib/isc/include/isc/rwlock.h
index 381fd63cdfbfe0147db97635f1e5cd43ea5a4274..592fe4614d7220d4a99cd5841e132198034e3029 100644 (file)
--- a/lib/isc/include/isc/rwlock.h
+++ b/lib/isc/include/isc/rwlock.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rwlock.h,v 1.26 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: rwlock.h,v 1.27 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_RWLOCK_H
 #define ISC_RWLOCK_H 1

diff --git a/lib/isc/include/isc/serial.h b/lib/isc/include/isc/serial.h
index e54242bd92d2487e7305e135c3132a937aa4416a..aab5460471ebd6905c2817efec1547a7e6cccd95 100644 (file)
--- a/lib/isc/include/isc/serial.h
+++ b/lib/isc/include/isc/serial.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: serial.h,v 1.14 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: serial.h,v 1.15 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_SERIAL_H
 #define ISC_SERIAL_H 1

diff --git a/lib/isc/include/isc/sha1.h b/lib/isc/include/isc/sha1.h
index d039503c94e47b10517f46195a2f4240933355b5..23373de9c473d952edd8dbfbbcc9be8be555e86a 100644 (file)
--- a/lib/isc/include/isc/sha1.h
+++ b/lib/isc/include/isc/sha1.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -18,7 +18,7 @@
 #ifndef ISC_SHA1_H
 #define ISC_SHA1_H 1
 
-/* $Id: sha1.h,v 1.15 2006/12/22 01:45:00 marka Exp $ */
+/* $Id: sha1.h,v 1.16 2007/06/18 23:47:44 tbox Exp $ */
 
 /*     $NetBSD: sha1.h,v 1.2 1998/05/29 22:55:44 thorpej Exp $ */
 

diff --git a/lib/isc/include/isc/sha2.h b/lib/isc/include/isc/sha2.h
index 4d5d07b22ce65e5fc7948fae4cb8441486fc520c..bb91b07ec50bc1cc91f480f675868617ceefbfd8 100644 (file)
--- a/lib/isc/include/isc/sha2.h
+++ b/lib/isc/include/isc/sha2.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2005, 2006  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sha2.h,v 1.7 2006/08/16 03:15:09 marka Exp $ */
+/* $Id: sha2.h,v 1.8 2007/06/18 23:47:44 tbox Exp $ */
 
 /*     $FreeBSD: src/sys/crypto/sha2/sha2.h,v 1.1.2.1 2001/07/03 11:01:36 ume Exp $    */
 /*     $KAME: sha2.h,v 1.3 2001/03/12 08:27:48 itojun Exp $    */

diff --git a/lib/isc/include/isc/sockaddr.h b/lib/isc/include/isc/sockaddr.h
index b731a0e60548deb7064b46440e2d62d6ac21977e..2cb8ef162a3faac126321e5ca5381390f711b98d 100644 (file)
--- a/lib/isc/include/isc/sockaddr.h
+++ b/lib/isc/include/isc/sockaddr.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sockaddr.h,v 1.54 2007/03/05 23:46:52 tbox Exp $ */
+/* $Id: sockaddr.h,v 1.55 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_SOCKADDR_H
 #define ISC_SOCKADDR_H 1

diff --git a/lib/isc/include/isc/socket.h b/lib/isc/include/isc/socket.h
index b998a0646218771695775c9db29c039f86463c10..44587d52379bf32694c6ed8487d7770751eb9d7a 100644 (file)
--- a/lib/isc/include/isc/socket.h
+++ b/lib/isc/include/isc/socket.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.h,v 1.71 2007/02/13 02:49:08 marka Exp $ */
+/* $Id: socket.h,v 1.72 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_SOCKET_H
 #define ISC_SOCKET_H 1

diff --git a/lib/isc/include/isc/stdio.h b/lib/isc/include/isc/stdio.h
index 46ad0a5100b288ec5e8b1a4cf566216b83b8eead..d5cd86083d43a4c8d7b4ca9ee685d760b5ff6713 100644 (file)
--- a/lib/isc/include/isc/stdio.h
+++ b/lib/isc/include/isc/stdio.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: stdio.h,v 1.11 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: stdio.h,v 1.12 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_STDIO_H
 #define ISC_STDIO_H 1

diff --git a/lib/isc/include/isc/stdlib.h b/lib/isc/include/isc/stdlib.h
index 3c5ffa05b1652b23ea2958f9eff9b90e680cfcee..03b69e2a933c796984f30acebee5832fde407d74 100644 (file)
--- a/lib/isc/include/isc/stdlib.h
+++ b/lib/isc/include/isc/stdlib.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: stdlib.h,v 1.6 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: stdlib.h,v 1.7 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_STDLIB_H
 #define ISC_STDLIB_H 1

diff --git a/lib/isc/include/isc/string.h b/lib/isc/include/isc/string.h
index da04c6c8b491ccf74884423c6dfef37aa41a5b9b..6d24b9362cf00daad794d0e0c1bf5309613eaaad 100644 (file)
--- a/lib/isc/include/isc/string.h
+++ b/lib/isc/include/isc/string.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: string.h,v 1.18 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: string.h,v 1.19 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_STRING_H
 #define ISC_STRING_H 1

diff --git a/lib/isc/include/isc/symtab.h b/lib/isc/include/isc/symtab.h
index c15dcc19824090e7417ad65ea9114958f27f7577..f0f854f8ea2c2baa89d503a4df723308065f67b7 100644 (file)
--- a/lib/isc/include/isc/symtab.h
+++ b/lib/isc/include/isc/symtab.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1996-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: symtab.h,v 1.22 2006/12/22 01:45:01 marka Exp $ */
+/* $Id: symtab.h,v 1.23 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_SYMTAB_H
 #define ISC_SYMTAB_H 1

diff --git a/lib/isc/include/isc/task.h b/lib/isc/include/isc/task.h
index 903329fe14645323ffab2e4390e31361bc530b16..7c529b07e4c83a5fd3c85e1ae0254b550e4621c1 100644 (file)
--- a/lib/isc/include/isc/task.h
+++ b/lib/isc/include/isc/task.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: task.h,v 1.60 2007/02/13 02:49:08 marka Exp $ */
+/* $Id: task.h,v 1.61 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_TASK_H
 #define ISC_TASK_H 1

diff --git a/lib/isc/include/isc/taskpool.h b/lib/isc/include/isc/taskpool.h
index fe9d5e1e56d1428822a9c33d410626fc919c03a6..b656ad17bb90e923f6a2c0d9b078c6f1f29e0e95 100644 (file)
--- a/lib/isc/include/isc/taskpool.h
+++ b/lib/isc/include/isc/taskpool.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: taskpool.h,v 1.13 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: taskpool.h,v 1.14 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_TASKPOOL_H
 #define ISC_TASKPOOL_H 1

diff --git a/lib/isc/include/isc/timer.h b/lib/isc/include/isc/timer.h
index 3d9313e887b0f62f4918f6f0e7d0ab6195fc1a03..2b5ef601a9d5ad6ee7437993f9ef8b2b2722fdd2 100644 (file)
--- a/lib/isc/include/isc/timer.h
+++ b/lib/isc/include/isc/timer.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: timer.h,v 1.36 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: timer.h,v 1.37 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_TIMER_H
 #define ISC_TIMER_H 1

diff --git a/lib/isc/include/isc/types.h b/lib/isc/include/isc/types.h
index 74a283f5795e98f957442997aa3c6cc172245788..14653c7b4cf4c2477c039c8a93cff234b2369bae 100644 (file)
--- a/lib/isc/include/isc/types.h
+++ b/lib/isc/include/isc/types.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: types.h,v 1.41 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: types.h,v 1.42 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_TYPES_H
 #define ISC_TYPES_H 1

diff --git a/lib/isc/include/isc/util.h b/lib/isc/include/isc/util.h
index 225f88c232863f39b3fbeb304e6897974c1da30f..459f29dc9520248c19adf39598000f2bf131aca9 100644 (file)
--- a/lib/isc/include/isc/util.h
+++ b/lib/isc/include/isc/util.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: util.h,v 1.28 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: util.h,v 1.29 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_UTIL_H
 #define ISC_UTIL_H 1

diff --git a/lib/isc/include/isc/version.h b/lib/isc/include/isc/version.h
index 5adca619437aa77bf27e6bd5355e0a26a210116f..0da574e1f84d0bafc931e226a59fa18653697c74 100644 (file)
--- a/lib/isc/include/isc/version.h
+++ b/lib/isc/include/isc/version.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: version.h,v 1.7 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: version.h,v 1.8 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! \file isc/version.h */
 

diff --git a/lib/isc/include/isc/xml.h b/lib/isc/include/isc/xml.h
index 146e8c46dcdce93c07846849f819da87857c3fa8..d68769cc4086e3939af14e8d2569ef7c2486cdfc 100644 (file)
--- a/lib/isc/include/isc/xml.h
+++ b/lib/isc/include/isc/xml.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2006  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: xml.h,v 1.2 2006/12/21 06:02:30 marka Exp $ */
+/* $Id: xml.h,v 1.3 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_XML_H
 #define ISC_XML_H 1

diff --git a/lib/isc/inet_aton.c b/lib/isc/inet_aton.c
index 5fa27d7ed918c9dd7123d6564e07c4bac670f58e..12a7b386bc80530afbb67a6e1ca00fac6d22fec6 100644 (file)
--- a/lib/isc/inet_aton.c
+++ b/lib/isc/inet_aton.c
@@ -2,7 +2,7 @@
  * Portions Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1996-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -71,7 +71,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)inet_addr.c        8.1 (Berkeley) 6/17/93";
-static char rcsid[] = "$Id: inet_aton.c,v 1.19 2005/04/29 00:23:25 marka Exp $";
+static char rcsid[] = "$Id: inet_aton.c,v 1.20 2007/06/18 23:47:44 tbox Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <config.h>

diff --git a/lib/isc/inet_ntop.c b/lib/isc/inet_ntop.c
index b8788ef34b5d73320b914243d670b905d00fadc6..56c9e1187fa9b26f4f9ede2c1fb7b89304d0e9ee 100644 (file)
--- a/lib/isc/inet_ntop.c
+++ b/lib/isc/inet_ntop.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1996-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -19,7 +19,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char rcsid[] =
-       "$Id: inet_ntop.c,v 1.17 2005/04/29 00:23:25 marka Exp $";
+       "$Id: inet_ntop.c,v 1.18 2007/06/18 23:47:44 tbox Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <config.h>

diff --git a/lib/isc/inet_pton.c b/lib/isc/inet_pton.c
index c652e079be386eb9997d74babb453a60e78fdf53..2a70116c64fbb2ef513cb0c9540bfb4a17414320 100644 (file)
--- a/lib/isc/inet_pton.c
+++ b/lib/isc/inet_pton.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1996-2003  Internet Software Consortium.
  *
- * 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.
  *
@@ -19,7 +19,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char rcsid[] =
-       "$Id: inet_pton.c,v 1.17 2005/04/29 00:23:25 marka Exp $";
+       "$Id: inet_pton.c,v 1.18 2007/06/18 23:47:44 tbox Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <config.h>

diff --git a/lib/isc/lex.c b/lib/isc/lex.c
index 2f324b88156a65a0abd48a93583ec5261b6b920f..21acfd0b764fab103917aabcd45c68a8e0fa661a 100644 (file)
--- a/lib/isc/lex.c
+++ b/lib/isc/lex.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lex.c,v 1.83 2005/11/30 03:33:49 marka Exp $ */
+/* $Id: lex.c,v 1.84 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/lfsr.c b/lib/isc/lfsr.c
index 4199c3f6e1af6043cd84bb52b8ab7e710d7bd3a7..ba1826f240b60b79d14ca03b3f98dd355b68629f 100644 (file)
--- a/lib/isc/lfsr.c
+++ b/lib/isc/lfsr.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lfsr.c,v 1.18 2005/10/14 01:14:10 marka Exp $ */
+/* $Id: lfsr.c,v 1.19 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/lib.c b/lib/isc/lib.c
index 5265c1faf44b468bfe930a6935dc2d3daea1211b..3cbd84f6df6b05a25fc92d0183ae77fcd264b359 100644 (file)
--- a/lib/isc/lib.c
+++ b/lib/isc/lib.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lib.c,v 1.12 2005/04/29 00:23:27 marka Exp $ */
+/* $Id: lib.c,v 1.13 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/log.c b/lib/isc/log.c
index 2c9d26dc73587375c1f84519138bb9512d9f8345..eb21b82b0dd5434648b508d67129de83baffd816 100644 (file)
--- a/lib/isc/log.c
+++ b/lib/isc/log.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: log.c,v 1.92 2006/03/02 00:37:23 marka Exp $ */
+/* $Id: log.c,v 1.93 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! \file
  * \author  Principal Authors: DCL */

diff --git a/lib/isc/md5.c b/lib/isc/md5.c
index 67579ebd02a847afa7ea3bfaf0dfed634844f590..39037eb223cdf9796de34d213172f2d524b2c758 100644 (file)
--- a/lib/isc/md5.c
+++ b/lib/isc/md5.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: md5.c,v 1.12 2005/04/29 00:23:28 marka Exp $ */
+/* $Id: md5.c,v 1.13 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! \file
  * This code implements the MD5 message-digest algorithm.

diff --git a/lib/isc/mem.c b/lib/isc/mem.c
index e2c7b006991ef32a02e9ada4630a8127a7034f48..80a49518e05bbef02c1e23335729a9f5e6bf5b37 100644 (file)
--- a/lib/isc/mem.c
+++ b/lib/isc/mem.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1997-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mem.c,v 1.134 2007/03/06 00:38:58 marka Exp $ */
+/* $Id: mem.c,v 1.135 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/mips/include/isc/atomic.h b/lib/isc/mips/include/isc/atomic.h
index c409c3a3adfae90ff8ad8123715484da7773d833..cc98175c9354ca14a88ba37ac9b482b5909ea323 100644 (file)
--- a/lib/isc/mips/include/isc/atomic.h
+++ b/lib/isc/mips/include/isc/atomic.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2005  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: atomic.h,v 1.1 2005/07/09 07:08:30 jinmei Exp $ */
+/* $Id: atomic.h,v 1.2 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_ATOMIC_H
 #define ISC_ATOMIC_H 1

diff --git a/lib/isc/mutexblock.c b/lib/isc/mutexblock.c
index c08dfea0e27af770813f7ecec4a9d601aed1365d..c020edb4a9d97b8bc737475b81de48020bea80b9 100644 (file)
--- a/lib/isc/mutexblock.c
+++ b/lib/isc/mutexblock.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mutexblock.c,v 1.18 2005/04/29 00:23:28 marka Exp $ */
+/* $Id: mutexblock.c,v 1.19 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/netaddr.c b/lib/isc/netaddr.c
index 34243febfd0a8d7b01af52e8b004dc9125f587a3..85dd53e03eb6b883ccfe73213910ca8882bd9a9c 100644 (file)
--- a/lib/isc/netaddr.c
+++ b/lib/isc/netaddr.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: netaddr.c,v 1.37 2007/03/05 23:46:52 tbox Exp $ */
+/* $Id: netaddr.c,v 1.38 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/netscope.c b/lib/isc/netscope.c
index 11ffd8d9811eb1fe8bad26683edb958ba728b3b8..64d66f7e26254b92f08a868070061a8ca5864bf9 100644 (file)
--- a/lib/isc/netscope.c
+++ b/lib/isc/netscope.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2002  Internet Software Consortium.
  *
- * 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.
  *
@@ -19,7 +19,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char rcsid[] =
-       "$Id: netscope.c,v 1.11 2006/08/25 05:25:52 marka Exp $";
+       "$Id: netscope.c,v 1.12 2007/06/18 23:47:44 tbox Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <config.h>

diff --git a/lib/isc/nls/Makefile.in b/lib/isc/nls/Makefile.in
index 8211d9bd7d831a45d3b7f5e15495fcdb9d88f9a6..15336bf4ac4b67e8429f3f1b6bf2e837ec3b0698 100644 (file)
--- a/lib/isc/nls/Makefile.in
+++ b/lib/isc/nls/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1999-2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.12 2004/03/05 05:11:05 marka Exp $
+# $Id: Makefile.in,v 1.13 2007/06/18 23:47:44 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/isc/nls/msgcat.c b/lib/isc/nls/msgcat.c
index ac6d5a3e39ed76caf271afedb9c5bef8878a4872..210cd9b102cc6e9bda5da039c364ffbc6d3427ee 100644 (file)
--- a/lib/isc/nls/msgcat.c
+++ b/lib/isc/nls/msgcat.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: msgcat.c,v 1.16 2005/06/08 02:07:00 marka Exp $ */
+/* $Id: msgcat.c,v 1.17 2007/06/18 23:47:45 tbox Exp $ */
 
 /*! \file msgcat.c
  *

diff --git a/lib/isc/noatomic/include/isc/atomic.h b/lib/isc/noatomic/include/isc/atomic.h
index 08681ce5279ec05afc2b0075c18275ed4585d0c9..2505a4fbc7894fb25a07c8ce82742d83291b7b9b 100644 (file)
--- a/lib/isc/noatomic/include/isc/atomic.h
+++ b/lib/isc/noatomic/include/isc/atomic.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2005  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: atomic.h,v 1.2 2005/06/04 05:32:49 jinmei Exp $ */
+/* $Id: atomic.h,v 1.3 2007/06/18 23:47:45 tbox Exp $ */
 
 #ifndef ISC_ATOMIC_H
 #define ISC_ATOMIC_H 1

diff --git a/lib/isc/nothreads/Makefile.in b/lib/isc/nothreads/Makefile.in
index c9e86374e02027780ac2badb69c21f8aeb30a385..53f1890fe610a66527628c20ea58f3e1d289d846 100644 (file)
--- a/lib/isc/nothreads/Makefile.in
+++ b/lib/isc/nothreads/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.5 2004/03/05 05:11:08 marka Exp $
+# $Id: Makefile.in,v 1.6 2007/06/18 23:47:45 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/isc/nothreads/condition.c b/lib/isc/nothreads/condition.c
index 2b2521ba18e9291f27c19aa7feb230ff243b6ac2..52ddf36ec8bd5c748dcfbf6030bef37555fd8758 100644 (file)
--- a/lib/isc/nothreads/condition.c
+++ b/lib/isc/nothreads/condition.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: condition.c,v 1.8 2006/08/25 05:25:52 marka Exp $ */
+/* $Id: condition.c,v 1.9 2007/06/18 23:47:46 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/lib/isc/nothreads/include/Makefile.in b/lib/isc/nothreads/include/Makefile.in
index ecfc3296bbbb5bcd1788e5e7c1edb8ed546fba44..836de9287616c7d72da705788a21fe33e964292d 100644 (file)
--- a/lib/isc/nothreads/include/Makefile.in
+++ b/lib/isc/nothreads/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.3 2004/03/05 05:11:11 marka Exp $
+# $Id: Makefile.in,v 1.4 2007/06/18 23:47:46 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/isc/nothreads/include/isc/Makefile.in b/lib/isc/nothreads/include/isc/Makefile.in
index f6482fb2f56d722fce67c7ca6c0195f8ed7b2d12..2152c50ad7cc172dc931bbc98d79ed0f33c2b7f8 100644 (file)
--- a/lib/isc/nothreads/include/isc/Makefile.in
+++ b/lib/isc/nothreads/include/isc/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.5 2004/03/05 05:11:13 marka Exp $
+# $Id: Makefile.in,v 1.6 2007/06/18 23:47:47 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/isc/nothreads/include/isc/condition.h b/lib/isc/nothreads/include/isc/condition.h
index 39889b17facd13c603b9065265565d9d500c9159..5a223c398e77bcb43567ef0cd58b0aa3df39c7a3 100644 (file)
--- a/lib/isc/nothreads/include/isc/condition.h
+++ b/lib/isc/nothreads/include/isc/condition.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: condition.h,v 1.4 2004/03/05 05:11:13 marka Exp $ */
+/* $Id: condition.h,v 1.5 2007/06/18 23:47:47 tbox Exp $ */
 
 /*
  * This provides a limited subset of the isc_condition_t

diff --git a/lib/isc/nothreads/include/isc/mutex.h b/lib/isc/nothreads/include/isc/mutex.h
index a5864351d16674abe89fd121802521100dbb060a..7c40cc07e917e38b6b523cd978df852525901a0f 100644 (file)
--- a/lib/isc/nothreads/include/isc/mutex.h
+++ b/lib/isc/nothreads/include/isc/mutex.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mutex.h,v 1.4 2004/03/05 05:11:13 marka Exp $ */
+/* $Id: mutex.h,v 1.5 2007/06/18 23:47:47 tbox Exp $ */
 
 #ifndef ISC_MUTEX_H
 #define ISC_MUTEX_H 1

diff --git a/lib/isc/nothreads/include/isc/once.h b/lib/isc/nothreads/include/isc/once.h
index 470120a0e06f05af566635ee9473d95a9bd35f25..96bb47894f8b01ccfd6520a146bb9c7002e06505 100644 (file)
--- a/lib/isc/nothreads/include/isc/once.h
+++ b/lib/isc/nothreads/include/isc/once.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: once.h,v 1.4 2004/03/05 05:11:13 marka Exp $ */
+/* $Id: once.h,v 1.5 2007/06/18 23:47:47 tbox Exp $ */
 
 #ifndef ISC_ONCE_H
 #define ISC_ONCE_H 1

diff --git a/lib/isc/nothreads/include/isc/thread.h b/lib/isc/nothreads/include/isc/thread.h
index 6c85913a42f4d2a16b17126a530e564e9228930f..53bc7d1b63cc9712691f57c5b5b49e34dbcd4319 100644 (file)
--- a/lib/isc/nothreads/include/isc/thread.h
+++ b/lib/isc/nothreads/include/isc/thread.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: thread.h,v 1.4 2004/03/05 05:11:13 marka Exp $ */
+/* $Id: thread.h,v 1.5 2007/06/18 23:47:47 tbox Exp $ */
 
 #ifndef ISC_THREAD_H
 #define ISC_THREAD_H 1

diff --git a/lib/isc/nothreads/mutex.c b/lib/isc/nothreads/mutex.c
index f6ec95f346e610eb9049a6d93eab48bae7658c10..1ce2924dce98c7bf55a16e810af00485dabe065a 100644 (file)
--- a/lib/isc/nothreads/mutex.c
+++ b/lib/isc/nothreads/mutex.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mutex.c,v 1.8 2006/08/25 05:25:52 marka Exp $ */
+/* $Id: mutex.c,v 1.9 2007/06/18 23:47:46 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/lib/isc/nothreads/thread.c b/lib/isc/nothreads/thread.c
index 0f20927d268f50f214ff411b1eda4a3325bc32ed..e037bbdf0096912aabb7b6fda94424ccc54963e3 100644 (file)
--- a/lib/isc/nothreads/thread.c
+++ b/lib/isc/nothreads/thread.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: thread.c,v 1.3 2004/03/05 05:11:09 marka Exp $ */
+/* $Id: thread.c,v 1.4 2007/06/18 23:47:46 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/lib/isc/ondestroy.c b/lib/isc/ondestroy.c
index 4c78de60744db509f4d35c5073a901bbed5274f9..d197964462d3fb84bac8ef30cf6c354d8366adfd 100644 (file)
--- a/lib/isc/ondestroy.c
+++ b/lib/isc/ondestroy.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ondestroy.c,v 1.14 2005/04/29 00:23:28 marka Exp $ */
+/* $Id: ondestroy.c,v 1.15 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/parseint.c b/lib/isc/parseint.c
index cbb25cec986f6a809f76694244eaaafa95a3454d..fb7c7cf2f732e7be3fd82dc15a3b3ab9a89ad23b 100644 (file)
--- a/lib/isc/parseint.c
+++ b/lib/isc/parseint.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: parseint.c,v 1.6 2005/04/29 00:23:29 marka Exp $ */
+/* $Id: parseint.c,v 1.7 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/powerpc/include/isc/atomic.h b/lib/isc/powerpc/include/isc/atomic.h
index 0fb286ba99e2b696e70bd45a6b36d69abae1f109..765cb6d72a8ccbcee04ff090e42de2e0be1a9d80 100644 (file)
--- a/lib/isc/powerpc/include/isc/atomic.h
+++ b/lib/isc/powerpc/include/isc/atomic.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2005, 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.
  *
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: atomic.h,v 1.5 2007/02/13 00:04:51 marka Exp $ */
+/* $Id: atomic.h,v 1.6 2007/06/18 23:47:47 tbox Exp $ */
 
 #ifndef ISC_ATOMIC_H
 #define ISC_ATOMIC_H 1

diff --git a/lib/isc/print.c b/lib/isc/print.c
index b304955791758f066a2a019c3d87239e199b6c41..bf5f78d7736ce4ed1ab4ad98559d8521f29ceb4e 100644 (file)
--- a/lib/isc/print.c
+++ b/lib/isc/print.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: print.c,v 1.31 2006/04/03 00:00:42 marka Exp $ */
+/* $Id: print.c,v 1.32 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/pthreads/Makefile.in b/lib/isc/pthreads/Makefile.in
index b9cc906e20e46c3b924c0ca574e7d9a12f358654..3a597ceae8a132c3538943444116d8c3e671eac3 100644 (file)
--- a/lib/isc/pthreads/Makefile.in
+++ b/lib/isc/pthreads/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.17 2004/03/05 05:11:16 marka Exp $
+# $Id: Makefile.in,v 1.18 2007/06/18 23:47:47 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/isc/pthreads/condition.c b/lib/isc/pthreads/condition.c
index 0dee64c3f89b5931d5f2f1a462d769e58fda3248..91570d8393be33477e976ad955055c061fb9a6a9 100644 (file)
--- a/lib/isc/pthreads/condition.c
+++ b/lib/isc/pthreads/condition.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: condition.c,v 1.34 2005/04/29 00:23:47 marka Exp $ */
+/* $Id: condition.c,v 1.35 2007/06/18 23:47:47 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/pthreads/include/Makefile.in b/lib/isc/pthreads/include/Makefile.in
index b1164b62c0ab855bb1b7b07649c8fb550affea16..e30c0c2172118c734450b3177dbed5437dde2b24 100644 (file)
--- a/lib/isc/pthreads/include/Makefile.in
+++ b/lib/isc/pthreads/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.12 2004/03/05 05:11:19 marka Exp $
+# $Id: Makefile.in,v 1.13 2007/06/18 23:47:47 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/isc/pthreads/include/isc/Makefile.in b/lib/isc/pthreads/include/isc/Makefile.in
index 2e11f6cc1841166bdbbe8bd9e614a1954320befd..1865c41611455ff80b735fdf875fd2a1cea32fbb 100644 (file)
--- a/lib/isc/pthreads/include/isc/Makefile.in
+++ b/lib/isc/pthreads/include/isc/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.14 2004/03/05 05:11:40 marka Exp $
+# $Id: Makefile.in,v 1.15 2007/06/18 23:47:48 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/isc/pthreads/include/isc/condition.h b/lib/isc/pthreads/include/isc/condition.h
index 37112af598d699f30c04cc292b11623c38307412..9fff3c520b4fa354d24b5edd11ebc4785d0da6f6 100644 (file)
--- a/lib/isc/pthreads/include/isc/condition.h
+++ b/lib/isc/pthreads/include/isc/condition.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: condition.h,v 1.24 2005/04/29 00:23:48 marka Exp $ */
+/* $Id: condition.h,v 1.25 2007/06/18 23:47:48 tbox Exp $ */
 
 #ifndef ISC_CONDITION_H
 #define ISC_CONDITION_H 1

diff --git a/lib/isc/pthreads/include/isc/mutex.h b/lib/isc/pthreads/include/isc/mutex.h
index 6c29a5e5c4603ebcf7917d61eabbd97c73f1e274..95e83d0d5ef048cac88bd4cab7ca2f19f20dc1a5 100644 (file)
--- a/lib/isc/pthreads/include/isc/mutex.h
+++ b/lib/isc/pthreads/include/isc/mutex.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mutex.h,v 1.28 2005/07/12 01:00:19 marka Exp $ */
+/* $Id: mutex.h,v 1.29 2007/06/18 23:47:48 tbox Exp $ */
 
 #ifndef ISC_MUTEX_H
 #define ISC_MUTEX_H 1

diff --git a/lib/isc/pthreads/include/isc/once.h b/lib/isc/pthreads/include/isc/once.h
index 5cc5d320e9b4ac9514c9a3626f42b4aced6a1965..0161a04d087dd6bbe985df5688bf749621025ce1 100644 (file)
--- a/lib/isc/pthreads/include/isc/once.h
+++ b/lib/isc/pthreads/include/isc/once.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: once.h,v 1.11 2005/04/29 00:23:48 marka Exp $ */
+/* $Id: once.h,v 1.12 2007/06/18 23:47:48 tbox Exp $ */
 
 #ifndef ISC_ONCE_H
 #define ISC_ONCE_H 1

diff --git a/lib/isc/pthreads/include/isc/thread.h b/lib/isc/pthreads/include/isc/thread.h
index febf196f2ebc930bc65441089427f7871b790d14..db6f0afc1edbb540e75b1aa904da3928c701cc92 100644 (file)
--- a/lib/isc/pthreads/include/isc/thread.h
+++ b/lib/isc/pthreads/include/isc/thread.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: thread.h,v 1.24 2005/09/18 07:16:22 marka Exp $ */
+/* $Id: thread.h,v 1.25 2007/06/18 23:47:48 tbox Exp $ */
 
 #ifndef ISC_THREAD_H
 #define ISC_THREAD_H 1

diff --git a/lib/isc/pthreads/mutex.c b/lib/isc/pthreads/mutex.c
index 9cfc6ba0426dc66b97ce8ecfd492186b1035b706..0e0eb2d1aeee9470b40f3465645ab39c1d37fce1 100644 (file)
--- a/lib/isc/pthreads/mutex.c
+++ b/lib/isc/pthreads/mutex.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mutex.c,v 1.12 2005/07/12 01:00:19 marka Exp $ */
+/* $Id: mutex.c,v 1.13 2007/06/18 23:47:47 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/pthreads/thread.c b/lib/isc/pthreads/thread.c
index 780417808085e9d79961a36a4dc4d6753655ddaf..baef81df8ebf390723f5010b6d464de51e26a6ec 100644 (file)
--- a/lib/isc/pthreads/thread.c
+++ b/lib/isc/pthreads/thread.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: thread.c,v 1.15 2005/04/29 00:23:48 marka Exp $ */
+/* $Id: thread.c,v 1.16 2007/06/18 23:47:47 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/quota.c b/lib/isc/quota.c
index 41360fdbf9fe3bf043fc8d428f7b1c61722c9f73..ec95f0d4f4c2def7a18069298dfeda0d01e6fca5 100644 (file)
--- a/lib/isc/quota.c
+++ b/lib/isc/quota.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: quota.c,v 1.16 2005/07/27 02:29:00 marka Exp $ */
+/* $Id: quota.c,v 1.17 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/random.c b/lib/isc/random.c
index 3bff6e23fb4eb024075d9a9b0e39a68d84d8f424..88ffd494a1a6affa1f2a52cc389db18f1ed43268 100644 (file)
--- a/lib/isc/random.c
+++ b/lib/isc/random.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: random.c,v 1.23 2005/04/29 00:23:29 marka Exp $ */
+/* $Id: random.c,v 1.24 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/ratelimiter.c b/lib/isc/ratelimiter.c
index 03a1881d819a76301f3a46d66a4f68779bb79f6c..30a24cce54ef9f0dcc60a3734f9d694dff3402f0 100644 (file)
--- a/lib/isc/ratelimiter.c
+++ b/lib/isc/ratelimiter.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ratelimiter.c,v 1.23 2005/04/29 00:23:29 marka Exp $ */
+/* $Id: ratelimiter.c,v 1.24 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/refcount.c b/lib/isc/refcount.c
index a1bfeded17dacb0849b4621f697699b38ea04eb0..e2800c0302d420be1692d70d0bd23cb501be4896 100644 (file)
--- a/lib/isc/refcount.c
+++ b/lib/isc/refcount.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2005  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: refcount.c,v 1.3 2005/07/25 00:52:12 marka Exp $ */
+/* $Id: refcount.c,v 1.4 2007/06/18 23:47:44 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/lib/isc/region.c b/lib/isc/region.c
index 0e09f1862eeba255560c30647934a13a39d74bed..75b15aa81154f4865779dbbaafa6dab24ea2324f 100644 (file)
--- a/lib/isc/region.c
+++ b/lib/isc/region.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: region.c,v 1.5 2005/04/29 00:23:30 marka Exp $ */
+/* $Id: region.c,v 1.6 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/result.c b/lib/isc/result.c
index ce3b9883925bbea097ff210f8e79bbd854225d45..2ec66d04f908396ace11a4190076601ddf9a90e3 100644 (file)
--- a/lib/isc/result.c
+++ b/lib/isc/result.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: result.c,v 1.67 2005/06/08 02:06:59 marka Exp $ */
+/* $Id: result.c,v 1.68 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/rwlock.c b/lib/isc/rwlock.c
index 20f384444c85c1699b46d1768a5bac2377702e74..5ac9a338fc852568885e21865000548df38b96b6 100644 (file)
--- a/lib/isc/rwlock.c
+++ b/lib/isc/rwlock.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rwlock.c,v 1.42 2005/07/12 01:00:18 marka Exp $ */
+/* $Id: rwlock.c,v 1.43 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/serial.c b/lib/isc/serial.c
index 23ed1afcd112894f5c6651b1e172ddd0a1d428ed..3c32734e869fac5e62be50feab2c801978716129 100644 (file)
--- a/lib/isc/serial.c
+++ b/lib/isc/serial.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: serial.c,v 1.10 2005/04/29 00:23:30 marka Exp $ */
+/* $Id: serial.c,v 1.11 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/sha1.c b/lib/isc/sha1.c
index be3b61e81ef8cc59da7b21eafe6cfef3610e3e41..6e18fc2b8e59f2c47dbf77d138bfbd781f21a6e3 100644 (file)
--- a/lib/isc/sha1.c
+++ b/lib/isc/sha1.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sha1.c,v 1.16 2005/04/29 00:23:30 marka Exp $ */
+/* $Id: sha1.c,v 1.17 2007/06/18 23:47:44 tbox Exp $ */
 
 /*     $NetBSD: sha1.c,v 1.5 2000/01/22 22:19:14 mycroft Exp $ */
 /*     $OpenBSD: sha1.c,v 1.9 1997/07/23 21:12:32 kstailey Exp $       */

diff --git a/lib/isc/sha2.c b/lib/isc/sha2.c
index f2cf9ce3e97aed2cc7076ab992f2639c4955a29c..f10bac5016dddff00d62c404e6d851953ae984ed 100644 (file)
--- a/lib/isc/sha2.c
+++ b/lib/isc/sha2.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2005, 2006  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sha2.c,v 1.11 2006/12/22 01:45:00 marka Exp $ */
+/* $Id: sha2.c,v 1.12 2007/06/18 23:47:44 tbox Exp $ */
 
 /*     $FreeBSD: src/sys/crypto/sha2/sha2.c,v 1.2.2.2 2002/03/05 08:36:47 ume Exp $    */
 /*     $KAME: sha2.c,v 1.8 2001/11/08 01:07:52 itojun Exp $    */

diff --git a/lib/isc/sockaddr.c b/lib/isc/sockaddr.c
index 5cc10f0a8193d566974132b29fe1e1cddbcea245..59bd45239aa7dcba28866d1b9dce67ad6a8c597c 100644 (file)
--- a/lib/isc/sockaddr.c
+++ b/lib/isc/sockaddr.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sockaddr.c,v 1.68 2006/06/21 01:21:59 marka Exp $ */
+/* $Id: sockaddr.c,v 1.69 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/sparc64/include/isc/atomic.h b/lib/isc/sparc64/include/isc/atomic.h
index cd4fa18d8fc1fe4bc7f90a484316626aae283882..de8d68181922e64c1473a6a1d3154bcc4429336c 100644 (file)
--- a/lib/isc/sparc64/include/isc/atomic.h
+++ b/lib/isc/sparc64/include/isc/atomic.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2005  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: atomic.h,v 1.3 2005/06/16 21:58:00 jinmei Exp $ */
+/* $Id: atomic.h,v 1.4 2007/06/18 23:47:48 tbox Exp $ */
 
 /*
  * This code was written based on FreeBSD's kernel source whose copyright

diff --git a/lib/isc/string.c b/lib/isc/string.c
index 761a20d9b9ca1ecd6e6c58fbb89ccce7f3859244..2c5682cf3b55cb9b2799ce5ab207028465da6986 100644 (file)
--- a/lib/isc/string.c
+++ b/lib/isc/string.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: string.c,v 1.18 2006/10/03 23:50:52 marka Exp $ */
+/* $Id: string.c,v 1.19 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/strtoul.c b/lib/isc/strtoul.c
index a3647fedcadf92a0f33f2283e1357c439ae189e2..f6fd73d30a7359f3394a6653ab414d3ea83b5c62 100644 (file)
--- a/lib/isc/strtoul.c
+++ b/lib/isc/strtoul.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2003  Internet Software Consortium.
  *
- * 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.
  *
@@ -53,7 +53,7 @@
 static char sccsid[] = "@(#)strtoul.c  8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 
-/* $Id: strtoul.c,v 1.5 2005/04/29 00:23:31 marka Exp $ */
+/* $Id: strtoul.c,v 1.6 2007/06/18 23:47:44 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/lib/isc/symtab.c b/lib/isc/symtab.c
index f2cb2376b4b1e37f3f908ea3a40db5797004d854..2eafba3cd5be2d898ac1adefd9b7c774aab3945f 100644 (file)
--- a/lib/isc/symtab.c
+++ b/lib/isc/symtab.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1996-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: symtab.c,v 1.28 2005/04/29 00:23:32 marka Exp $ */
+/* $Id: symtab.c,v 1.29 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/task.c b/lib/isc/task.c
index 21b1702e80b4bdc77fe537b2ca584469c85c3692..e4b9b637ee27af01bd7c78c4a49031dd240a3782 100644 (file)
--- a/lib/isc/task.c
+++ b/lib/isc/task.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: task.c,v 1.104 2007/02/14 02:32:30 marka Exp $ */
+/* $Id: task.c,v 1.105 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! \file
  * \author Principal Author: Bob Halley

diff --git a/lib/isc/task_p.h b/lib/isc/task_p.h
index 22a1bf612e1b997dce203d6d3e958116095d838d..9285377abefda6660af5ab422c2de8044c019850 100644 (file)
--- a/lib/isc/task_p.h
+++ b/lib/isc/task_p.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: task_p.h,v 1.9 2005/04/29 00:23:32 marka Exp $ */
+/* $Id: task_p.h,v 1.10 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_TASK_P_H
 #define ISC_TASK_P_H

diff --git a/lib/isc/taskpool.c b/lib/isc/taskpool.c
index dff30e45ada538961d2e6f98ac2317b42a0e2944..d9c2fbe2f31a3dbf3b4ee2dee3265dadbeb88bd4 100644 (file)
--- a/lib/isc/taskpool.c
+++ b/lib/isc/taskpool.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: taskpool.c,v 1.17 2007/02/14 00:27:26 marka Exp $ */
+/* $Id: taskpool.c,v 1.18 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/timer.c b/lib/isc/timer.c
index c1bfd9a4e43189a78fa1a3dc80e27eecda289ec8..689976ab2b2e26170bf4b57bc11aa58e8a6675f1 100644 (file)
--- a/lib/isc/timer.c
+++ b/lib/isc/timer.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: timer.c,v 1.78 2005/11/30 03:33:49 marka Exp $ */
+/* $Id: timer.c,v 1.79 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/timer_p.h b/lib/isc/timer_p.h
index 66e24950b44b395f7da02c40832221ede72c61ed..a641372124d2845d8e9e4b31b29e0ece912143e6 100644 (file)
--- a/lib/isc/timer_p.h
+++ b/lib/isc/timer_p.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: timer_p.h,v 1.8 2005/04/29 00:23:33 marka Exp $ */
+/* $Id: timer_p.h,v 1.9 2007/06/18 23:47:44 tbox Exp $ */
 
 #ifndef ISC_TIMER_P_H
 #define ISC_TIMER_P_H

diff --git a/lib/isc/unix/Makefile.in b/lib/isc/unix/Makefile.in
index 7e303ea77a187d59d2a654387b7eaf807133ccc5..abc5eb7a0a042b0055536ca06289880032bb99c8 100644 (file)
--- a/lib/isc/unix/Makefile.in
+++ b/lib/isc/unix/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.39 2004/06/22 02:54:55 marka Exp $
+# $Id: Makefile.in,v 1.40 2007/06/18 23:47:48 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/isc/unix/app.c b/lib/isc/unix/app.c
index 77836506938ef658e414a30020713af3ffb7fd75..77e7c583620bf852912cd8947e1e66b186f02f14 100644 (file)
--- a/lib/isc/unix/app.c
+++ b/lib/isc/unix/app.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: app.c,v 1.52 2005/04/29 00:23:49 marka Exp $ */
+/* $Id: app.c,v 1.53 2007/06/18 23:47:48 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/unix/dir.c b/lib/isc/unix/dir.c
index 0ab2ce15815e479839036898421f6df944c0b916..b3d73396f40b68cf7c9e728a9090b85b58826f0f 100644 (file)
--- a/lib/isc/unix/dir.c
+++ b/lib/isc/unix/dir.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dir.c,v 1.23 2005/09/05 00:11:04 marka Exp $ */
+/* $Id: dir.c,v 1.24 2007/06/18 23:47:48 tbox Exp $ */
 
 /*! \file
  * \author  Principal Authors: DCL */

diff --git a/lib/isc/unix/entropy.c b/lib/isc/unix/entropy.c
index e1bb16a76bea712c58648861a01a1422efe1906d..845320c7f182bd9b8fdb8bd941b7fa373e946690 100644 (file)
--- a/lib/isc/unix/entropy.c
+++ b/lib/isc/unix/entropy.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: entropy.c,v 1.78 2006/12/07 04:46:27 marka Exp $ */
+/* $Id: entropy.c,v 1.79 2007/06/18 23:47:48 tbox Exp $ */
 
 /* \file unix/entropy.c
  * \brief

diff --git a/lib/isc/unix/errno2result.c b/lib/isc/unix/errno2result.c
index c6094aeccc1f44f35cdeb7c2dbff4a82e88baf2d..1d7436346b2ca130d567b9609310d19aab4b3878 100644 (file)
--- a/lib/isc/unix/errno2result.c
+++ b/lib/isc/unix/errno2result.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: errno2result.c,v 1.15 2005/04/29 00:23:50 marka Exp $ */
+/* $Id: errno2result.c,v 1.16 2007/06/18 23:47:48 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/unix/errno2result.h b/lib/isc/unix/errno2result.h
index c1bc7214af28da3efd0dec97c98eb736caeec618..41f4b79c9eed1e130fe6bbd9a06269a866796440 100644 (file)
--- a/lib/isc/unix/errno2result.h
+++ b/lib/isc/unix/errno2result.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: errno2result.h,v 1.10 2005/04/29 00:23:50 marka Exp $ */
+/* $Id: errno2result.h,v 1.11 2007/06/18 23:47:48 tbox Exp $ */
 
 #ifndef UNIX_ERRNO2RESULT_H
 #define UNIX_ERRNO2RESULT_H 1

diff --git a/lib/isc/unix/file.c b/lib/isc/unix/file.c
index 27e6d1b404ee7b48ddbe7e2c2c7ee5495d1de5ee..66b85413538711a059153c32fea257699f3bcd35 100644 (file)
--- a/lib/isc/unix/file.c
+++ b/lib/isc/unix/file.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
- * 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.
  *
@@ -48,7 +48,7 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: file.c,v 1.49 2005/04/29 00:23:50 marka Exp $ */
+/* $Id: file.c,v 1.50 2007/06/18 23:47:48 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/unix/fsaccess.c b/lib/isc/unix/fsaccess.c
index d8f1792dd625f4aeab42cde65f54ca17b70ef232..f430a0dbc4f46fc26d7ac32ee1e2347667f7f186 100644 (file)
--- a/lib/isc/unix/fsaccess.c
+++ b/lib/isc/unix/fsaccess.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: fsaccess.c,v 1.11 2006/08/25 05:25:52 marka Exp $ */
+/* $Id: fsaccess.c,v 1.12 2007/06/18 23:47:48 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/lib/isc/unix/ifiter_getifaddrs.c b/lib/isc/unix/ifiter_getifaddrs.c
index 28141f93db12d3b050e99a5155741972064f07f2..4eaba33979304fb5c4a0d1fb50f44c94dffa2c2f 100644 (file)
--- a/lib/isc/unix/ifiter_getifaddrs.c
+++ b/lib/isc/unix/ifiter_getifaddrs.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ifiter_getifaddrs.c,v 1.8 2007/03/12 23:46:48 tbox Exp $ */
+/* $Id: ifiter_getifaddrs.c,v 1.9 2007/06/18 23:47:48 tbox Exp $ */
 
 /*! \file
  * \brief

diff --git a/lib/isc/unix/ifiter_ioctl.c b/lib/isc/unix/ifiter_ioctl.c
index c8cc56b98685a0698ae66804a3722c11271789ce..7d7c540f9a762f87af8d6a35b0b7824aa8c7a5f4 100644 (file)
--- a/lib/isc/unix/ifiter_ioctl.c
+++ b/lib/isc/unix/ifiter_ioctl.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ifiter_ioctl.c,v 1.55 2006/02/03 23:51:39 marka Exp $ */
+/* $Id: ifiter_ioctl.c,v 1.56 2007/06/18 23:47:48 tbox Exp $ */
 
 /*! \file
  * \brief

diff --git a/lib/isc/unix/ifiter_sysctl.c b/lib/isc/unix/ifiter_sysctl.c
index 11bb036a91b851b33f65f3d331fb2e3db20f1ff0..d5410f7a49f98664ed3c2f47d31d18e9c61b934b 100644 (file)
--- a/lib/isc/unix/ifiter_sysctl.c
+++ b/lib/isc/unix/ifiter_sysctl.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ifiter_sysctl.c,v 1.23 2005/04/27 04:57:23 sra Exp $ */
+/* $Id: ifiter_sysctl.c,v 1.24 2007/06/18 23:47:48 tbox Exp $ */
 
 /*! \file
  * \brief

diff --git a/lib/isc/unix/include/Makefile.in b/lib/isc/unix/include/Makefile.in
index 78eba44d920af4dd4ca567b85026d8c850509047..f5596c15d4aaf8647b0126403940a771546b1873 100644 (file)
--- a/lib/isc/unix/include/Makefile.in
+++ b/lib/isc/unix/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.12 2004/03/05 05:11:50 marka Exp $
+# $Id: Makefile.in,v 1.13 2007/06/18 23:47:48 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/isc/unix/include/isc/Makefile.in b/lib/isc/unix/include/isc/Makefile.in
index 9599f7cfbd42a113ab44512a6754a41aadb45652..58798782f0845b7803f64b8f7a80d858488f44bd 100644 (file)
--- a/lib/isc/unix/include/isc/Makefile.in
+++ b/lib/isc/unix/include/isc/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.28 2004/03/05 05:11:52 marka Exp $
+# $Id: Makefile.in,v 1.29 2007/06/18 23:47:48 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/isc/unix/include/isc/dir.h b/lib/isc/unix/include/isc/dir.h
index ffe41a091a20137d550ef661faeb0a4afbd5dbde..bfc3f0ff5df1ddc7e98c4e65d99772dca2b5f845 100644 (file)
--- a/lib/isc/unix/include/isc/dir.h
+++ b/lib/isc/unix/include/isc/dir.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dir.h,v 1.19 2005/04/29 00:23:52 marka Exp $ */
+/* $Id: dir.h,v 1.20 2007/06/18 23:47:48 tbox Exp $ */
 
 /* Principal Authors: DCL */
 

diff --git a/lib/isc/unix/include/isc/int.h b/lib/isc/unix/include/isc/int.h
index 3d70ac995c44e90fcf7897af58a027deef5bd28e..74b81df555beac04c0bc4e85cc977768a349851e 100644 (file)
--- a/lib/isc/unix/include/isc/int.h
+++ b/lib/isc/unix/include/isc/int.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: int.h,v 1.14 2005/04/29 00:23:53 marka Exp $ */
+/* $Id: int.h,v 1.15 2007/06/18 23:47:48 tbox Exp $ */
 
 #ifndef ISC_INT_H
 #define ISC_INT_H 1

diff --git a/lib/isc/unix/include/isc/keyboard.h b/lib/isc/unix/include/isc/keyboard.h
index 4bfdddf1ccca6e8ac8998f26d65eb73eee9ed486..9fae6fe4a13480dbdeee841954604c90169c026e 100644 (file)
--- a/lib/isc/unix/include/isc/keyboard.h
+++ b/lib/isc/unix/include/isc/keyboard.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: keyboard.h,v 1.9 2005/04/29 00:23:53 marka Exp $ */
+/* $Id: keyboard.h,v 1.10 2007/06/18 23:47:48 tbox Exp $ */
 
 #ifndef ISC_KEYBOARD_H
 #define ISC_KEYBOARD_H 1

diff --git a/lib/isc/unix/include/isc/net.h b/lib/isc/unix/include/isc/net.h
index 54218ea44247c2c4c78c27b541339ecbfa40f3bc..b386f635c4296fd8b882e58f4a6247d761783c0b 100644 (file)
--- a/lib/isc/unix/include/isc/net.h
+++ b/lib/isc/unix/include/isc/net.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: net.h,v 1.44 2005/07/18 05:59:01 marka Exp $ */
+/* $Id: net.h,v 1.45 2007/06/18 23:47:49 tbox Exp $ */
 
 #ifndef ISC_NET_H
 #define ISC_NET_H 1

diff --git a/lib/isc/unix/include/isc/netdb.h b/lib/isc/unix/include/isc/netdb.h
index eaec23eb2a71f345f36a6e58ddd3101551699dc3..08979bced2903c3394aa58109ab30e964feabaa9 100644 (file)
--- a/lib/isc/unix/include/isc/netdb.h
+++ b/lib/isc/unix/include/isc/netdb.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: netdb.h,v 1.9 2005/04/29 00:23:53 marka Exp $ */
+/* $Id: netdb.h,v 1.10 2007/06/18 23:47:49 tbox Exp $ */
 
 #ifndef ISC_NETDB_H
 #define ISC_NETDB_H 1

diff --git a/lib/isc/unix/include/isc/offset.h b/lib/isc/unix/include/isc/offset.h
index 01c55d7e7a3237dd4c030844014af067062ef60c..3e89771112a8cb78816ef0887f1415c614637b83 100644 (file)
--- a/lib/isc/unix/include/isc/offset.h
+++ b/lib/isc/unix/include/isc/offset.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: offset.h,v 1.13 2005/04/29 00:23:53 marka Exp $ */
+/* $Id: offset.h,v 1.14 2007/06/18 23:47:49 tbox Exp $ */
 
 #ifndef ISC_OFFSET_H
 #define ISC_OFFSET_H 1

diff --git a/lib/isc/unix/include/isc/stat.h b/lib/isc/unix/include/isc/stat.h
index 1886f8d51ce79d896ac9268cf4d96bf5bcb490c2..824e4bcd683deac59c89ae0e72280d7cc27ca1ca 100644 (file)
--- a/lib/isc/unix/include/isc/stat.h
+++ b/lib/isc/unix/include/isc/stat.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2004  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: stat.h,v 1.3 2004/08/19 04:44:08 marka Exp $ */
+/* $Id: stat.h,v 1.4 2007/06/18 23:47:49 tbox Exp $ */
 
 #ifndef ISC_STAT_H
 #define ISC_STAT_H 1

diff --git a/lib/isc/unix/include/isc/stdtime.h b/lib/isc/unix/include/isc/stdtime.h
index be673e71e4ab045e92ced2731bed268fefc32e0a..4e7c58f239afdf2f85bc2e52225faed396f8096a 100644 (file)
--- a/lib/isc/unix/include/isc/stdtime.h
+++ b/lib/isc/unix/include/isc/stdtime.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: stdtime.h,v 1.12 2005/06/04 05:32:49 jinmei Exp $ */
+/* $Id: stdtime.h,v 1.13 2007/06/18 23:47:49 tbox Exp $ */
 
 #ifndef ISC_STDTIME_H
 #define ISC_STDTIME_H 1

diff --git a/lib/isc/unix/include/isc/strerror.h b/lib/isc/unix/include/isc/strerror.h
index 7810e20e75a1eaefc77ff45095cc741d079199e1..2fcc1daebce33708b43299566e18b58be3510686 100644 (file)
--- a/lib/isc/unix/include/isc/strerror.h
+++ b/lib/isc/unix/include/isc/strerror.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: strerror.h,v 1.6 2005/04/29 00:23:53 marka Exp $ */
+/* $Id: strerror.h,v 1.7 2007/06/18 23:47:49 tbox Exp $ */
 
 #ifndef ISC_STRERROR_H
 #define ISC_STRERROR_H

diff --git a/lib/isc/unix/include/isc/syslog.h b/lib/isc/unix/include/isc/syslog.h
index aa3d6207762c866df7d638e89ccf6adbf00350b2..74c8da2d3563e6c683763e50b33ac72aaa014662 100644 (file)
--- a/lib/isc/unix/include/isc/syslog.h
+++ b/lib/isc/unix/include/isc/syslog.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: syslog.h,v 1.5 2005/04/29 00:23:54 marka Exp $ */
+/* $Id: syslog.h,v 1.6 2007/06/18 23:47:49 tbox Exp $ */
 
 #ifndef ISC_SYSLOG_H
 #define ISC_SYSLOG_H 1

diff --git a/lib/isc/unix/include/isc/time.h b/lib/isc/unix/include/isc/time.h
index 3a6500414a8df8cea283ed208503f3965e7fd79e..fad63d97bb9c8e6abcc1bc0413b71bd39e51b071 100644 (file)
--- a/lib/isc/unix/include/isc/time.h
+++ b/lib/isc/unix/include/isc/time.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: time.h,v 1.34 2006/12/22 01:59:43 marka Exp $ */
+/* $Id: time.h,v 1.35 2007/06/18 23:47:49 tbox Exp $ */
 
 #ifndef ISC_TIME_H
 #define ISC_TIME_H 1

diff --git a/lib/isc/unix/interfaceiter.c b/lib/isc/unix/interfaceiter.c
index aed7591322d30a5f0888aa8c406947c33da018c4..0759f33092214717486cc46914952776e1058679 100644 (file)
--- a/lib/isc/unix/interfaceiter.c
+++ b/lib/isc/unix/interfaceiter.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: interfaceiter.c,v 1.40 2005/04/29 00:23:51 marka Exp $ */
+/* $Id: interfaceiter.c,v 1.41 2007/06/18 23:47:48 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/unix/ipv6.c b/lib/isc/unix/ipv6.c
index f848e138476d9c10d7d6da76a908691f39d39ba0..cba142602cd049184ee558bf1dd1846e1a12fd03 100644 (file)
--- a/lib/isc/unix/ipv6.c
+++ b/lib/isc/unix/ipv6.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ipv6.c,v 1.12 2006/08/25 05:25:52 marka Exp $ */
+/* $Id: ipv6.c,v 1.13 2007/06/18 23:47:48 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/unix/keyboard.c b/lib/isc/unix/keyboard.c
index db56b3c5524fab6c69b76a36923f5f23db01dd82..b1190e0f0148ef8f1511337965543a01ff3c4e04 100644 (file)
--- a/lib/isc/unix/keyboard.c
+++ b/lib/isc/unix/keyboard.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: keyboard.c,v 1.11 2004/03/05 05:11:46 marka Exp $ */
+/* $Id: keyboard.c,v 1.12 2007/06/18 23:47:48 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/lib/isc/unix/net.c b/lib/isc/unix/net.c
index b6c0cf74baee5ee5e2764cb0f0083d70e9b100b4..2df081895b96e791e224a5e07f6260221e7a3ae1 100644 (file)
--- a/lib/isc/unix/net.c
+++ b/lib/isc/unix/net.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: net.c,v 1.33 2005/03/16 01:23:08 marka Exp $ */
+/* $Id: net.c,v 1.34 2007/06/18 23:47:48 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/lib/isc/unix/os.c b/lib/isc/unix/os.c
index 1a0ef596a2e6699ace1d682bc3472eb599c8b1e5..76e7e4794d0d1b46801aea9ef0f51975ed7f7c83 100644 (file)
--- a/lib/isc/unix/os.c
+++ b/lib/isc/unix/os.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: os.c,v 1.16 2005/10/14 02:14:29 marka Exp $ */
+/* $Id: os.c,v 1.17 2007/06/18 23:47:48 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/lib/isc/unix/resource.c b/lib/isc/unix/resource.c
index 703ec27ae0762aba8ab881fd3ffbcf87d31c5bf8..e384a6597c1ef1bad37fef05a1407e882a84a04e 100644 (file)
--- a/lib/isc/unix/resource.c
+++ b/lib/isc/unix/resource.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resource.c,v 1.12 2004/03/05 05:11:46 marka Exp $ */
+/* $Id: resource.c,v 1.13 2007/06/18 23:47:48 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index 65955da2fb585178ad190a1b9fe36671aaf4e264..ff33076f52d6193e842b9ed415b8c7f49fd94fce 100644 (file)
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.c,v 1.272 2007/05/21 01:55:10 marka Exp $ */
+/* $Id: socket.c,v 1.273 2007/06/18 23:47:48 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/unix/socket_p.h b/lib/isc/unix/socket_p.h
index 3e094ce2029098248545579ac78e612c7e0724e5..d3cdb34a75fff59d620d6593b1f22f421978118f 100644 (file)
--- a/lib/isc/unix/socket_p.h
+++ b/lib/isc/unix/socket_p.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket_p.h,v 1.9 2005/04/29 00:23:51 marka Exp $ */
+/* $Id: socket_p.h,v 1.10 2007/06/18 23:47:48 tbox Exp $ */
 
 #ifndef ISC_SOCKET_P_H
 #define ISC_SOCKET_P_H

diff --git a/lib/isc/unix/stdio.c b/lib/isc/unix/stdio.c
index 64db925f22637ce0a16837d73dad9f2d4755c507..58dde4bf2d7eef1f688a2e678a0213fea6f7b625 100644 (file)
--- a/lib/isc/unix/stdio.c
+++ b/lib/isc/unix/stdio.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: stdio.c,v 1.6 2004/03/05 05:11:47 marka Exp $ */
+/* $Id: stdio.c,v 1.7 2007/06/18 23:47:48 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/lib/isc/unix/stdtime.c b/lib/isc/unix/stdtime.c
index f5f30e20759c94372702a3a1b20bfaee399c2b3a..6267801058d11aca3f608c00282ad2348f267208 100644 (file)
--- a/lib/isc/unix/stdtime.c
+++ b/lib/isc/unix/stdtime.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: stdtime.c,v 1.17 2005/06/08 02:07:01 marka Exp $ */
+/* $Id: stdtime.c,v 1.18 2007/06/18 23:47:48 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/unix/strerror.c b/lib/isc/unix/strerror.c
index bc655fb69a8f5b38e271fa2a5ba2e851edffb505..112bacdbd030aee09fb31c8445bbc1ba099c66cd 100644 (file)
--- a/lib/isc/unix/strerror.c
+++ b/lib/isc/unix/strerror.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: strerror.c,v 1.6 2005/04/29 00:23:52 marka Exp $ */
+/* $Id: strerror.c,v 1.7 2007/06/18 23:47:48 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/unix/syslog.c b/lib/isc/unix/syslog.c
index 1d1a418b55a75775d717f407dcf9a0d8ffcb738f..ed6917daad1b6a645447115b5fd506ba5146075d 100644 (file)
--- a/lib/isc/unix/syslog.c
+++ b/lib/isc/unix/syslog.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: syslog.c,v 1.5 2005/04/29 00:23:52 marka Exp $ */
+/* $Id: syslog.c,v 1.6 2007/06/18 23:47:48 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/unix/time.c b/lib/isc/unix/time.c
index dbc788c9be65aa6fb25816197f8c1b6926718147..70fd2e18677fdc5e2c86cfa14c7e959f415db52a 100644 (file)
--- a/lib/isc/unix/time.c
+++ b/lib/isc/unix/time.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: time.c,v 1.53 2007/02/14 00:27:27 marka Exp $ */
+/* $Id: time.c,v 1.54 2007/06/18 23:47:48 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/version.c b/lib/isc/version.c
index 52fe55f774cf1635bd69fa7139558029db4ece01..f092b4407271d01b88c93781ffe97077b8e34f9e 100644 (file)
--- a/lib/isc/version.c
+++ b/lib/isc/version.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: version.c,v 1.13 2005/04/29 00:23:33 marka Exp $ */
+/* $Id: version.c,v 1.14 2007/06/18 23:47:44 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/win32/DLLMain.c b/lib/isc/win32/DLLMain.c
index d01282e06ebebe8a52a94d83630385fcde509a6e..ed84fcf6c35c852073cc2bba2852c0d7ced09b29 100644 (file)
--- a/lib/isc/win32/DLLMain.c
+++ b/lib/isc/win32/DLLMain.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: DLLMain.c,v 1.6 2007/06/18 03:36:50 marka Exp $ */
+/* $Id: DLLMain.c,v 1.7 2007/06/18 23:47:49 tbox Exp $ */
 
 #include <windows.h>
 #include <stdio.h>

diff --git a/lib/isc/win32/Makefile.in b/lib/isc/win32/Makefile.in
index 7f343b97b3b0ffd7f937ce1fc9fcb0ca55727319..0e2f4d2e4c6ef5a2000435a486fe7013ff041107 100644 (file)
--- a/lib/isc/win32/Makefile.in
+++ b/lib/isc/win32/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1999-2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.9 2004/03/05 05:11:56 marka Exp $
+# $Id: Makefile.in,v 1.10 2007/06/18 23:47:49 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/isc/win32/app.c b/lib/isc/win32/app.c
index 5b246b6a20d432c5095283590eda7e88efacf461..9e52230e01caeb1c2622f0642475dbcb480872b9 100644 (file)
--- a/lib/isc/win32/app.c
+++ b/lib/isc/win32/app.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: app.c,v 1.5 2004/03/05 05:11:56 marka Exp $ */
+/* $Id: app.c,v 1.6 2007/06/18 23:47:49 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/lib/isc/win32/condition.c b/lib/isc/win32/condition.c
index 988c1ce7f6f6f18441debd66e64efc91cca7c7fe..27d4e7607037fef7629d836031400e1ffe7b0fb0 100644 (file)
--- a/lib/isc/win32/condition.c
+++ b/lib/isc/win32/condition.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2006, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: condition.c,v 1.22 2007/05/10 23:46:54 tbox Exp $ */
+/* $Id: condition.c,v 1.23 2007/06/18 23:47:49 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/lib/isc/win32/dir.c b/lib/isc/win32/dir.c
index 1a2748afdb83f552202f4c337fdeac5b8336059f..200d554b94a0cac7309a2c86b821027f39157b92 100644 (file)
--- a/lib/isc/win32/dir.c
+++ b/lib/isc/win32/dir.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dir.c,v 1.12 2004/03/05 05:11:56 marka Exp $ */
+/* $Id: dir.c,v 1.13 2007/06/18 23:47:49 tbox Exp $ */
 
 /* Principal Authors: DCL */
 

diff --git a/lib/isc/win32/entropy.c b/lib/isc/win32/entropy.c
index 4a7ebe5891622651e1a1c16366ea23ca38eb779d..bc371f01204502fdf5beff2a33aa4d44e3206d6b 100644 (file)
--- a/lib/isc/win32/entropy.c
+++ b/lib/isc/win32/entropy.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: entropy.c,v 1.6 2004/03/05 05:11:56 marka Exp $ */
+/* $Id: entropy.c,v 1.7 2007/06/18 23:47:49 tbox Exp $ */
 
 /*
  * This is the system depenedent part of the ISC entropy API.

diff --git a/lib/isc/win32/errno2result.c b/lib/isc/win32/errno2result.c
index 4bc4aa3dc4cb0d271827bcb026c028c753337197..df10506ad11cb5557224be0d3c93d6e8c489b00d 100644 (file)
--- a/lib/isc/win32/errno2result.c
+++ b/lib/isc/win32/errno2result.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: errno2result.c,v 1.12 2005/09/01 02:25:02 marka Exp $ */
+/* $Id: errno2result.c,v 1.13 2007/06/18 23:47:49 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/lib/isc/win32/errno2result.h b/lib/isc/win32/errno2result.h
index b28b9e7ccaf8bbe77fc0c88e89af022f57ac1efd..93b10a33372044d5cf685097316420cf6536aaf6 100644 (file)
--- a/lib/isc/win32/errno2result.h
+++ b/lib/isc/win32/errno2result.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: errno2result.h,v 1.8 2005/06/10 00:00:58 marka Exp $ */
+/* $Id: errno2result.h,v 1.9 2007/06/18 23:47:49 tbox Exp $ */
 
 #ifndef UNIX_ERRNO2RESULT_H
 #define UNIX_ERRNO2RESULT_H 1

diff --git a/lib/isc/win32/file.c b/lib/isc/win32/file.c
index 1e6b65ed3ffea87071f4ccd2f6ba5c5529d6fc1b..53adf2c04db0ed2904c961252ad011b004c63a2a 100644 (file)
--- a/lib/isc/win32/file.c
+++ b/lib/isc/win32/file.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: file.c,v 1.29 2004/03/05 05:11:57 marka Exp $ */
+/* $Id: file.c,v 1.30 2007/06/18 23:47:49 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/lib/isc/win32/fsaccess.c b/lib/isc/win32/fsaccess.c
index d64ba1f96e4a584d50b1c9e5a0c7a39950aea3a3..17fda53669bed07da6cb13da15eb30c3da340b14 100644 (file)
--- a/lib/isc/win32/fsaccess.c
+++ b/lib/isc/win32/fsaccess.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: fsaccess.c,v 1.13 2004/03/05 05:11:57 marka Exp $ */
+/* $Id: fsaccess.c,v 1.14 2007/06/18 23:47:49 tbox Exp $ */
 
 /*
  * Note that Win32 does not have the concept of files having access

diff --git a/lib/isc/win32/include/Makefile.in b/lib/isc/win32/include/Makefile.in
index 367b2a7910abc3fa22d4c18f590b8eaa260820a6..8adb8bc45058059d3c43667293f6f75330e2ff0c 100644 (file)
--- a/lib/isc/win32/include/Makefile.in
+++ b/lib/isc/win32/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1999-2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.7 2004/03/05 05:12:02 marka Exp $
+# $Id: Makefile.in,v 1.8 2007/06/18 23:47:49 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/isc/win32/include/isc/Makefile.in b/lib/isc/win32/include/isc/Makefile.in
index eada5e9543fba1b20af2475da3bf448d78714879..8532d6764bc0a0a3a58a0d9795018a6ca797592c 100644 (file)
--- a/lib/isc/win32/include/isc/Makefile.in
+++ b/lib/isc/win32/include/isc/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1999-2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.9 2004/03/05 05:12:04 marka Exp $
+# $Id: Makefile.in,v 1.10 2007/06/18 23:47:49 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/isc/win32/include/isc/bind_registry.h b/lib/isc/win32/include/isc/bind_registry.h
index d3e40aca19259d3243fea2cd37ad4559830b4b9c..5c30d3c6891919be0295300a30875dcfde0180d7 100644 (file)
--- a/lib/isc/win32/include/isc/bind_registry.h
+++ b/lib/isc/win32/include/isc/bind_registry.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: bind_registry.h,v 1.6 2004/03/05 05:12:04 marka Exp $ */
+/* $Id: bind_registry.h,v 1.7 2007/06/18 23:47:49 tbox Exp $ */
 
 #ifndef ISC_BINDREGISTRY_H
 #define ISC_BINDREGISTRY_H

diff --git a/lib/isc/win32/include/isc/bindevt.h b/lib/isc/win32/include/isc/bindevt.h
index eddbcc876bef2577290fb3ce991dbffea9105289..1b334a5c7e18efce47fc9e94f6d431ed3ea5d77d 100644 (file)
--- a/lib/isc/win32/include/isc/bindevt.h
+++ b/lib/isc/win32/include/isc/bindevt.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: bindevt.h,v 1.4 2004/03/05 05:12:05 marka Exp $ */
+/* $Id: bindevt.h,v 1.5 2007/06/18 23:47:49 tbox Exp $ */
 
 #ifndef ISC_BINDEVT_H
 #define ISC_BINDEVT_H 1

diff --git a/lib/isc/win32/include/isc/condition.h b/lib/isc/win32/include/isc/condition.h
index 2ad1d7caa53f52361424892dc89b2c79c118e7cf..34015bc265623ddd205b455db6919b240ef8fe50 100644 (file)
--- a/lib/isc/win32/include/isc/condition.h
+++ b/lib/isc/win32/include/isc/condition.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: condition.h,v 1.16 2007/05/10 23:46:54 tbox Exp $ */
+/* $Id: condition.h,v 1.17 2007/06/18 23:47:49 tbox Exp $ */
 
 #ifndef ISC_CONDITION_H
 #define ISC_CONDITION_H 1

diff --git a/lib/isc/win32/include/isc/dir.h b/lib/isc/win32/include/isc/dir.h
index 357151c65f5e75da0b39d92e233854cf198bfa8e..c11787c9555eed545fbe9024b2766c2fe021da06 100644 (file)
--- a/lib/isc/win32/include/isc/dir.h
+++ b/lib/isc/win32/include/isc/dir.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dir.h,v 1.13 2004/03/05 05:12:05 marka Exp $ */
+/* $Id: dir.h,v 1.14 2007/06/18 23:47:49 tbox Exp $ */
 
 /* Principal Authors: DCL */
 

diff --git a/lib/isc/win32/include/isc/int.h b/lib/isc/win32/include/isc/int.h
index c1a97fd33fdad4d4925ba1dfde601db57b7ed1d3..d8629addaa34347d3cc798f88ecbc66e17d6b37f 100644 (file)
--- a/lib/isc/win32/include/isc/int.h
+++ b/lib/isc/win32/include/isc/int.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: int.h,v 1.11 2004/03/05 05:12:05 marka Exp $ */
+/* $Id: int.h,v 1.12 2007/06/18 23:47:49 tbox Exp $ */
 
 #ifndef ISC_INT_H
 #define ISC_INT_H 1

diff --git a/lib/isc/win32/include/isc/ipv6.h b/lib/isc/win32/include/isc/ipv6.h
index 2e14243ca152454e2ac73cb6eb35fced10bc4d3f..c9add0b37944c44be3c3bf584d1f306fadcea0aa 100644 (file)
--- a/lib/isc/win32/include/isc/ipv6.h
+++ b/lib/isc/win32/include/isc/ipv6.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ipv6.h,v 1.18 2007/01/09 23:49:38 marka Exp $ */
+/* $Id: ipv6.h,v 1.19 2007/06/18 23:47:49 tbox Exp $ */
 
 #ifndef ISC_IPV6_H
 #define ISC_IPV6_H 1

diff --git a/lib/isc/win32/include/isc/keyboard.h b/lib/isc/win32/include/isc/keyboard.h
index 7ea2a6564f69d090858878043b1a040dde74b552..1ae3838b2358bd2b3cfff5a4f69d2ba8689240d3 100644 (file)
--- a/lib/isc/win32/include/isc/keyboard.h
+++ b/lib/isc/win32/include/isc/keyboard.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: keyboard.h,v 1.4 2004/03/05 05:12:05 marka Exp $ */
+/* $Id: keyboard.h,v 1.5 2007/06/18 23:47:49 tbox Exp $ */
 
 #ifndef ISC_KEYBOARD_H
 #define ISC_KEYBOARD_H 1

diff --git a/lib/isc/win32/include/isc/mutex.h b/lib/isc/win32/include/isc/mutex.h
index bae0ed38e7b2d9b8cb4f33c3b37a67949843f868..a60baeb38f12b417a932a6ffa6f7f697d6a66331 100644 (file)
--- a/lib/isc/win32/include/isc/mutex.h
+++ b/lib/isc/win32/include/isc/mutex.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mutex.h,v 1.17 2004/03/05 05:12:05 marka Exp $ */
+/* $Id: mutex.h,v 1.18 2007/06/18 23:47:49 tbox Exp $ */
 
 #ifndef ISC_MUTEX_H
 #define ISC_MUTEX_H 1

diff --git a/lib/isc/win32/include/isc/net.h b/lib/isc/win32/include/isc/net.h
index 7b7c7c876c63d845ff0e93faf5fe143a0264f574..9b681971b531dda20cec5d4379d597e8a8b11ec6 100644 (file)
--- a/lib/isc/win32/include/isc/net.h
+++ b/lib/isc/win32/include/isc/net.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: net.h,v 1.26 2005/04/27 04:57:25 sra Exp $ */
+/* $Id: net.h,v 1.27 2007/06/18 23:47:49 tbox Exp $ */
 
 #ifndef ISC_NET_H
 #define ISC_NET_H 1

diff --git a/lib/isc/win32/include/isc/netdb.h b/lib/isc/win32/include/isc/netdb.h
index cdfad3f8152fe29df77645bbc37a181d0770cc3d..aefefe51b120ae1f8cdfdb43fecc8a6527c08def 100644 (file)
--- a/lib/isc/win32/include/isc/netdb.h
+++ b/lib/isc/win32/include/isc/netdb.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: netdb.h,v 1.7 2004/03/05 05:12:05 marka Exp $ */
+/* $Id: netdb.h,v 1.8 2007/06/18 23:47:49 tbox Exp $ */
 
 #ifndef ISC_NETDB_H
 #define ISC_NETDB_H 1

diff --git a/lib/isc/win32/include/isc/ntgroups.h b/lib/isc/win32/include/isc/ntgroups.h
index a39fa6026c002b60719634c899fcda5e39eefbba..fecfd15c7314e81d9835c3dfc4f80507265e365b 100644 (file)
--- a/lib/isc/win32/include/isc/ntgroups.h
+++ b/lib/isc/win32/include/isc/ntgroups.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ntgroups.h,v 1.3 2004/03/05 05:12:05 marka Exp $ */
+/* $Id: ntgroups.h,v 1.4 2007/06/18 23:47:49 tbox Exp $ */
 
 #ifndef ISC_NTGROUPS_H
 #define ISC_NTGROUPS_H 1

diff --git a/lib/isc/win32/include/isc/ntpaths.h b/lib/isc/win32/include/isc/ntpaths.h
index 61f88212b6643a4f8326c64657caa686e2aba0ff..407a23fee18c31ff4658b2a265c9fa1718b811fb 100644 (file)
--- a/lib/isc/win32/include/isc/ntpaths.h
+++ b/lib/isc/win32/include/isc/ntpaths.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ntpaths.h,v 1.14 2004/03/05 05:12:05 marka Exp $ */
+/* $Id: ntpaths.h,v 1.15 2007/06/18 23:47:49 tbox Exp $ */
 
 /*
  * Windows-specific path definitions

diff --git a/lib/isc/win32/include/isc/offset.h b/lib/isc/win32/include/isc/offset.h
index 1c2d0bf09f57641a19e9b7b6deb986e38be3cc8d..6c85829112a4f568353b05515187b388c58dfb3b 100644 (file)
--- a/lib/isc/win32/include/isc/offset.h
+++ b/lib/isc/win32/include/isc/offset.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: offset.h,v 1.4 2004/03/16 05:52:23 marka Exp $ */
+/* $Id: offset.h,v 1.5 2007/06/18 23:47:49 tbox Exp $ */
 
 #ifndef ISC_OFFSET_H
 #define ISC_OFFSET_H 1

diff --git a/lib/isc/win32/include/isc/once.h b/lib/isc/win32/include/isc/once.h
index 4240d44323a4f3071abe8e429c9e62d1446c865a..73a872f33cbd5802f203f8dbb5aca95ba31982fd 100644 (file)
--- a/lib/isc/win32/include/isc/once.h
+++ b/lib/isc/win32/include/isc/once.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: once.h,v 1.7 2004/03/05 05:12:05 marka Exp $ */
+/* $Id: once.h,v 1.8 2007/06/18 23:47:49 tbox Exp $ */
 
 #ifndef ISC_ONCE_H
 #define ISC_ONCE_H 1

diff --git a/lib/isc/win32/include/isc/platform.h b/lib/isc/win32/include/isc/platform.h
index bb58ae44c600ad679e584cfead83963f8055f551..07b1bd4d7d668eff5d182a9f2530cf8ff495317f 100644 (file)
--- a/lib/isc/win32/include/isc/platform.h
+++ b/lib/isc/win32/include/isc/platform.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: platform.h,v 1.12 2005/02/24 00:33:35 marka Exp $ */
+/* $Id: platform.h,v 1.13 2007/06/18 23:47:49 tbox Exp $ */
 
 #ifndef ISC_PLATFORM_H
 #define ISC_PLATFORM_H 1

diff --git a/lib/isc/win32/include/isc/stat.h b/lib/isc/win32/include/isc/stat.h
index 1834bec4a23729f5c2151ca544bb95ff2c8d9dc7..a726e8ba10f7c1e04e7c97eeeed107679098f45c 100644 (file)
--- a/lib/isc/win32/include/isc/stat.h
+++ b/lib/isc/win32/include/isc/stat.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: stat.h,v 1.5 2004/03/05 05:12:05 marka Exp $ */
+/* $Id: stat.h,v 1.6 2007/06/18 23:47:49 tbox Exp $ */
 
 #ifndef ISC_STAT_H
 #define ISC_STAT_H 1

diff --git a/lib/isc/win32/include/isc/stdtime.h b/lib/isc/win32/include/isc/stdtime.h
index f5c62b25c8a4ace3f069bf4a1d03d085911ada60..7c6486482bbfac64380e36c6b955ab43b86e93f7 100644 (file)
--- a/lib/isc/win32/include/isc/stdtime.h
+++ b/lib/isc/win32/include/isc/stdtime.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: stdtime.h,v 1.10 2005/06/05 00:01:55 marka Exp $ */
+/* $Id: stdtime.h,v 1.11 2007/06/18 23:47:49 tbox Exp $ */
 
 #ifndef ISC_STDTIME_H
 #define ISC_STDTIME_H 1

diff --git a/lib/isc/win32/include/isc/strerror.h b/lib/isc/win32/include/isc/strerror.h
index 38d9ef7cf8bd1c8cec8de0ce7372f0acb4465459..f8b23577834142eb164d9374b56038789b8cd449 100644 (file)
--- a/lib/isc/win32/include/isc/strerror.h
+++ b/lib/isc/win32/include/isc/strerror.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: strerror.h,v 1.3 2004/03/05 05:12:06 marka Exp $ */
+/* $Id: strerror.h,v 1.4 2007/06/18 23:47:49 tbox Exp $ */
 
 #ifndef ISC_STRERROR_H
 #define ISC_STRERROR_H

diff --git a/lib/isc/win32/include/isc/syslog.h b/lib/isc/win32/include/isc/syslog.h
index c57e21778aa1508bcfa2b79f5c3a3ac772b1fad4..6a3bec6811413d52adb89d4697249ce9c754d1a0 100644 (file)
--- a/lib/isc/win32/include/isc/syslog.h
+++ b/lib/isc/win32/include/isc/syslog.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: syslog.h,v 1.3 2004/03/05 05:12:06 marka Exp $ */
+/* $Id: syslog.h,v 1.4 2007/06/18 23:47:49 tbox Exp $ */
 
 #ifndef ISC_SYSLOG_H
 #define ISC_SYSLOG_H 1

diff --git a/lib/isc/win32/include/isc/thread.h b/lib/isc/win32/include/isc/thread.h
index 6aac851574682e69af2548bfe70d1f3b6bbcce7a..8cee1d784f291a1667a8eaa0c4c56af9113f2003 100644 (file)
--- a/lib/isc/win32/include/isc/thread.h
+++ b/lib/isc/win32/include/isc/thread.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: thread.h,v 1.20 2005/10/11 22:54:45 marka Exp $ */
+/* $Id: thread.h,v 1.21 2007/06/18 23:47:49 tbox Exp $ */
 
 #ifndef ISC_THREAD_H
 #define ISC_THREAD_H 1

diff --git a/lib/isc/win32/include/isc/time.h b/lib/isc/win32/include/isc/time.h
index 54c2896d6befb03630505b8c79ba0ee7135f14a0..c3b094b7e1ca5c9a9dee7bc1dc99ef9abed55c53 100644 (file)
--- a/lib/isc/win32/include/isc/time.h
+++ b/lib/isc/win32/include/isc/time.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: time.h,v 1.29 2006/12/22 01:59:44 marka Exp $ */
+/* $Id: time.h,v 1.30 2007/06/18 23:47:49 tbox Exp $ */
 
 #ifndef ISC_TIME_H
 #define ISC_TIME_H 1

diff --git a/lib/isc/win32/include/isc/win32os.h b/lib/isc/win32/include/isc/win32os.h
index 286c34c0f13414fa4995b3719bb8c127c030ace3..9f12a8de4901e1866f7a1edd2d9fa25d10d630d9 100644 (file)
--- a/lib/isc/win32/include/isc/win32os.h
+++ b/lib/isc/win32/include/isc/win32os.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: win32os.h,v 1.3 2004/03/05 05:12:06 marka Exp $ */
+/* $Id: win32os.h,v 1.4 2007/06/18 23:47:49 tbox Exp $ */
 
 #ifndef ISC_WIN32OS_H
 #define ISC_WIN32OS_H 1

diff --git a/lib/isc/win32/interfaceiter.c b/lib/isc/win32/interfaceiter.c
index 16f7a5c6e22befea1e24e4277c4ce5af62e21e0f..d2505bebbffccfd12697cdef41a1c72a6bc8a212 100644 (file)
--- a/lib/isc/win32/interfaceiter.c
+++ b/lib/isc/win32/interfaceiter.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: interfaceiter.c,v 1.9 2007/06/18 03:36:50 marka Exp $ */
+/* $Id: interfaceiter.c,v 1.10 2007/06/18 23:47:49 tbox Exp $ */
 
 /*
  * Note that this code will need to be revisited to support IPv6 Interfaces.

diff --git a/lib/isc/win32/ipv6.c b/lib/isc/win32/ipv6.c
index 13ff4bf532388ac26e1a60c54069eb41ac769dba..a67c44fec5ed3aebd1ca17602a3bea2a168a56c6 100644 (file)
--- a/lib/isc/win32/ipv6.c
+++ b/lib/isc/win32/ipv6.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ipv6.c,v 1.6 2004/03/16 05:52:22 marka Exp $ */
+/* $Id: ipv6.c,v 1.7 2007/06/18 23:47:49 tbox Exp $ */
 
 #include <isc/net.h>
 #include <isc/platform.h>

diff --git a/lib/isc/win32/keyboard.c b/lib/isc/win32/keyboard.c
index fb0ffae36680bcd9fc4e899b11b518e2c2865f42..64f8af53dc59f91963296eef27d77a0125c8bd17 100644 (file)
--- a/lib/isc/win32/keyboard.c
+++ b/lib/isc/win32/keyboard.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: keyboard.c,v 1.5 2004/03/05 05:11:57 marka Exp $ */
+/* $Id: keyboard.c,v 1.6 2007/06/18 23:47:49 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/lib/isc/win32/net.c b/lib/isc/win32/net.c
index 736650bcc2a6a32410574eb7e422b87aee09253e..df561a07ce449ce78d0e3f8ffe4fd11d28558cd1 100644 (file)
--- a/lib/isc/win32/net.c
+++ b/lib/isc/win32/net.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: net.c,v 1.13 2007/06/18 03:36:50 marka Exp $ */
+/* $Id: net.c,v 1.14 2007/06/18 23:47:49 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/lib/isc/win32/netdb.h b/lib/isc/win32/netdb.h
index d69b5e035c16e63152d929ebe7c35802ff555551..15f050b33ffdaa69445d5575c3291dde10ba95b8 100644 (file)
--- a/lib/isc/win32/netdb.h
+++ b/lib/isc/win32/netdb.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: netdb.h,v 1.5 2006/12/22 01:59:44 marka Exp $ */
+/* $Id: netdb.h,v 1.6 2007/06/18 23:47:49 tbox Exp $ */
 
 #ifndef NETDB_H
 #define NETDB_H 1

diff --git a/lib/isc/win32/ntgroups.c b/lib/isc/win32/ntgroups.c
index af5136c9326b101aa5262007d681b24dcb33a225..5101a9f77d5eb4bc3fa2737e0446e5821ebe5e10 100644 (file)
--- a/lib/isc/win32/ntgroups.c
+++ b/lib/isc/win32/ntgroups.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ntgroups.c,v 1.8 2006/10/03 23:50:52 marka Exp $ */
+/* $Id: ntgroups.c,v 1.9 2007/06/18 23:47:49 tbox Exp $ */
 
 /*
  * The NT Groups have two groups that are not well documented and are

diff --git a/lib/isc/win32/ntpaths.c b/lib/isc/win32/ntpaths.c
index b72c0d5116e8078153024347998d5428281a366b..d1c622fa957416ef0aa9842ec35670a6645d7a98 100644 (file)
--- a/lib/isc/win32/ntpaths.c
+++ b/lib/isc/win32/ntpaths.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ntpaths.c,v 1.10 2007/06/18 03:05:46 marka Exp $ */
+/* $Id: ntpaths.c,v 1.11 2007/06/18 23:47:49 tbox Exp $ */
 
 /*
  * This module fetches the required path information that is specific

diff --git a/lib/isc/win32/once.c b/lib/isc/win32/once.c
index 76dd82dfe4f530dfa19bda3e040fa62ae9120045..b5047762ad77bae48a7d28983a924db61b81bd17 100644 (file)
--- a/lib/isc/win32/once.c
+++ b/lib/isc/win32/once.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: once.c,v 1.11 2007/06/18 01:16:46 marka Exp $ */
+/* $Id: once.c,v 1.12 2007/06/18 23:47:49 tbox Exp $ */
 
 /* Principal Authors: DCL */
 

diff --git a/lib/isc/win32/os.c b/lib/isc/win32/os.c
index af8e4396189169494670e00b8184c2b0f1c5279d..757f97b763f0ac627b55b825ed8766d864e03c54 100644 (file)
--- a/lib/isc/win32/os.c
+++ b/lib/isc/win32/os.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: os.c,v 1.6 2004/03/05 05:11:58 marka Exp $ */
+/* $Id: os.c,v 1.7 2007/06/18 23:47:49 tbox Exp $ */
 
 #include <windows.h>
 

diff --git a/lib/isc/win32/resource.c b/lib/isc/win32/resource.c
index c3d74ea96140e3a75d20d8144b57cd40459b3453..098b8596ea140616a2e5f6e84d0a92cfeb67fbf5 100644 (file)
--- a/lib/isc/win32/resource.c
+++ b/lib/isc/win32/resource.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resource.c,v 1.6 2004/03/05 05:11:58 marka Exp $ */
+/* $Id: resource.c,v 1.7 2007/06/18 23:47:49 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c
index db59807c2f0093d30470c880ef9188c7d613f88e..c21be864a212973604e14c50e2353169db09a57b 100644 (file)
--- a/lib/isc/win32/socket.c
+++ b/lib/isc/win32/socket.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.c,v 1.50 2007/06/18 03:36:50 marka Exp $ */
+/* $Id: socket.c,v 1.51 2007/06/18 23:47:49 tbox Exp $ */
 
 /* This code has been rewritten to take advantage of Windows Sockets
  * I/O Completion Ports and Events. I/O Completion Ports is ONLY

diff --git a/lib/isc/win32/stdio.c b/lib/isc/win32/stdio.c
index f1cf4ef79dd2328e4bd0950573798eec5e128abf..ae56c9092e3eece47c95a5d3d09b3c62dcbfd975 100644 (file)
--- a/lib/isc/win32/stdio.c
+++ b/lib/isc/win32/stdio.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: stdio.c,v 1.4 2004/03/05 05:11:59 marka Exp $ */
+/* $Id: stdio.c,v 1.5 2007/06/18 23:47:49 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/lib/isc/win32/stdtime.c b/lib/isc/win32/stdtime.c
index 8cf18535872b0409bcf442b5601774b164fb01a4..04bf451c5d952d7deda052f2ff50c4dc5b5301aa 100644 (file)
--- a/lib/isc/win32/stdtime.c
+++ b/lib/isc/win32/stdtime.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: stdtime.c,v 1.10 2004/03/05 05:11:59 marka Exp $ */
+/* $Id: stdtime.c,v 1.11 2007/06/18 23:47:49 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/lib/isc/win32/strerror.c b/lib/isc/win32/strerror.c
index 90f063db541d960f5566a16010243d76cba55b27..f5755978fa7ebffacbf470129d96e0dbcfe37ad4 100644 (file)
--- a/lib/isc/win32/strerror.c
+++ b/lib/isc/win32/strerror.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001, 2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: strerror.c,v 1.6 2004/03/05 05:11:59 marka Exp $ */
+/* $Id: strerror.c,v 1.7 2007/06/18 23:47:49 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/lib/isc/win32/syslog.c b/lib/isc/win32/syslog.c
index 377d9273e520839c42f094aa77157bd3c46c24df..ab10cfe0d5c9e20b49602208a3497bda2f34a471 100644 (file)
--- a/lib/isc/win32/syslog.c
+++ b/lib/isc/win32/syslog.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: syslog.c,v 1.8 2004/03/05 05:11:59 marka Exp $ */
+/* $Id: syslog.c,v 1.9 2007/06/18 23:47:49 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/lib/isc/win32/syslog.h b/lib/isc/win32/syslog.h
index e98e2dcb2251fd5d2fa4bae951b73b993b975694..54df98982c85cb7a4a9a22d03497ae35b7713e5d 100644 (file)
--- a/lib/isc/win32/syslog.h
+++ b/lib/isc/win32/syslog.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001, 2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: syslog.h,v 1.5 2004/03/05 05:11:59 marka Exp $ */
+/* $Id: syslog.h,v 1.6 2007/06/18 23:47:49 tbox Exp $ */
 
 #ifndef _SYSLOG_H
 #define _SYSLOG_H

diff --git a/lib/isc/win32/thread.c b/lib/isc/win32/thread.c
index 440edbadbb930ada2a028a79989fc92df037a3d0..dd75519af273b68cb01f3c5950a5bb0c35207c65 100644 (file)
--- a/lib/isc/win32/thread.c
+++ b/lib/isc/win32/thread.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: thread.c,v 1.22 2005/09/20 06:16:29 marka Exp $ */
+/* $Id: thread.c,v 1.23 2007/06/18 23:47:49 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/lib/isc/win32/time.c b/lib/isc/win32/time.c
index 047af6abb3b70554858ed1a0446d7f61c0f0df90..e7beb55b2d4fd00abb2ebfd50b6e8a15a9aa9133 100644 (file)
--- a/lib/isc/win32/time.c
+++ b/lib/isc/win32/time.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: time.c,v 1.41 2006/12/22 05:18:53 marka Exp $ */
+/* $Id: time.c,v 1.42 2007/06/18 23:47:49 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/lib/isc/win32/unistd.h b/lib/isc/win32/unistd.h
index 3cc51018bdd62b2004c379ec46e35210a3196f8e..9f9f9bd93a6140345bb283bcaad355d7ab56abeb 100644 (file)
--- a/lib/isc/win32/unistd.h
+++ b/lib/isc/win32/unistd.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: unistd.h,v 1.4 2004/03/05 05:12:00 marka Exp $ */
+/* $Id: unistd.h,v 1.5 2007/06/18 23:47:49 tbox Exp $ */
 
 /* None of these are defined in NT, so define them for our use */
 #define O_NONBLOCK 1

diff --git a/lib/isc/win32/version.c b/lib/isc/win32/version.c
index 4d3f0446b9056322fe9c07b42c33a3d06be2834e..3cdeeb2e3068669c977c80afbf86bef6bebceb83 100644 (file)
--- a/lib/isc/win32/version.c
+++ b/lib/isc/win32/version.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: version.c,v 1.5 2004/03/05 05:12:00 marka Exp $ */
+/* $Id: version.c,v 1.6 2007/06/18 23:47:49 tbox Exp $ */
 
 #include <versions.h>
 

diff --git a/lib/isc/win32/win32os.c b/lib/isc/win32/win32os.c
index bbc5e3c4b6b08d7faf4c80eec368625ef44593f5..859aa60d2f1437966552e2272e160cb3599f6623 100644 (file)
--- a/lib/isc/win32/win32os.c
+++ b/lib/isc/win32/win32os.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: win32os.c,v 1.3 2004/03/05 05:12:00 marka Exp $ */
+/* $Id: win32os.c,v 1.4 2007/06/18 23:47:49 tbox Exp $ */
 
 #include <windows.h>
 

diff --git a/lib/isc/x86_32/include/isc/atomic.h b/lib/isc/x86_32/include/isc/atomic.h
index 6b5af6090478665ad9881007dae8ea05dfab5cf4..aeef41d41fb706ef11ae50baee2745cb6af7c7c8 100644 (file)
--- a/lib/isc/x86_32/include/isc/atomic.h
+++ b/lib/isc/x86_32/include/isc/atomic.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2005  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: atomic.h,v 1.4 2005/07/27 04:20:43 marka Exp $ */
+/* $Id: atomic.h,v 1.5 2007/06/18 23:47:49 tbox Exp $ */
 
 #ifndef ISC_ATOMIC_H
 #define ISC_ATOMIC_H 1

diff --git a/lib/isc/x86_64/include/isc/atomic.h b/lib/isc/x86_64/include/isc/atomic.h
index 749e410c1b33699177e5ec90ef2b1e685f53dce5..46fb1597f34acdc67955ade1530931ce5d0184d9 100644 (file)
--- a/lib/isc/x86_64/include/isc/atomic.h
+++ b/lib/isc/x86_64/include/isc/atomic.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2005  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: atomic.h,v 1.2 2005/07/27 04:20:43 marka Exp $ */
+/* $Id: atomic.h,v 1.3 2007/06/18 23:47:49 tbox Exp $ */
 
 #ifndef ISC_ATOMIC_H
 #define ISC_ATOMIC_H 1

diff --git a/lib/isccc/Makefile.in b/lib/isccc/Makefile.in
index d886c8020c720c5656d5b613aa290d2c8a747dc2..a8e213020f9f9800b43087c331fb075f42b4de45 100644 (file)
--- a/lib/isccc/Makefile.in
+++ b/lib/isccc/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001, 2003  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.7 2004/07/20 07:13:42 marka Exp $
+# $Id: Makefile.in,v 1.8 2007/06/18 23:47:49 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/isccc/alist.c b/lib/isccc/alist.c
index dd1ce90aff7066f8f69c4aba18246b758649785b..5f2069e449a4f4b3630a7884a4508ec9d7b5c80c 100644 (file)
--- a/lib/isccc/alist.c
+++ b/lib/isccc/alist.c
@@ -1,6 +1,19 @@
 /*
  * Portions Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 2001  Internet Software Consortium.
+ *
+ * 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 AND NOMINUM 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.
+ *
  * Portions Copyright (C) 2001  Nominum, Inc.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -16,7 +29,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: alist.c,v 1.5 2005/04/29 00:23:54 marka Exp $ */
+/* $Id: alist.c,v 1.6 2007/06/18 23:47:49 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isccc/base64.c b/lib/isccc/base64.c
index 0c7e0f6ebec6eec90fe25dcf681f7619b076986f..499c8435a2c97ec83b09db36460afb494cc9215d 100644 (file)
--- a/lib/isccc/base64.c
+++ b/lib/isccc/base64.c
@@ -1,6 +1,19 @@
 /*
  * Portions Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 2001  Internet Software Consortium.
+ *
+ * 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 AND NOMINUM 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.
+ *
  * Portions Copyright (C) 2001  Nominum, Inc.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -16,7 +29,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: base64.c,v 1.5 2005/04/29 00:23:55 marka Exp $ */
+/* $Id: base64.c,v 1.6 2007/06/18 23:47:49 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isccc/cc.c b/lib/isccc/cc.c
index e45766e047b4429091dae61d839fce2aecf8babc..9b4111898b2de03efe6fb661f229b34061160563 100644 (file)
--- a/lib/isccc/cc.c
+++ b/lib/isccc/cc.c
@@ -1,6 +1,19 @@
 /*
  * Portions Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 2001-2003  Internet Software Consortium.
+ *
+ * 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 AND NOMINUM 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.
+ *
  * Portions Copyright (C) 2001  Nominum, Inc.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -16,7 +29,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: cc.c,v 1.15 2006/12/07 23:57:59 marka Exp $ */
+/* $Id: cc.c,v 1.16 2007/06/18 23:47:49 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isccc/ccmsg.c b/lib/isccc/ccmsg.c
index e3e5eda8a977799c9aa40218fdba2a1bd1e4fcb6..e94eec39504fa6b97a90110a1de76178e1af4c79 100644 (file)
--- a/lib/isccc/ccmsg.c
+++ b/lib/isccc/ccmsg.c
@@ -1,6 +1,19 @@
 /*
  * Portions Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 2001  Internet Software Consortium.
+ *
+ * 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 AND NOMINUM 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.
+ *
  * Portions Copyright (C) 2001  Nominum, Inc.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -16,7 +29,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ccmsg.c,v 1.7 2005/04/29 00:23:55 marka Exp $ */
+/* $Id: ccmsg.c,v 1.8 2007/06/18 23:47:49 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isccc/include/Makefile.in b/lib/isccc/include/Makefile.in
index f3d46abcf4fdfb0245b3354d46554f72ad0c47a3..87c02d79aad71a2fdba22f7c833a3890d1041412 100644 (file)
--- a/lib/isccc/include/Makefile.in
+++ b/lib/isccc/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.3 2004/03/05 05:12:12 marka Exp $
+# $Id: Makefile.in,v 1.4 2007/06/18 23:47:50 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/isccc/include/isccc/Makefile.in b/lib/isccc/include/isccc/Makefile.in
index b7b1d5516819ee5729bb64f78a9ab3b126208d49..99186371d3e2bbb915081181b1d5a316e8093dd8 100644 (file)
--- a/lib/isccc/include/isccc/Makefile.in
+++ b/lib/isccc/include/isccc/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.5 2004/03/05 05:12:15 marka Exp $
+# $Id: Makefile.in,v 1.6 2007/06/18 23:47:50 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/isccc/include/isccc/alist.h b/lib/isccc/include/isccc/alist.h
index 2a34c2a4da66d85444ead907e949b89f44aa03db..0b4692074f77ffee579d63c950e586549461a2a8 100644 (file)
--- a/lib/isccc/include/isccc/alist.h
+++ b/lib/isccc/include/isccc/alist.h
@@ -1,6 +1,19 @@
 /*
  * Portions Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 2001  Internet Software Consortium.
+ *
+ * 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 AND NOMINUM 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.
+ *
  * Portions Copyright (C) 2001  Nominum, Inc.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -16,7 +29,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: alist.h,v 1.7 2006/12/22 01:59:44 marka Exp $ */
+/* $Id: alist.h,v 1.8 2007/06/18 23:47:50 tbox Exp $ */
 
 #ifndef ISCCC_ALIST_H
 #define ISCCC_ALIST_H 1

diff --git a/lib/isccc/include/isccc/base64.h b/lib/isccc/include/isccc/base64.h
index f8e977fc8236f61021c8634cb2d6cc48763295a7..bf60513b5da8d7ffc7640bd26569da0009666e05 100644 (file)
--- a/lib/isccc/include/isccc/base64.h
+++ b/lib/isccc/include/isccc/base64.h
@@ -1,6 +1,19 @@
 /*
  * Portions Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 2001  Internet Software Consortium.
+ *
+ * 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 AND NOMINUM 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.
+ *
  * Portions Copyright (C) 2001  Nominum, Inc.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -16,7 +29,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: base64.h,v 1.7 2006/12/22 01:59:44 marka Exp $ */
+/* $Id: base64.h,v 1.8 2007/06/18 23:47:50 tbox Exp $ */
 
 #ifndef ISCCC_BASE64_H
 #define ISCCC_BASE64_H 1

diff --git a/lib/isccc/include/isccc/cc.h b/lib/isccc/include/isccc/cc.h
index 7d61ab9a97466d65fd56b61452e3a5e0ff75d4f5..e046e9c7dcea1b8ad7cdfdc60b9d06c1038fd618 100644 (file)
--- a/lib/isccc/include/isccc/cc.h
+++ b/lib/isccc/include/isccc/cc.h
@@ -1,6 +1,19 @@
 /*
  * Portions Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 2001  Internet Software Consortium.
+ *
+ * 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 AND NOMINUM 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.
+ *
  * Portions Copyright (C) 2001  Nominum, Inc.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -16,7 +29,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: cc.h,v 1.8 2006/12/22 01:59:44 marka Exp $ */
+/* $Id: cc.h,v 1.9 2007/06/18 23:47:50 tbox Exp $ */
 
 #ifndef ISCCC_CC_H
 #define ISCCC_CC_H 1

diff --git a/lib/isccc/include/isccc/ccmsg.h b/lib/isccc/include/isccc/ccmsg.h
index bf034a231a2073aebd9762b77e1eb304bf8c7a85..257b3a2e1e6756c650972ae9af4894e8933b352e 100644 (file)
--- a/lib/isccc/include/isccc/ccmsg.h
+++ b/lib/isccc/include/isccc/ccmsg.h
@@ -1,6 +1,19 @@
 /*
  * Portions Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 2001  Internet Software Consortium.
+ *
+ * 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 AND NOMINUM 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.
+ *
  * Portions Copyright (C) 2001  Nominum, Inc.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -16,7 +29,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ccmsg.h,v 1.8 2006/12/22 01:59:44 marka Exp $ */
+/* $Id: ccmsg.h,v 1.9 2007/06/18 23:47:50 tbox Exp $ */
 
 #ifndef ISCCC_CCMSG_H
 #define ISCCC_CCMSG_H 1

diff --git a/lib/isccc/include/isccc/events.h b/lib/isccc/include/isccc/events.h
index 6b4cf354c560e68f64e5e6ab250dcfeae0170eca..f5b552692af3aa99b4c0df4d66a3cdc29d8c9033 100644 (file)
--- a/lib/isccc/include/isccc/events.h
+++ b/lib/isccc/include/isccc/events.h
@@ -1,6 +1,19 @@
 /*
  * Portions Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 2001  Internet Software Consortium.
+ *
+ * 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 AND NOMINUM 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.
+ *
  * Portions Copyright (C) 2001  Nominum, Inc.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -16,7 +29,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: events.h,v 1.7 2006/12/22 01:59:44 marka Exp $ */
+/* $Id: events.h,v 1.8 2007/06/18 23:47:50 tbox Exp $ */
 
 #ifndef ISCCC_EVENTS_H
 #define ISCCC_EVENTS_H 1

diff --git a/lib/isccc/include/isccc/lib.h b/lib/isccc/include/isccc/lib.h
index d202b4b52efa48598704cbb3f4246d3663722df1..a8a08a433f764d2712a418f4e08aa218992ab371 100644 (file)
--- a/lib/isccc/include/isccc/lib.h
+++ b/lib/isccc/include/isccc/lib.h
@@ -1,6 +1,19 @@
 /*
  * Portions Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 2001  Internet Software Consortium.
+ *
+ * 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 AND NOMINUM 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.
+ *
  * Portions Copyright (C) 2001  Nominum, Inc.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -16,7 +29,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lib.h,v 1.8 2006/12/22 01:59:44 marka Exp $ */
+/* $Id: lib.h,v 1.9 2007/06/18 23:47:50 tbox Exp $ */
 
 #ifndef ISCCC_LIB_H
 #define ISCCC_LIB_H 1

diff --git a/lib/isccc/include/isccc/result.h b/lib/isccc/include/isccc/result.h
index ff3e2258ac227d874e23ea7bd70fe4fc0873d8e1..0d15ad367c5577bf46ce7a174df9618e2da7aedc 100644 (file)
--- a/lib/isccc/include/isccc/result.h
+++ b/lib/isccc/include/isccc/result.h
@@ -1,6 +1,19 @@
 /*
  * Portions Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 2001, 2003  Internet Software Consortium.
+ *
+ * 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 AND NOMINUM 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.
+ *
  * Portions Copyright (C) 2001  Nominum, Inc.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -16,7 +29,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: result.h,v 1.9 2006/12/22 01:59:44 marka Exp $ */
+/* $Id: result.h,v 1.10 2007/06/18 23:47:50 tbox Exp $ */
 
 #ifndef ISCCC_RESULT_H
 #define ISCCC_RESULT_H 1

diff --git a/lib/isccc/include/isccc/sexpr.h b/lib/isccc/include/isccc/sexpr.h
index dd42a987a42ca718cda94450cbdfc6e818ba543d..28c5e1431acc47603446d2fca5edebe310b7f32e 100644 (file)
--- a/lib/isccc/include/isccc/sexpr.h
+++ b/lib/isccc/include/isccc/sexpr.h
@@ -1,6 +1,19 @@
 /*
  * Portions Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 2001  Internet Software Consortium.
+ *
+ * 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 AND NOMINUM 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.
+ *
  * Portions Copyright (C) 2001  Nominum, Inc.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -16,7 +29,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sexpr.h,v 1.8 2006/12/22 01:59:44 marka Exp $ */
+/* $Id: sexpr.h,v 1.9 2007/06/18 23:47:50 tbox Exp $ */
 
 #ifndef ISCCC_SEXPR_H
 #define ISCCC_SEXPR_H 1

diff --git a/lib/isccc/include/isccc/symtab.h b/lib/isccc/include/isccc/symtab.h
index 2a0afd6a96bbb357800a5a419cb984439ac58a92..19c83cb1cc9325820faa3e0c6a233168b83af1d3 100644 (file)
--- a/lib/isccc/include/isccc/symtab.h
+++ b/lib/isccc/include/isccc/symtab.h
@@ -1,6 +1,19 @@
 /*
  * Portions Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 2001  Internet Software Consortium.
+ *
+ * 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 AND NOMINUM 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.
+ *
  * Portions Copyright (C) 2001  Nominum, Inc.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -16,7 +29,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: symtab.h,v 1.7 2006/12/22 01:59:44 marka Exp $ */
+/* $Id: symtab.h,v 1.8 2007/06/18 23:47:50 tbox Exp $ */
 
 #ifndef ISCCC_SYMTAB_H
 #define ISCCC_SYMTAB_H 1

diff --git a/lib/isccc/include/isccc/symtype.h b/lib/isccc/include/isccc/symtype.h
index 5616874d2dc8ee4f9e7eb18d22a1516514417d54..debaf2131d86e5356791241d3c66bb76c4ada3e4 100644 (file)
--- a/lib/isccc/include/isccc/symtype.h
+++ b/lib/isccc/include/isccc/symtype.h
@@ -1,6 +1,19 @@
 /*
  * Portions Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 2001  Internet Software Consortium.
+ *
+ * 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 AND NOMINUM 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.
+ *
  * Portions Copyright (C) 2001  Nominum, Inc.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -16,7 +29,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: symtype.h,v 1.7 2006/12/22 01:59:44 marka Exp $ */
+/* $Id: symtype.h,v 1.8 2007/06/18 23:47:50 tbox Exp $ */
 
 #ifndef ISCCC_SYMTYPE_H
 #define ISCCC_SYMTYPE_H 1

diff --git a/lib/isccc/include/isccc/types.h b/lib/isccc/include/isccc/types.h
index 54592899fe3fffa14455ed0d7887908f57af3ca2..6a8e577fbc365c5cafccfa6a063b207155ba73a0 100644 (file)
--- a/lib/isccc/include/isccc/types.h
+++ b/lib/isccc/include/isccc/types.h
@@ -1,6 +1,19 @@
 /*
  * Portions Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 2001  Internet Software Consortium.
+ *
+ * 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 AND NOMINUM 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.
+ *
  * Portions Copyright (C) 2001  Nominum, Inc.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -16,7 +29,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: types.h,v 1.7 2006/12/22 01:59:44 marka Exp $ */
+/* $Id: types.h,v 1.8 2007/06/18 23:47:50 tbox Exp $ */
 
 #ifndef ISCCC_TYPES_H
 #define ISCCC_TYPES_H 1

diff --git a/lib/isccc/include/isccc/util.h b/lib/isccc/include/isccc/util.h
index db708d37b81bea61bb65f71709f9e63b345dd40f..1447fa3247a82d6d1ce1ed4473c9b945f29978d1 100644 (file)
--- a/lib/isccc/include/isccc/util.h
+++ b/lib/isccc/include/isccc/util.h
@@ -1,6 +1,19 @@
 /*
  * Portions Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 2001  Internet Software Consortium.
+ *
+ * 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 AND NOMINUM 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.
+ *
  * Portions Copyright (C) 2001  Nominum, Inc.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -16,7 +29,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: util.h,v 1.8 2006/12/22 01:59:44 marka Exp $ */
+/* $Id: util.h,v 1.9 2007/06/18 23:47:50 tbox Exp $ */
 
 #ifndef ISCCC_UTIL_H
 #define ISCCC_UTIL_H 1

diff --git a/lib/isccc/include/isccc/version.h b/lib/isccc/include/isccc/version.h
index 2df2f122eb2e6fd3789640b1dc828e01942ddf9e..f4a90b7a7903fa3fb66369e060133b6191ca92fe 100644 (file)
--- a/lib/isccc/include/isccc/version.h
+++ b/lib/isccc/include/isccc/version.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: version.h,v 1.7 2006/12/22 01:59:44 marka Exp $ */
+/* $Id: version.h,v 1.8 2007/06/18 23:47:50 tbox Exp $ */
 
 /*! \file isccc/version.h */
 

diff --git a/lib/isccc/lib.c b/lib/isccc/lib.c
index db616e8a589f35088d6430c604d2fd4025d5f459..930bcd39588695f8ee0e78bc48d85cbbbba06fc7 100644 (file)
--- a/lib/isccc/lib.c
+++ b/lib/isccc/lib.c
@@ -1,6 +1,19 @@
 /*
  * Portions Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 2001  Internet Software Consortium.
+ *
+ * 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 AND NOMINUM 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.
+ *
  * Portions Copyright (C) 2001  Nominum, Inc.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -16,7 +29,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lib.c,v 1.6 2005/04/29 00:23:55 marka Exp $ */
+/* $Id: lib.c,v 1.7 2007/06/18 23:47:49 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isccc/result.c b/lib/isccc/result.c
index 7c14a4e4a257433073f881fe7435e141f754fc6b..3a8b7fe9503cf1de0c6ba7816ce985550d1edf9e 100644 (file)
--- a/lib/isccc/result.c
+++ b/lib/isccc/result.c
@@ -1,6 +1,19 @@
 /*
  * Portions Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 2001, 2003  Internet Software Consortium.
+ *
+ * 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 AND NOMINUM 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.
+ *
  * Portions Copyright (C) 2001  Nominum, Inc.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -16,7 +29,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: result.c,v 1.7 2005/04/29 00:23:57 marka Exp $ */
+/* $Id: result.c,v 1.8 2007/06/18 23:47:49 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isccc/sexpr.c b/lib/isccc/sexpr.c
index d271c3d6e0c8864066d777ce2be3b87e0546a677..f60275dbd2588f818e32eace6d70d712e37e2bf2 100644 (file)
--- a/lib/isccc/sexpr.c
+++ b/lib/isccc/sexpr.c
@@ -1,6 +1,19 @@
 /*
  * Portions Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 2001  Internet Software Consortium.
+ *
+ * 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 AND NOMINUM 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.
+ *
  * Portions Copyright (C) 2001  Nominum, Inc.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -16,7 +29,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sexpr.c,v 1.6 2005/04/29 00:23:57 marka Exp $ */
+/* $Id: sexpr.c,v 1.7 2007/06/18 23:47:49 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isccc/symtab.c b/lib/isccc/symtab.c
index 9fe0f1fedc76000eaabd4c815de5cb0c525ef3a3..73627b8e0f78d40c7adf0f6c2f4a807ee43e86df 100644 (file)
--- a/lib/isccc/symtab.c
+++ b/lib/isccc/symtab.c
@@ -1,6 +1,19 @@
 /*
  * Portions Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 2001  Internet Software Consortium.
+ *
+ * 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 AND NOMINUM 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.
+ *
  * Portions Copyright (C) 2001  Nominum, Inc.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -16,7 +29,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: symtab.c,v 1.7 2005/04/29 00:23:57 marka Exp $ */
+/* $Id: symtab.c,v 1.8 2007/06/18 23:47:49 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isccc/version.c b/lib/isccc/version.c
index 7c3c219826e810798ff20c9ad174a5462e3827fe..4b9851a6c56f8e738cd1f93484713bb7f281a74d 100644 (file)
--- a/lib/isccc/version.c
+++ b/lib/isccc/version.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: version.c,v 1.5 2005/04/29 00:23:57 marka Exp $ */
+/* $Id: version.c,v 1.6 2007/06/18 23:47:49 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isccc/win32/DLLMain.c b/lib/isccc/win32/DLLMain.c
index c79558468c258493ae2daea6e2953f3d1bcf2f9c..2918c1fffb6a7d05bee9c0103da52ab6c682e33c 100644 (file)
--- a/lib/isccc/win32/DLLMain.c
+++ b/lib/isccc/win32/DLLMain.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: DLLMain.c,v 1.5 2007/06/18 03:36:50 marka Exp $ */
+/* $Id: DLLMain.c,v 1.6 2007/06/18 23:47:50 tbox Exp $ */
 
 #include <windows.h>
 #include <signal.h>

diff --git a/lib/isccc/win32/version.c b/lib/isccc/win32/version.c
index 0df6a4901cc271c561ea39557dcf319bcfc54daf..7351571964debede84b3a24c57a9dc30fc173861 100644 (file)
--- a/lib/isccc/win32/version.c
+++ b/lib/isccc/win32/version.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: version.c,v 1.5 2004/03/05 05:12:19 marka Exp $ */
+/* $Id: version.c,v 1.6 2007/06/18 23:47:50 tbox Exp $ */
 
 #include <versions.h>
 

diff --git a/lib/isccfg/Makefile.in b/lib/isccfg/Makefile.in
index 55b8e9029a44aba7ba4ee29d42bfede34df393d3..d055c9bbc6fc388e9cc19222dd738c377b51b65e 100644 (file)
--- a/lib/isccfg/Makefile.in
+++ b/lib/isccfg/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001-2003  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.16 2005/09/05 00:11:04 marka Exp $
+# $Id: Makefile.in,v 1.17 2007/06/18 23:47:50 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/isccfg/aclconf.c b/lib/isccfg/aclconf.c
index c5de6781a5cb769b0a9f1fb212191271a5820de7..0a1b2cca5eeeba84b0d8b2639074e94bdbf9b0d3 100644 (file)
--- a/lib/isccfg/aclconf.c
+++ b/lib/isccfg/aclconf.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: aclconf.c,v 1.7 2006/03/02 00:37:23 marka Exp $ */
+/* $Id: aclconf.c,v 1.8 2007/06/18 23:47:50 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/lib/isccfg/include/Makefile.in b/lib/isccfg/include/Makefile.in
index 4eddd928e07018819f3d8806832f5e60f6883c9a..23328047785bf90e4ffaf098676fd36dc9249ed0 100644 (file)
--- a/lib/isccfg/include/Makefile.in
+++ b/lib/isccfg/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.5 2004/03/05 05:12:24 marka Exp $
+# $Id: Makefile.in,v 1.6 2007/06/18 23:47:50 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/isccfg/include/isccfg/Makefile.in b/lib/isccfg/include/isccfg/Makefile.in
index 74de3a6f5f982f982f951a8633d8163cbb4c734e..90d2d46755461185a3e6cc66cc57f51adac6a32c 100644 (file)
--- a/lib/isccfg/include/isccfg/Makefile.in
+++ b/lib/isccfg/include/isccfg/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001, 2002  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.10 2005/01/12 01:56:12 marka Exp $
+# $Id: Makefile.in,v 1.11 2007/06/18 23:47:51 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/isccfg/include/isccfg/aclconf.h b/lib/isccfg/include/isccfg/aclconf.h
index 39679a3907a7367b2541c4e903a81d74f6feb059..de9a87ab46592a431318de7fc28b1bb495219ce5 100644 (file)
--- a/lib/isccfg/include/isccfg/aclconf.h
+++ b/lib/isccfg/include/isccfg/aclconf.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: aclconf.h,v 1.6 2006/03/02 00:37:23 marka Exp $ */
+/* $Id: aclconf.h,v 1.7 2007/06/18 23:47:51 tbox Exp $ */
 
 #ifndef ISCCFG_ACLCONF_H
 #define ISCCFG_ACLCONF_H 1

diff --git a/lib/isccfg/include/isccfg/cfg.h b/lib/isccfg/include/isccfg/cfg.h
index 12de4cadf5506f09152e1cbd77543428cec09d09..f56a18ab76dbeb68c6a2df33c740da9e8b068cbb 100644 (file)
--- a/lib/isccfg/include/isccfg/cfg.h
+++ b/lib/isccfg/include/isccfg/cfg.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: cfg.h,v 1.40 2006/12/22 01:45:01 marka Exp $ */
+/* $Id: cfg.h,v 1.41 2007/06/18 23:47:51 tbox Exp $ */
 
 #ifndef ISCCFG_CFG_H
 #define ISCCFG_CFG_H 1

diff --git a/lib/isccfg/include/isccfg/grammar.h b/lib/isccfg/include/isccfg/grammar.h
index 5f0ac9e2d547f7d337b4920f9e74734fd3b969a2..993b2753098faec4cf99067da02adac31e1ec564 100644 (file)
--- a/lib/isccfg/include/isccfg/grammar.h
+++ b/lib/isccfg/include/isccfg/grammar.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2002, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: grammar.h,v 1.13 2006/12/22 01:45:01 marka Exp $ */
+/* $Id: grammar.h,v 1.14 2007/06/18 23:47:51 tbox Exp $ */
 
 #ifndef ISCCFG_GRAMMAR_H
 #define ISCCFG_GRAMMAR_H 1

diff --git a/lib/isccfg/include/isccfg/log.h b/lib/isccfg/include/isccfg/log.h
index 16494e7158683a4cef75d6b9f8c24ee6b85419c4..f439cba6cc3cb8049d9c015feed948aaca29495e 100644 (file)
--- a/lib/isccfg/include/isccfg/log.h
+++ b/lib/isccfg/include/isccfg/log.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: log.h,v 1.10 2006/12/22 01:59:44 marka Exp $ */
+/* $Id: log.h,v 1.11 2007/06/18 23:47:51 tbox Exp $ */
 
 #ifndef ISCCFG_LOG_H
 #define ISCCFG_LOG_H 1

diff --git a/lib/isccfg/include/isccfg/namedconf.h b/lib/isccfg/include/isccfg/namedconf.h
index 1d8b91c2180103beb38400035fddeff1683022bc..bfd478951825d84abfae9fae63902f9df04667f4 100644 (file)
--- a/lib/isccfg/include/isccfg/namedconf.h
+++ b/lib/isccfg/include/isccfg/namedconf.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: namedconf.h,v 1.7 2006/12/22 01:59:44 marka Exp $ */
+/* $Id: namedconf.h,v 1.8 2007/06/18 23:47:51 tbox Exp $ */
 
 #ifndef ISCCFG_NAMEDCONF_H
 #define ISCCFG_NAMEDCONF_H 1

diff --git a/lib/isccfg/include/isccfg/version.h b/lib/isccfg/include/isccfg/version.h
index 91b9f782ded59d9c5a56209d70fe320b8506d60e..fbe5617a311a1da81c0f94a785ea7bf29bd0b7a9 100644 (file)
--- a/lib/isccfg/include/isccfg/version.h
+++ b/lib/isccfg/include/isccfg/version.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: version.h,v 1.7 2006/12/22 01:59:44 marka Exp $ */
+/* $Id: version.h,v 1.8 2007/06/18 23:47:51 tbox Exp $ */
 
 /*! \file isccfg/version.h */
 

diff --git a/lib/isccfg/log.c b/lib/isccfg/log.c
index 94372562a39a9ebf6cc67de2cedbdbad66cdc5b3..d726c42b1121ccfdc2cf79fd198e6ec3d8e99163 100644 (file)
--- a/lib/isccfg/log.c
+++ b/lib/isccfg/log.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: log.c,v 1.9 2006/12/22 01:59:44 marka Exp $ */
+/* $Id: log.c,v 1.10 2007/06/18 23:47:50 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index ee0a0034c72f2afb15f8fa09920f1e75d82ee5dd..7ee7897551408b2e6216f9399c87c4fba860090a 100644 (file)
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2002, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: namedconf.c,v 1.75 2007/03/29 06:36:31 marka Exp $ */
+/* $Id: namedconf.c,v 1.76 2007/06/18 23:47:50 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c
index 4c03286d8adbd0685e1bbeae144e316445392f0c..dfd434a595763e4552c2a572a982f45fa2dec34f 100644 (file)
--- a/lib/isccfg/parser.c
+++ b/lib/isccfg/parser.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: parser.c,v 1.123 2006/02/28 02:39:52 marka Exp $ */
+/* $Id: parser.c,v 1.124 2007/06/18 23:47:50 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isccfg/version.c b/lib/isccfg/version.c
index 152592c8938446ac75c5bce399d1cb121889dd8c..b788a72820dbd5a36d194426663ec806b0df7474 100644 (file)
--- a/lib/isccfg/version.c
+++ b/lib/isccfg/version.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: version.c,v 1.5 2005/04/29 00:24:02 marka Exp $ */
+/* $Id: version.c,v 1.6 2007/06/18 23:47:50 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isccfg/win32/DLLMain.c b/lib/isccfg/win32/DLLMain.c
index 27d2597de6bab183285912f5827f6c8c11b51f91..73499fb440def42e5e00760ec0b1715fcf4f1a98 100644 (file)
--- a/lib/isccfg/win32/DLLMain.c
+++ b/lib/isccfg/win32/DLLMain.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: DLLMain.c,v 1.5 2007/06/18 03:36:51 marka Exp $ */
+/* $Id: DLLMain.c,v 1.6 2007/06/18 23:47:51 tbox Exp $ */
 
 #include <windows.h>
 #include <signal.h>

diff --git a/lib/isccfg/win32/version.c b/lib/isccfg/win32/version.c
index 80a18e7a5e0d32530a785ec75d81a9bd403a5400..525c8b2cad42648939fa0d60d8a620b34675419e 100644 (file)
--- a/lib/isccfg/win32/version.c
+++ b/lib/isccfg/win32/version.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: version.c,v 1.4 2004/03/05 05:12:42 marka Exp $ */
+/* $Id: version.c,v 1.5 2007/06/18 23:47:51 tbox Exp $ */
 
 #include <versions.h>
 

diff --git a/lib/lwres/Makefile.in b/lib/lwres/Makefile.in
index 07776d2debd6346b43c479de5b22ae875a7fc3ff..ec02d569fea81b79056c7776b929adf817a50af1 100644 (file)
--- a/lib/lwres/Makefile.in
+++ b/lib/lwres/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.32 2005/06/10 00:00:59 marka Exp $
+# $Id: Makefile.in,v 1.33 2007/06/18 23:47:51 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/lwres/assert_p.h b/lib/lwres/assert_p.h
index bb56911264706f60f3c668b1da4ebf066b175b90..b0a907f4846087c3ac965f50ed09e23bb12e6277 100644 (file)
--- a/lib/lwres/assert_p.h
+++ b/lib/lwres/assert_p.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: assert_p.h,v 1.12 2005/04/29 00:24:04 marka Exp $ */
+/* $Id: assert_p.h,v 1.13 2007/06/18 23:47:51 tbox Exp $ */
 
 #ifndef LWRES_ASSERT_P_H
 #define LWRES_ASSERT_P_H 1

diff --git a/lib/lwres/context.c b/lib/lwres/context.c
index 2fa6fb23bb9d03833b3df44f424f8c78a8661f17..302adaa9a526565e84fe98263bf0d8dfc8d341cd 100644 (file)
--- a/lib/lwres/context.c
+++ b/lib/lwres/context.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: context.c,v 1.49 2007/06/18 03:36:51 marka Exp $ */
+/* $Id: context.c,v 1.50 2007/06/18 23:47:51 tbox Exp $ */
 
 /*! \file context.c 
    lwres_context_create() creates a #lwres_context_t structure for use in

diff --git a/lib/lwres/context_p.h b/lib/lwres/context_p.h
index d8f6e9c72b53e646709270fcb8d78a276a96603c..7e614a5399df545c6c009477e12b0a62cf08bff1 100644 (file)
--- a/lib/lwres/context_p.h
+++ b/lib/lwres/context_p.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: context_p.h,v 1.15 2005/04/29 00:24:04 marka Exp $ */
+/* $Id: context_p.h,v 1.16 2007/06/18 23:47:51 tbox Exp $ */
 
 #ifndef LWRES_CONTEXT_P_H
 #define LWRES_CONTEXT_P_H 1

diff --git a/lib/lwres/gai_strerror.c b/lib/lwres/gai_strerror.c
index 61427490f8ed4d4d253b4cf9c19fc39a892e0000..6ffe95b70cabf8f8548dfe25543d425a09a380d5 100644 (file)
--- a/lib/lwres/gai_strerror.c
+++ b/lib/lwres/gai_strerror.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: gai_strerror.c,v 1.20 2006/08/25 05:25:52 marka Exp $ */
+/* $Id: gai_strerror.c,v 1.21 2007/06/18 23:47:51 tbox Exp $ */
 
 /*! \file gai_strerror.c
  * lwres_gai_strerror() returns an error message corresponding to an

diff --git a/lib/lwres/getaddrinfo.c b/lib/lwres/getaddrinfo.c
index 9c0541828c1ef67dc3c404135b2197a697709b9d..7ea53a45af74507c2447b415fc372c1a01a840b0 100644 (file)
--- a/lib/lwres/getaddrinfo.c
+++ b/lib/lwres/getaddrinfo.c
@@ -5,7 +5,7 @@
  * This code is derived from software contributed to ISC by
  * Berkeley Software Design, Inc.
  *
- * 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.
  *
@@ -18,7 +18,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: getaddrinfo.c,v 1.49 2006/11/14 01:07:29 marka Exp $ */
+/* $Id: getaddrinfo.c,v 1.50 2007/06/18 23:47:51 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/lwres/gethost.c b/lib/lwres/gethost.c
index 2001f66494e0ccad9e8670bb0c800d012654ef51..296032037c2692ae7e63052a8af5577ceb8b68c8 100644 (file)
--- a/lib/lwres/gethost.c
+++ b/lib/lwres/gethost.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: gethost.c,v 1.32 2005/04/29 00:24:05 marka Exp $ */
+/* $Id: gethost.c,v 1.33 2007/06/18 23:47:51 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/lwres/getipnode.c b/lib/lwres/getipnode.c
index a2084d80bd5f60002aecae0364c81b10797b3f1b..a6c50c28b80320c33b81d6d9044b31450ebcf430 100644 (file)
--- a/lib/lwres/getipnode.c
+++ b/lib/lwres/getipnode.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: getipnode.c,v 1.41 2007/06/18 03:36:51 marka Exp $ */
+/* $Id: getipnode.c,v 1.42 2007/06/18 23:47:51 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/lwres/getnameinfo.c b/lib/lwres/getnameinfo.c
index 97199edec6c404f6b703e9bf874b49c6b51ca34e..1d150d9fe993e58154262646b1e4e2935ce8b069 100644 (file)
--- a/lib/lwres/getnameinfo.c
+++ b/lib/lwres/getnameinfo.c
@@ -2,7 +2,7 @@
  * Portions Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: getnameinfo.c,v 1.37 2005/04/29 00:24:05 marka Exp $ */
+/* $Id: getnameinfo.c,v 1.38 2007/06/18 23:47:51 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/lwres/getrrset.c b/lib/lwres/getrrset.c
index 9c8ba1f7abb76ab48d2c437f0369c60e41abee18..7bcb07aecf87db135390efad3d9168e57992796c 100644 (file)
--- a/lib/lwres/getrrset.c
+++ b/lib/lwres/getrrset.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: getrrset.c,v 1.16 2005/04/29 00:24:06 marka Exp $ */
+/* $Id: getrrset.c,v 1.17 2007/06/18 23:47:51 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/lwres/herror.c b/lib/lwres/herror.c
index 292402dfaf4ac43981fb63b4edb36b981dfc40b5..72bd51141aa13acc05b9f8392e1e5dd9d6143ba3 100644 (file)
--- a/lib/lwres/herror.c
+++ b/lib/lwres/herror.c
@@ -2,7 +2,7 @@
  * Portions Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
  *
- * 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.
  *
@@ -72,7 +72,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)herror.c     8.1 (Berkeley) 6/4/93";
 static const char rcsid[] =
-       "$Id: herror.c,v 1.15 2005/04/29 00:24:06 marka Exp $";
+       "$Id: herror.c,v 1.16 2007/06/18 23:47:51 tbox Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <config.h>

diff --git a/lib/lwres/include/Makefile.in b/lib/lwres/include/Makefile.in
index 7501060ed148853441d06d3fe68e8c6539e48a95..fd91504fa6af6d282f9e68b8cd150fec63d16c6f 100644 (file)
--- a/lib/lwres/include/Makefile.in
+++ b/lib/lwres/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.6 2004/03/05 05:12:49 marka Exp $
+# $Id: Makefile.in,v 1.7 2007/06/18 23:47:51 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/lwres/include/lwres/Makefile.in b/lib/lwres/include/lwres/Makefile.in
index 98b8f488ef278d54e5917ccf291c414a240e421c..a3aaf9d0c24b881471d3a4b0ce74e6832b48a991 100644 (file)
--- a/lib/lwres/include/lwres/Makefile.in
+++ b/lib/lwres/include/lwres/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.21 2004/03/05 05:12:52 marka Exp $
+# $Id: Makefile.in,v 1.22 2007/06/18 23:47:51 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/lwres/include/lwres/context.h b/lib/lwres/include/lwres/context.h
index e74682c4dcbb6912c4d6f60d639a07649d9aac68..de2028cabff7cb1895cbbfb1f3fc757fcb4f3651 100644 (file)
--- a/lib/lwres/include/lwres/context.h
+++ b/lib/lwres/include/lwres/context.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: context.h,v 1.19 2006/12/22 01:59:44 marka Exp $ */
+/* $Id: context.h,v 1.20 2007/06/18 23:47:51 tbox Exp $ */
 
 #ifndef LWRES_CONTEXT_H
 #define LWRES_CONTEXT_H 1

diff --git a/lib/lwres/include/lwres/int.h b/lib/lwres/include/lwres/int.h
index 2bd71e3ec7aaffc913f29221e4588562ed7060cd..b2809158ec1a11b5d9431c0e644286f415c19dd9 100644 (file)
--- a/lib/lwres/include/lwres/int.h
+++ b/lib/lwres/include/lwres/int.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: int.h,v 1.12 2006/12/22 01:59:44 marka Exp $ */
+/* $Id: int.h,v 1.13 2007/06/18 23:47:51 tbox Exp $ */
 
 #ifndef LWRES_INT_H
 #define LWRES_INT_H 1

diff --git a/lib/lwres/include/lwres/ipv6.h b/lib/lwres/include/lwres/ipv6.h
index c7e52e557de82e9463deb0d9ae9299a4b54f7294..221bf8d61a6d818beb89bfb022bca88ae94f1c4a 100644 (file)
--- a/lib/lwres/include/lwres/ipv6.h
+++ b/lib/lwres/include/lwres/ipv6.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ipv6.h,v 1.14 2006/12/22 01:59:44 marka Exp $ */
+/* $Id: ipv6.h,v 1.15 2007/06/18 23:47:51 tbox Exp $ */
 
 #ifndef LWRES_IPV6_H
 #define LWRES_IPV6_H 1

diff --git a/lib/lwres/include/lwres/lang.h b/lib/lwres/include/lwres/lang.h
index f98baaad813517cee9a8884895921f75db15115a..7975be68ac1913caf087fc94434c443da09595c2 100644 (file)
--- a/lib/lwres/include/lwres/lang.h
+++ b/lib/lwres/include/lwres/lang.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lang.h,v 1.11 2006/12/22 01:59:44 marka Exp $ */
+/* $Id: lang.h,v 1.12 2007/06/18 23:47:51 tbox Exp $ */
 
 #ifndef LWRES_LANG_H
 #define LWRES_LANG_H 1

diff --git a/lib/lwres/include/lwres/list.h b/lib/lwres/include/lwres/list.h
index df9d4614c4d5f5418b76d4e4dadf045aa1d3b0ca..4f47b3e693c98c2e8ee3f052fddfcd81f309725e 100644 (file)
--- a/lib/lwres/include/lwres/list.h
+++ b/lib/lwres/include/lwres/list.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1997-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: list.h,v 1.12 2006/12/22 01:59:44 marka Exp $ */
+/* $Id: list.h,v 1.13 2007/06/18 23:47:51 tbox Exp $ */
 
 #ifndef LWRES_LIST_H
 #define LWRES_LIST_H 1

diff --git a/lib/lwres/include/lwres/lwbuffer.h b/lib/lwres/include/lwres/lwbuffer.h
index 24330008289a1bc232e6740d2929acb5760587b6..e7332f8f7b4cc94f5efc1af96e38444df64ba801 100644 (file)
--- a/lib/lwres/include/lwres/lwbuffer.h
+++ b/lib/lwres/include/lwres/lwbuffer.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwbuffer.h,v 1.20 2006/12/22 01:59:44 marka Exp $ */
+/* $Id: lwbuffer.h,v 1.21 2007/06/18 23:47:51 tbox Exp $ */
 
 
 /*! \file lwres/lwbuffer.h

diff --git a/lib/lwres/include/lwres/lwpacket.h b/lib/lwres/include/lwres/lwpacket.h
index ea44e170929eeca04d300af0f1b3dbe6d3004e4e..b5a864db27e9c032cd483095a9ceff73e85fa132 100644 (file)
--- a/lib/lwres/include/lwres/lwpacket.h
+++ b/lib/lwres/include/lwres/lwpacket.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwpacket.h,v 1.22 2006/12/22 01:59:44 marka Exp $ */
+/* $Id: lwpacket.h,v 1.23 2007/06/18 23:47:51 tbox Exp $ */
 
 #ifndef LWRES_LWPACKET_H
 #define LWRES_LWPACKET_H 1

diff --git a/lib/lwres/include/lwres/lwres.h b/lib/lwres/include/lwres/lwres.h
index 343d92948196a1e01a01f06757e7cc9a3bbdfde1..582444d5ab57d68a0b42a86f72bfdf045f656e9d 100644 (file)
--- a/lib/lwres/include/lwres/lwres.h
+++ b/lib/lwres/include/lwres/lwres.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwres.h,v 1.55 2006/12/22 01:59:44 marka Exp $ */
+/* $Id: lwres.h,v 1.56 2007/06/18 23:47:51 tbox Exp $ */
 
 #ifndef LWRES_LWRES_H
 #define LWRES_LWRES_H 1

diff --git a/lib/lwres/include/lwres/netdb.h.in b/lib/lwres/include/lwres/netdb.h.in
index 22d75f7164c18798743d51a1c346952d56fd7b15..21e0b791e5bab09774c21f36ac40878862abc4c6 100644 (file)
--- a/lib/lwres/include/lwres/netdb.h.in
+++ b/lib/lwres/include/lwres/netdb.h.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: netdb.h.in,v 1.37 2005/04/29 00:24:10 marka Exp $ */
+/* $Id: netdb.h.in,v 1.38 2007/06/18 23:47:51 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/lwres/include/lwres/platform.h.in b/lib/lwres/include/lwres/platform.h.in
index 8ce3428e681bdbd54f37ce8ca2ac37d6c01c8dcf..3e07509604154882e1aef85963e4f621e97028d9 100644 (file)
--- a/lib/lwres/include/lwres/platform.h.in
+++ b/lib/lwres/include/lwres/platform.h.in
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: platform.h.in,v 1.19 2005/06/08 02:07:03 marka Exp $ */
+/* $Id: platform.h.in,v 1.20 2007/06/18 23:47:51 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/lwres/include/lwres/result.h b/lib/lwres/include/lwres/result.h
index 01ea71fbf0a7a276ba7c5207fe8293c8741c750b..d831cf64a5ef5ad79471679795a42ca2b2a07690 100644 (file)
--- a/lib/lwres/include/lwres/result.h
+++ b/lib/lwres/include/lwres/result.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: result.h,v 1.19 2006/12/22 01:59:44 marka Exp $ */
+/* $Id: result.h,v 1.20 2007/06/18 23:47:51 tbox Exp $ */
 
 #ifndef LWRES_RESULT_H
 #define LWRES_RESULT_H 1

diff --git a/lib/lwres/include/lwres/stdlib.h b/lib/lwres/include/lwres/stdlib.h
index 9f6df06b01e250e68fb03701bcbfd1b961ca2c51..566583bbaf1f9132c8510ad0b03a3e58718ea4b5 100644 (file)
--- a/lib/lwres/include/lwres/stdlib.h
+++ b/lib/lwres/include/lwres/stdlib.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: stdlib.h,v 1.4 2006/12/22 01:59:44 marka Exp $ */
+/* $Id: stdlib.h,v 1.5 2007/06/18 23:47:51 tbox Exp $ */
 
 #ifndef LWRES_STDLIB_H
 #define LWRES_STDLIB_H 1

diff --git a/lib/lwres/include/lwres/version.h b/lib/lwres/include/lwres/version.h
index 2ea384dc82316a2c67f90ea8ed3740384c887b27..9be4dd80b1ecb69a58b650a8521faba76a63c4e4 100644 (file)
--- a/lib/lwres/include/lwres/version.h
+++ b/lib/lwres/include/lwres/version.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: version.h,v 1.7 2006/12/22 01:59:44 marka Exp $ */
+/* $Id: version.h,v 1.8 2007/06/18 23:47:51 tbox Exp $ */
 
 /*! \file lwres/version.h */
 

diff --git a/lib/lwres/lwbuffer.c b/lib/lwres/lwbuffer.c
index 310e542e5d314e55f1ca71d669cbb5ef0c475d8f..b738c305b9da202a1bc722148ff9f55e4719de57 100644 (file)
--- a/lib/lwres/lwbuffer.c
+++ b/lib/lwres/lwbuffer.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwbuffer.c,v 1.13 2005/04/29 00:24:06 marka Exp $ */
+/* $Id: lwbuffer.c,v 1.14 2007/06/18 23:47:51 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/lwres/lwconfig.c b/lib/lwres/lwconfig.c
index d2b6cabde822d3ec8a4b797eb1be495d250a52a6..85efa84e29d416ac26f5026ae61741bdf7f7dafb 100644 (file)
--- a/lib/lwres/lwconfig.c
+++ b/lib/lwres/lwconfig.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwconfig.c,v 1.44 2006/10/03 23:50:52 marka Exp $ */
+/* $Id: lwconfig.c,v 1.45 2007/06/18 23:47:51 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/lwres/lwinetaton.c b/lib/lwres/lwinetaton.c
index c4ef0755c933a0265c4e62b990f1966004d896b1..b02297aec44254fc6732335442c40d0bbce4ba81 100644 (file)
--- a/lib/lwres/lwinetaton.c
+++ b/lib/lwres/lwinetaton.c
@@ -2,7 +2,7 @@
  * Portions Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1996-2001, 2003  Internet Software Consortium.
  *
- * 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.
  *
@@ -72,7 +72,7 @@
  */
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)inet_addr.c        8.1 (Berkeley) 6/17/93";
-static char rcsid[] = "$Id: lwinetaton.c,v 1.14 2005/04/29 00:24:07 marka Exp $";
+static char rcsid[] = "$Id: lwinetaton.c,v 1.15 2007/06/18 23:47:51 tbox Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <config.h>

diff --git a/lib/lwres/lwinetntop.c b/lib/lwres/lwinetntop.c
index bce03d38edd8885e268f176bef4931cb215f71bc..6e995ff67482bad2bfcbb11cb26fdba81ab984ae 100644 (file)
--- a/lib/lwres/lwinetntop.c
+++ b/lib/lwres/lwinetntop.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1996-2001, 2003  Internet Software Consortium.
  *
- * 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.
  *
@@ -19,7 +19,7 @@
  */
 #if defined(LIBC_SCCS) && !defined(lint)
 static char rcsid[] =
-       "$Id: lwinetntop.c,v 1.16 2005/11/03 22:59:53 marka Exp $";
+       "$Id: lwinetntop.c,v 1.17 2007/06/18 23:47:51 tbox Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <config.h>

diff --git a/lib/lwres/lwinetpton.c b/lib/lwres/lwinetpton.c
index 2693e71fcc646f0460e1336c39291e0277622bb9..6a47a79644b570173bb0ce3b79b6fa068a849fc3 100644 (file)
--- a/lib/lwres/lwinetpton.c
+++ b/lib/lwres/lwinetpton.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1996-2001  Internet Software Consortium.
  *
- * 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.
  *
@@ -19,7 +19,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$Id: lwinetpton.c,v 1.10 2005/04/27 04:57:30 sra Exp $";
+static char rcsid[] = "$Id: lwinetpton.c,v 1.11 2007/06/18 23:47:51 tbox Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <config.h>

diff --git a/lib/lwres/lwpacket.c b/lib/lwres/lwpacket.c
index 8e4696293841069e911239ad44295dfa0aeb99a1..a18da65f25903e01e2a78668640827d142ef224b 100644 (file)
--- a/lib/lwres/lwpacket.c
+++ b/lib/lwres/lwpacket.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwpacket.c,v 1.16 2005/04/29 00:24:07 marka Exp $ */
+/* $Id: lwpacket.c,v 1.17 2007/06/18 23:47:51 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/lwres/lwres_gabn.c b/lib/lwres/lwres_gabn.c
index 54b61baf66b94978dca8fa8297735a94f58dd913..4d28393d633dbc87656c39a7cbc39767abbb9621 100644 (file)
--- a/lib/lwres/lwres_gabn.c
+++ b/lib/lwres/lwres_gabn.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwres_gabn.c,v 1.31 2005/04/29 00:24:07 marka Exp $ */
+/* $Id: lwres_gabn.c,v 1.32 2007/06/18 23:47:51 tbox Exp $ */
 
 /*! \file lwres_gabn.c
    These are low-level routines for creating and parsing lightweight

diff --git a/lib/lwres/lwres_gnba.c b/lib/lwres/lwres_gnba.c
index 4f5da0852d2eba117000629f16022c9d40cf9984..81fff91eb29c2dd9b97124da1071660cf59e2ab1 100644 (file)
--- a/lib/lwres/lwres_gnba.c
+++ b/lib/lwres/lwres_gnba.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwres_gnba.c,v 1.25 2005/04/29 00:24:08 marka Exp $ */
+/* $Id: lwres_gnba.c,v 1.26 2007/06/18 23:47:51 tbox Exp $ */
 
 /*! \file lwres_gnba.c
    These are low-level routines for creating and parsing lightweight

diff --git a/lib/lwres/lwres_grbn.c b/lib/lwres/lwres_grbn.c
index cdd8036f00641551e79e8900d1d0cffea7e8cc19..e0b1b3428f551f143da71d241e7e629a13c8ed93 100644 (file)
--- a/lib/lwres/lwres_grbn.c
+++ b/lib/lwres/lwres_grbn.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwres_grbn.c,v 1.8 2005/04/29 00:24:08 marka Exp $ */
+/* $Id: lwres_grbn.c,v 1.9 2007/06/18 23:47:51 tbox Exp $ */
 
 /*! \file lwres_grbn.c
 

diff --git a/lib/lwres/lwres_noop.c b/lib/lwres/lwres_noop.c
index e5eb0dddca870efee1b25c8879324ba92b105ffe..db0170bee7d75aadaa820a4a92fef8ea9cccd493 100644 (file)
--- a/lib/lwres/lwres_noop.c
+++ b/lib/lwres/lwres_noop.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwres_noop.c,v 1.17 2005/04/29 00:24:08 marka Exp $ */
+/* $Id: lwres_noop.c,v 1.18 2007/06/18 23:47:51 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/lwres/lwresutil.c b/lib/lwres/lwresutil.c
index 4c802ce39a8cd079fb2a85cdf6beda9a0dfb0b71..82edcd2075f22a6a2c5fcbc882a94ff54be80fcd 100644 (file)
--- a/lib/lwres/lwresutil.c
+++ b/lib/lwres/lwresutil.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwresutil.c,v 1.32 2005/04/29 00:24:08 marka Exp $ */
+/* $Id: lwresutil.c,v 1.33 2007/06/18 23:47:51 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/lwres/man/Makefile.in b/lib/lwres/man/Makefile.in
index e28123cd21dc9a795f5ce4253870311d9ef11188..2d8f766087bf33710637a05ba32af0ddf23426dc 100644 (file)
--- a/lib/lwres/man/Makefile.in
+++ b/lib/lwres/man/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.7 2004/03/05 05:12:55 marka Exp $
+# $Id: Makefile.in,v 1.8 2007/06/18 23:47:51 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/lwres/man/lwres.docbook b/lib/lwres/man/lwres.docbook
index 989e8797d0b1f004257f8e6ecfdf9688bed5fd4e..97d591c9d8d3fcbadd60b15233866e53e50b53dc 100644 (file)
--- a/lib/lwres/man/lwres.docbook
+++ b/lib/lwres/man/lwres.docbook
@@ -5,7 +5,7 @@
  - Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000, 2001  Internet Software Consortium.
  -
- - 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.
  -
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: lwres.docbook,v 1.9 2007/01/29 23:57:22 marka Exp $ -->
+<!-- $Id: lwres.docbook,v 1.10 2007/06/18 23:47:51 tbox Exp $ -->
 <refentry>
 
   <refentryinfo>

diff --git a/lib/lwres/man/lwres_buffer.docbook b/lib/lwres/man/lwres_buffer.docbook
index afe272815620f53f697a3d14d6095c92f18f4f6a..97c52bdec499be3e695efbebb57d23df7c8e2a58 100644 (file)
--- a/lib/lwres/man/lwres_buffer.docbook
+++ b/lib/lwres/man/lwres_buffer.docbook
@@ -5,7 +5,7 @@
  - Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000, 2001  Internet Software Consortium.
  -
- - 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.
  -
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: lwres_buffer.docbook,v 1.9 2007/01/29 23:57:22 marka Exp $ -->
+<!-- $Id: lwres_buffer.docbook,v 1.10 2007/06/18 23:47:51 tbox Exp $ -->
 <refentry>
   <refentryinfo>
     <date>Jun 30, 2000</date>

diff --git a/lib/lwres/man/lwres_config.docbook b/lib/lwres/man/lwres_config.docbook
index 25d9a8c98e6cbd50ec1e8a63d5ea4a8c1361f307..5736ef3b6490a3731d14ad01572dc7f4f883e84f 100644 (file)
--- a/lib/lwres/man/lwres_config.docbook
+++ b/lib/lwres/man/lwres_config.docbook
@@ -5,7 +5,7 @@
  - Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000, 2001  Internet Software Consortium.
  -
- - 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.
  -
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: lwres_config.docbook,v 1.8 2007/01/29 23:57:22 marka Exp $ -->
+<!-- $Id: lwres_config.docbook,v 1.9 2007/06/18 23:47:51 tbox Exp $ -->
 <refentry>
   <refentryinfo>
 

diff --git a/lib/lwres/man/lwres_context.docbook b/lib/lwres/man/lwres_context.docbook
index 394ac8cc29e278c2f229502b6c7f27fa989ad8a5..ad0392e4e51e94ef4d713ea3710efbd2780d1cfa 100644 (file)
--- a/lib/lwres/man/lwres_context.docbook
+++ b/lib/lwres/man/lwres_context.docbook
@@ -5,7 +5,7 @@
  - Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
  -
- - 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.
  -
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: lwres_context.docbook,v 1.10 2007/01/29 23:57:22 marka Exp $ -->
+<!-- $Id: lwres_context.docbook,v 1.11 2007/06/18 23:47:51 tbox Exp $ -->
 <refentry>
 
   <refentryinfo>

diff --git a/lib/lwres/man/lwres_gabn.docbook b/lib/lwres/man/lwres_gabn.docbook
index 9c999f8de23104f56d0e1036d32499fc41a7bcd2..d0b5c190c318aeb210f04155d6fecc2f8982c521 100644 (file)
--- a/lib/lwres/man/lwres_gabn.docbook
+++ b/lib/lwres/man/lwres_gabn.docbook
@@ -5,7 +5,7 @@
  - Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000, 2001  Internet Software Consortium.
  -
- - 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.
  -
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: lwres_gabn.docbook,v 1.9 2007/01/29 23:57:22 marka Exp $ -->
+<!-- $Id: lwres_gabn.docbook,v 1.10 2007/06/18 23:47:51 tbox Exp $ -->
 <refentry>
 
   <refentryinfo>

diff --git a/lib/lwres/man/lwres_gai_strerror.docbook b/lib/lwres/man/lwres_gai_strerror.docbook
index 31a22cf14a8166874a7a554f94deb5af31062158..c33fee5ea6cfe6b10bc0f28b36c6e5a4411a650e 100644 (file)
--- a/lib/lwres/man/lwres_gai_strerror.docbook
+++ b/lib/lwres/man/lwres_gai_strerror.docbook
@@ -5,7 +5,7 @@
  - Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000, 2001  Internet Software Consortium.
  -
- - 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.
  -
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: lwres_gai_strerror.docbook,v 1.9 2007/01/29 23:57:22 marka Exp $ -->
+<!-- $Id: lwres_gai_strerror.docbook,v 1.10 2007/06/18 23:47:51 tbox Exp $ -->
 <refentry>
 
   <refentryinfo>

diff --git a/lib/lwres/man/lwres_getaddrinfo.docbook b/lib/lwres/man/lwres_getaddrinfo.docbook
index 986adf55fb4c3470f9df2dd67f7b41c0db996cf6..a328764dbbe90096193d8712ed5c080c41e69172 100644 (file)
--- a/lib/lwres/man/lwres_getaddrinfo.docbook
+++ b/lib/lwres/man/lwres_getaddrinfo.docbook
@@ -5,7 +5,7 @@
  - Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
  -
- - 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.
  -
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: lwres_getaddrinfo.docbook,v 1.12 2007/01/29 23:57:22 marka Exp $ -->
+<!-- $Id: lwres_getaddrinfo.docbook,v 1.13 2007/06/18 23:47:51 tbox Exp $ -->
 <refentry>
 
   <refentryinfo>

diff --git a/lib/lwres/man/lwres_gethostent.docbook b/lib/lwres/man/lwres_gethostent.docbook
index 59eb32ccd396566da8f4cb27ac16e32b31af91f6..a3f084bc2fe7c34209c4e40d6af3f4e34ad06f8a 100644 (file)
--- a/lib/lwres/man/lwres_gethostent.docbook
+++ b/lib/lwres/man/lwres_gethostent.docbook
@@ -5,7 +5,7 @@
  - Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2001  Internet Software Consortium.
  -
- - 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.
  -
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: lwres_gethostent.docbook,v 1.10 2007/01/29 23:57:22 marka Exp $ -->
+<!-- $Id: lwres_gethostent.docbook,v 1.11 2007/06/18 23:47:51 tbox Exp $ -->
 <refentry>
 
   <refentryinfo>

diff --git a/lib/lwres/man/lwres_getipnode.docbook b/lib/lwres/man/lwres_getipnode.docbook
index 939877cc41d9d57ab4376958086b179eed901cc1..825f46209cb7ef6ed2a8c95b31a874720e3d578e 100644 (file)
--- a/lib/lwres/man/lwres_getipnode.docbook
+++ b/lib/lwres/man/lwres_getipnode.docbook
@@ -5,7 +5,7 @@
  - Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
  -
- - 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.
  -
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: lwres_getipnode.docbook,v 1.11 2007/01/29 23:57:22 marka Exp $ -->
+<!-- $Id: lwres_getipnode.docbook,v 1.12 2007/06/18 23:47:51 tbox Exp $ -->
 <refentry>
 
   <refentryinfo>

diff --git a/lib/lwres/man/lwres_getnameinfo.docbook b/lib/lwres/man/lwres_getnameinfo.docbook
index 5b7c8bb3131e70a73b661ab160b71851ce291ce3..504dfb70adeaae4f716cb274484b730f06d8d5ff 100644 (file)
--- a/lib/lwres/man/lwres_getnameinfo.docbook
+++ b/lib/lwres/man/lwres_getnameinfo.docbook
@@ -5,7 +5,7 @@
  - Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000, 2001  Internet Software Consortium.
  -
- - 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.
  -
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: lwres_getnameinfo.docbook,v 1.9 2007/01/29 23:57:22 marka Exp $ -->
+<!-- $Id: lwres_getnameinfo.docbook,v 1.10 2007/06/18 23:47:51 tbox Exp $ -->
 <refentry>
 
   <refentryinfo>

diff --git a/lib/lwres/man/lwres_getrrsetbyname.docbook b/lib/lwres/man/lwres_getrrsetbyname.docbook
index 180c2dc4e421c42e60371b0d2befe3fbc08006e8..5f2a68d1da1ab6dc0f88acd64e6cb8ccc7bd7a27 100644 (file)
--- a/lib/lwres/man/lwres_getrrsetbyname.docbook
+++ b/lib/lwres/man/lwres_getrrsetbyname.docbook
@@ -5,7 +5,7 @@
  - Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000, 2001  Internet Software Consortium.
  -
- - 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.
  -
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: lwres_getrrsetbyname.docbook,v 1.9 2007/01/29 23:57:22 marka Exp $ -->
+<!-- $Id: lwres_getrrsetbyname.docbook,v 1.10 2007/06/18 23:47:51 tbox Exp $ -->
 <refentry>
 
   <refentryinfo>

diff --git a/lib/lwres/man/lwres_gnba.docbook b/lib/lwres/man/lwres_gnba.docbook
index ce974a79cd5a276d887be81377645d32561b3fcf..452cdfcb0f43bcf323bc09d135cae633f69ca46c 100644 (file)
--- a/lib/lwres/man/lwres_gnba.docbook
+++ b/lib/lwres/man/lwres_gnba.docbook
@@ -5,7 +5,7 @@
  - Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000, 2001  Internet Software Consortium.
  -
- - 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.
  -
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: lwres_gnba.docbook,v 1.10 2007/01/29 23:57:22 marka Exp $ -->
+<!-- $Id: lwres_gnba.docbook,v 1.11 2007/06/18 23:47:51 tbox Exp $ -->
 <refentry>
 
   <refentryinfo>

diff --git a/lib/lwres/man/lwres_hstrerror.docbook b/lib/lwres/man/lwres_hstrerror.docbook
index b6d97ef04a215b646bc9874c2cf1534b4619331f..ca4589e080b4a4b968b8248eefe2df4cd4b282c2 100644 (file)
--- a/lib/lwres/man/lwres_hstrerror.docbook
+++ b/lib/lwres/man/lwres_hstrerror.docbook
@@ -5,7 +5,7 @@
  - Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000, 2001  Internet Software Consortium.
  -
- - 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.
  -
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: lwres_hstrerror.docbook,v 1.10 2007/01/29 23:57:22 marka Exp $ -->
+<!-- $Id: lwres_hstrerror.docbook,v 1.11 2007/06/18 23:47:51 tbox Exp $ -->
 <refentry>
 
   <refentryinfo>

diff --git a/lib/lwres/man/lwres_inetntop.docbook b/lib/lwres/man/lwres_inetntop.docbook
index 4a15d4c89737896516d632f664a0177b1fcb83d9..26f1779d3139d74896917011b238f70eb96d36ec 100644 (file)
--- a/lib/lwres/man/lwres_inetntop.docbook
+++ b/lib/lwres/man/lwres_inetntop.docbook
@@ -5,7 +5,7 @@
  - Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000, 2001  Internet Software Consortium.
  -
- - 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.
  -
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: lwres_inetntop.docbook,v 1.9 2007/01/29 23:57:22 marka Exp $ -->
+<!-- $Id: lwres_inetntop.docbook,v 1.10 2007/06/18 23:47:51 tbox Exp $ -->
 <refentry>
 
   <refentryinfo>

diff --git a/lib/lwres/man/lwres_noop.docbook b/lib/lwres/man/lwres_noop.docbook
index b7cbbf43f847c489538652e24c9d02b861544700..eb823b77335b0506b3d7f151c4c19d44d9c4924d 100644 (file)
--- a/lib/lwres/man/lwres_noop.docbook
+++ b/lib/lwres/man/lwres_noop.docbook
@@ -5,7 +5,7 @@
  - Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000, 2001  Internet Software Consortium.
  -
- - 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.
  -
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: lwres_noop.docbook,v 1.10 2007/01/29 23:57:22 marka Exp $ -->
+<!-- $Id: lwres_noop.docbook,v 1.11 2007/06/18 23:47:51 tbox Exp $ -->
 <refentry>
 
   <refentryinfo>

diff --git a/lib/lwres/man/lwres_packet.docbook b/lib/lwres/man/lwres_packet.docbook
index 1ea0c37c8e78acf19c2d69c7dcc9c1891a1b1419..87841db7c71a00254249f19bfd0829d8309dc994 100644 (file)
--- a/lib/lwres/man/lwres_packet.docbook
+++ b/lib/lwres/man/lwres_packet.docbook
@@ -5,7 +5,7 @@
  - Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000, 2001  Internet Software Consortium.
  -
- - 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.
  -
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: lwres_packet.docbook,v 1.12 2007/01/29 23:57:22 marka Exp $ -->
+<!-- $Id: lwres_packet.docbook,v 1.13 2007/06/18 23:47:51 tbox Exp $ -->
 <refentry>
 
   <refentryinfo>

diff --git a/lib/lwres/man/lwres_resutil.docbook b/lib/lwres/man/lwres_resutil.docbook
index a499eccb239794e0dcb7c52b7d286c9930664b0d..e6184d912f5d83eefa65815cf10d7eafa54e3f33 100644 (file)
--- a/lib/lwres/man/lwres_resutil.docbook
+++ b/lib/lwres/man/lwres_resutil.docbook
@@ -5,7 +5,7 @@
  - Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000, 2001  Internet Software Consortium.
  -
- - 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.
  -
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: lwres_resutil.docbook,v 1.11 2007/01/29 23:57:22 marka Exp $ -->
+<!-- $Id: lwres_resutil.docbook,v 1.12 2007/06/18 23:47:51 tbox Exp $ -->
 <refentry>
 
   <refentryinfo>

diff --git a/lib/lwres/print.c b/lib/lwres/print.c
index 6fc76db3e907a7c64ae7fb483adcf4bb4f683700..2d6e5599f5b7e12aaed041bf9e3ca1ed0873506a 100644 (file)
--- a/lib/lwres/print.c
+++ b/lib/lwres/print.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: print.c,v 1.8 2005/10/14 01:14:10 marka Exp $ */
+/* $Id: print.c,v 1.9 2007/06/18 23:47:51 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/lib/lwres/print_p.h b/lib/lwres/print_p.h
index 148a5e4d4bc89ee278517d76be6c0c1d13e70b85..5777630d5e0fe41e50071f165ef6a8e445163315 100644 (file)
--- a/lib/lwres/print_p.h
+++ b/lib/lwres/print_p.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: print_p.h,v 1.2 2004/08/28 06:20:14 marka Exp $ */
+/* $Id: print_p.h,v 1.3 2007/06/18 23:47:51 tbox Exp $ */
 
 #ifndef LWRES_PRINT_P_H
 #define LWRES_PRINT_P_H 1

diff --git a/lib/lwres/strtoul.c b/lib/lwres/strtoul.c
index f7e7933dd35eb1b43c87828bbed5b0b792c5c751..9a4b093ea5f8f3fb497bd288224d7872bcb18640 100644 (file)
--- a/lib/lwres/strtoul.c
+++ b/lib/lwres/strtoul.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2003  Internet Software Consortium.
  *
- * 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.
  *
@@ -53,7 +53,7 @@
 static char sccsid[] = "@(#)strtoul.c  8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 
-/* $Id: strtoul.c,v 1.2 2005/06/08 02:07:02 marka Exp $ */
+/* $Id: strtoul.c,v 1.3 2007/06/18 23:47:51 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/lib/lwres/unix/Makefile.in b/lib/lwres/unix/Makefile.in
index 577e3d308c33f0d74c458d352c5dff0902cbaf5f..8d52c0da0b1236900167c3a26719fb8d0593a120 100644 (file)
--- a/lib/lwres/unix/Makefile.in
+++ b/lib/lwres/unix/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2 2004/03/05 05:12:59 marka Exp $
+# $Id: Makefile.in,v 1.3 2007/06/18 23:47:51 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/lwres/unix/include/Makefile.in b/lib/lwres/unix/include/Makefile.in
index 8ca74894875cff27e3c5a75b622d180aaee60164..5ef122ef673f4ec69372bbe8957a44980ea23a77 100644 (file)
--- a/lib/lwres/unix/include/Makefile.in
+++ b/lib/lwres/unix/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2 2004/03/05 05:13:03 marka Exp $
+# $Id: Makefile.in,v 1.3 2007/06/18 23:47:51 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/lwres/unix/include/lwres/Makefile.in b/lib/lwres/unix/include/lwres/Makefile.in
index 7e0b5945c0532e8232b1e80ddf2df2c8cd4cc9ef..10eb83cdb1afd8780f4f1c2780a99d30042a7bd8 100644 (file)
--- a/lib/lwres/unix/include/lwres/Makefile.in
+++ b/lib/lwres/unix/include/lwres/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2 2004/03/05 05:13:06 marka Exp $
+# $Id: Makefile.in,v 1.3 2007/06/18 23:47:51 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/lwres/unix/include/lwres/net.h b/lib/lwres/unix/include/lwres/net.h
index bd52ac8ede65f53bb49534a269a008dba3949ee5..879333be0a8eb8a2ff5224a9152324a3b16483fa 100644 (file)
--- a/lib/lwres/unix/include/lwres/net.h
+++ b/lib/lwres/unix/include/lwres/net.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: net.h,v 1.7 2005/04/29 00:24:11 marka Exp $ */
+/* $Id: net.h,v 1.8 2007/06/18 23:47:51 tbox Exp $ */
 
 #ifndef LWRES_NET_H
 #define LWRES_NET_H 1

diff --git a/lib/lwres/version.c b/lib/lwres/version.c
index 545f0cd791d1b738f93cc721f8030d2bb071e02e..30651d0828d35526bc864962d2d1b751327b1bbb 100644 (file)
--- a/lib/lwres/version.c
+++ b/lib/lwres/version.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: version.c,v 1.10 2005/04/29 00:24:08 marka Exp $ */
+/* $Id: version.c,v 1.11 2007/06/18 23:47:51 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/lwres/win32/DLLMain.c b/lib/lwres/win32/DLLMain.c
index f5545d73d6620e28f08411667c3a8b5cd98c102a..a61372e80c827c166c040b67f892b48663ea5309 100644 (file)
--- a/lib/lwres/win32/DLLMain.c
+++ b/lib/lwres/win32/DLLMain.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: DLLMain.c,v 1.4 2007/06/18 03:36:51 marka Exp $ */
+/* $Id: DLLMain.c,v 1.5 2007/06/18 23:47:51 tbox Exp $ */
 
 #include <windows.h>
 #include <signal.h>

diff --git a/lib/lwres/win32/Makefile.in b/lib/lwres/win32/Makefile.in
index f5b697073abbf39b68bb3e5f9deea3ecf6feab8a..8d52c0da0b1236900167c3a26719fb8d0593a120 100644 (file)
--- a/lib/lwres/win32/Makefile.in
+++ b/lib/lwres/win32/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2 2004/03/05 05:13:20 marka Exp $
+# $Id: Makefile.in,v 1.3 2007/06/18 23:47:51 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/lwres/win32/include/Makefile.in b/lib/lwres/win32/include/Makefile.in
index b6d247455f934eb0c55e83270aebc7ece8d849f2..5ef122ef673f4ec69372bbe8957a44980ea23a77 100644 (file)
--- a/lib/lwres/win32/include/Makefile.in
+++ b/lib/lwres/win32/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2 2004/03/05 05:13:30 marka Exp $
+# $Id: Makefile.in,v 1.3 2007/06/18 23:47:51 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/lwres/win32/include/lwres/Makefile.in b/lib/lwres/win32/include/lwres/Makefile.in
index 1d72dd5c935ba2156ecaecb01583a98d94b14b22..54ae9d3bf4db917cb37caa9dc4e88af64ab63ebe 100644 (file)
--- a/lib/lwres/win32/include/lwres/Makefile.in
+++ b/lib/lwres/win32/include/lwres/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.2 2004/03/05 05:13:35 marka Exp $
+# $Id: Makefile.in,v 1.3 2007/06/18 23:47:52 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/lwres/win32/include/lwres/int.h b/lib/lwres/win32/include/lwres/int.h
index 3679bd695222fdb13bb0232b80569f595db719ac..0a51c26f7b8e8272aa06b76128aee227db045cbc 100644 (file)
--- a/lib/lwres/win32/include/lwres/int.h
+++ b/lib/lwres/win32/include/lwres/int.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: int.h,v 1.2 2004/03/05 05:13:35 marka Exp $ */
+/* $Id: int.h,v 1.3 2007/06/18 23:47:52 tbox Exp $ */
 
 #ifndef LWRES_INT_H
 #define LWRES_INT_H 1

diff --git a/lib/lwres/win32/include/lwres/net.h b/lib/lwres/win32/include/lwres/net.h
index 543920d812e5ef569a555452a84d3dc6dc22203e..6ad5407c600ec2c66ae6f01681afa33df7f46857 100644 (file)
--- a/lib/lwres/win32/include/lwres/net.h
+++ b/lib/lwres/win32/include/lwres/net.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: net.h,v 1.4 2004/03/05 05:13:35 marka Exp $ */
+/* $Id: net.h,v 1.5 2007/06/18 23:47:52 tbox Exp $ */
 
 #ifndef LWRES_NET_H
 #define LWRES_NET_H 1

diff --git a/lib/lwres/win32/include/lwres/netdb.h b/lib/lwres/win32/include/lwres/netdb.h
index a4f782d8370b22859f766206a1956c657e0a8468..c66a733c55606c20a90f85387fabac2c023260de 100644 (file)
--- a/lib/lwres/win32/include/lwres/netdb.h
+++ b/lib/lwres/win32/include/lwres/netdb.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: netdb.h,v 1.5 2006/12/22 01:59:44 marka Exp $ */
+/* $Id: netdb.h,v 1.6 2007/06/18 23:47:52 tbox Exp $ */
 
 #ifndef LWRES_NETDB_H
 #define LWRES_NETDB_H 1

diff --git a/lib/lwres/win32/include/lwres/platform.h b/lib/lwres/win32/include/lwres/platform.h
index d4360d5275fbf72422f3251009da4e83494abee5..89fd9ac541b78aed62ececdaf5b52b103868de87 100644 (file)
--- a/lib/lwres/win32/include/lwres/platform.h
+++ b/lib/lwres/win32/include/lwres/platform.h
@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: platform.h,v 1.6 2007/06/18 03:36:51 marka Exp $ */
+/* $Id: platform.h,v 1.7 2007/06/18 23:47:52 tbox Exp $ */
 
 #ifndef LWRES_PLATFORM_H
 #define LWRES_PLATFORM_H 1

diff --git a/lib/lwres/win32/lwconfig.c b/lib/lwres/win32/lwconfig.c
index e5995e769869a8110caaccc27bfd772e1e0c1b3f..10e9946a98e64f62a15377c151769ffeda42eaf0 100644 (file)
--- a/lib/lwres/win32/lwconfig.c
+++ b/lib/lwres/win32/lwconfig.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 2004, 2006  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2002  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwconfig.c,v 1.5 2007/06/18 03:05:46 marka Exp $ */
+/* $Id: lwconfig.c,v 1.6 2007/06/18 23:47:51 tbox Exp $ */
 
 /*
  * We do this so that we may incorporate everything in the main routines

diff --git a/lib/lwres/win32/socket.c b/lib/lwres/win32/socket.c
index e173ce3bb60b1d03e8d1a776d9b287a0985970c8..8f6c79ad2a99711fa09dd5d865590cd6b5ec0b55 100644 (file)
--- a/lib/lwres/win32/socket.c
+++ b/lib/lwres/win32/socket.c
@@ -1,3 +1,21 @@
+/*
+ * 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: socket.c,v 1.3 2007/06/18 23:47:51 tbox Exp $ */
+
 #include <stdio.h>
 #include <lwres/platform.h>
 #include <Winsock2.h>

diff --git a/lib/lwres/win32/version.c b/lib/lwres/win32/version.c
index b0894233a59a8bd4b50381ceebbc4477f9f5cf2f..23a4192980c8a4e064b553d287574b80c3b226c8 100644 (file)
--- a/lib/lwres/win32/version.c
+++ b/lib/lwres/win32/version.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: version.c,v 1.4 2004/03/05 05:13:20 marka Exp $ */
+/* $Id: version.c,v 1.5 2007/06/18 23:47:51 tbox Exp $ */
 
 #include <versions.h>
 

diff --git a/lib/tests/Makefile.in b/lib/tests/Makefile.in
index 9189d15e12d7e86070ddc5063471e87fa53faae5..a517486d9bab5f02d464201327a53c6615348eed 100644 (file)
--- a/lib/tests/Makefile.in
+++ b/lib/tests/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2001, 2003  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.23 2004/12/06 22:47:22 marka Exp $
+# $Id: Makefile.in,v 1.24 2007/06/18 23:47:52 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/tests/include/Makefile.in b/lib/tests/include/Makefile.in
index dd6682845ae113dc9a1e74e390c36dd3ebf51a8e..5b1502e08bb93e9046a412b72e61f100f62b9de8 100644 (file)
--- a/lib/tests/include/Makefile.in
+++ b/lib/tests/include/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.9 2004/03/05 05:13:56 marka Exp $
+# $Id: Makefile.in,v 1.10 2007/06/18 23:47:52 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/tests/include/tests/Makefile.in b/lib/tests/include/tests/Makefile.in
index cd9c849e43cb2f0b69e2ef9d89c74fb7ca9a0961..95e4d456d7f0c541f48db2725c80e932cf255e5c 100644 (file)
--- a/lib/tests/include/tests/Makefile.in
+++ b/lib/tests/include/tests/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1999-2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.7 2004/03/05 05:13:59 marka Exp $
+# $Id: Makefile.in,v 1.8 2007/06/18 23:47:52 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/lib/tests/include/tests/t_api.h b/lib/tests/include/tests/t_api.h
index ddf225296c3bfdeec8e794023a432b3e7e678ac9..47a74b25535768a0b31ed2add53b6028c785280f 100644 (file)
--- a/lib/tests/include/tests/t_api.h
+++ b/lib/tests/include/tests/t_api.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_api.h,v 1.20 2006/12/22 01:59:44 marka Exp $ */
+/* $Id: t_api.h,v 1.21 2007/06/18 23:47:52 tbox Exp $ */
 
 #ifndef TESTS_T_API_H
 #define TESTS_T_API_H 1

diff --git a/lib/tests/t_api.c b/lib/tests/t_api.c
index 824426c3f1f6f00bfd922de482c5c4bc1f3d33b9..ec8de3c41a1ec3197cbeca9ba48220f93b131009 100644 (file)
--- a/lib/tests/t_api.c
+++ b/lib/tests/t_api.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_api.c,v 1.58 2005/11/30 03:33:49 marka Exp $ */
+/* $Id: t_api.c,v 1.59 2007/06/18 23:47:52 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/win32/bindevt/bindevt.c b/lib/win32/bindevt/bindevt.c
index 3b651ece68502652a59e2d38356a37779455edde..e3b442de21862a0d8294cbf510971eca83af9ecf 100644 (file)
--- a/lib/win32/bindevt/bindevt.c
+++ b/lib/win32/bindevt/bindevt.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
- * 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,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: bindevt.c,v 1.3 2004/03/05 05:14:03 marka Exp $ */
+/* $Id: bindevt.c,v 1.4 2007/06/18 23:47:57 tbox Exp $ */
 
 /*
  * bindevt.c : Defines the entry point for event log viewer DLL.

diff --git a/lib/win32/bindevt/bindevt.mc b/lib/win32/bindevt/bindevt.mc
index 241d4062abb09a7976d69ff0f7638c17b3f2d36c..68186224f3bc9b3cb6ae36a94b6424c1668385ca 100644 (file)
--- a/lib/win32/bindevt/bindevt.mc
+++ b/lib/win32/bindevt/bindevt.mc
@@ -1,7 +1,7 @@
 ; Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2001  Internet Software Consortium.
 ;
-; 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.
 ;
@@ -13,7 +13,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: bindevt.mc,v 1.2 2004/03/16 05:22:31 marka Exp $
+; $Id: bindevt.mc,v 1.3 2007/06/18 23:47:57 tbox Exp $
 
 MessageIdTypedef=DWORD
 

diff --git a/make/Makefile.in b/make/Makefile.in
index ae96e13100a73bd12f4ed73850443c4229f3a937..05637fca5a5383f73585e71a34f3b8f483d0c039 100644 (file)
--- a/make/Makefile.in
+++ b/make/Makefile.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.14 2004/03/05 05:14:06 marka Exp $
+# $Id: Makefile.in,v 1.15 2007/06/18 23:47:57 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/make/includes.in b/make/includes.in
index a5a3f003d8eb3ff7c4569401a0ddf9afe49f581d..22848d9271043d2b16500fed3319de41dd8410e3 100644 (file)
--- a/make/includes.in
+++ b/make/includes.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1999-2001  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: includes.in,v 1.19 2005/06/04 05:32:50 jinmei Exp $
+# $Id: includes.in,v 1.20 2007/06/18 23:47:57 tbox Exp $
 
 # Search for machine-generated header files in the build tree,
 # and for normal headers in the source tree (${top_srcdir}).

diff --git a/make/rules.in b/make/rules.in
index 5ee44abcd0591a66f7fc77a1f42bc8b88010c8de..01f391aff8d2f885dec3cddc0c4eaff20a9c299d 100644 (file)
--- a/make/rules.in
+++ b/make/rules.in
@@ -1,7 +1,7 @@
 # Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2003  Internet Software Consortium.
 #
-# 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.
 #
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: rules.in,v 1.61 2007/03/28 22:36:26 explorer Exp $
+# $Id: rules.in,v 1.62 2007/06/18 23:47:57 tbox Exp $
 
 ###
 ### Common Makefile rules for BIND 9.

diff --git a/util/altbuild.sh b/util/altbuild.sh
index 0e6b4517175694c14718005a13c74136bcfcd100..5dcc279cce95c31a129d3f0c5daaf925740a744a 100644 (file)
--- a/util/altbuild.sh
+++ b/util/altbuild.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2002  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: altbuild.sh,v 1.15 2004/03/05 05:14:15 marka Exp $
+# $Id: altbuild.sh,v 1.16 2007/06/18 23:47:57 tbox Exp $
 
 #
 # "Alternative build" test.

diff --git a/util/check-changes b/util/check-changes
index 31bae536a11fdbad496c24b997af38cd1d2d7505..6bb18934c7f468eeda17e2ffbd8591421eb4859a 100644 (file)
--- a/util/check-changes
+++ b/util/check-changes
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2002  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: check-changes,v 1.2 2004/03/05 05:14:15 marka Exp $
+# $Id: check-changes,v 1.3 2007/06/18 23:47:57 tbox Exp $
 
 eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
     if $running_under_some_shell;

diff --git a/util/check-includes.pl b/util/check-includes.pl
index 4285a462b395f05d72f54136bb589c46942a7cc5..228ef77f3cb1419299f8aee09783923782c4bb38 100644 (file)
--- a/util/check-includes.pl
+++ b/util/check-includes.pl
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: check-includes.pl,v 1.8 2004/03/05 05:14:15 marka Exp $
+# $Id: check-includes.pl,v 1.9 2007/06/18 23:47:57 tbox Exp $
 
 # Rudimentary, primarily for use by the developers.
 # This just evolved with no serious attempt at making it

diff --git a/util/check-instincludes.sh b/util/check-instincludes.sh
index 3c38fb3f91dee12a8728ad590c00ca43c5f3c8e5..2cd5a92e7bc205eff40cfff8818cad4d38d958d9 100644 (file)
--- a/util/check-instincludes.sh
+++ b/util/check-instincludes.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: check-instincludes.sh,v 1.9 2004/03/05 05:14:15 marka Exp $
+# $Id: check-instincludes.sh,v 1.10 2007/06/18 23:47:57 tbox Exp $
 
 #
 # Check the installed bind9 header files to make sure that no header

diff --git a/util/check-pullups.pl b/util/check-pullups.pl
index 1fffb23363ee11f76e67ade323efb0dd5c9afd06..8730fa99b9a5b86bdd0bcce922b4f71ff48308b0 100644 (file)
--- a/util/check-pullups.pl
+++ b/util/check-pullups.pl
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001-2003  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: check-pullups.pl,v 1.10 2004/03/05 05:14:15 marka Exp $
+# $Id: check-pullups.pl,v 1.11 2007/06/18 23:47:57 tbox Exp $
 
 # Given two CHANGES files, list [bug] entries present in the
 # first one but not in the second one.

diff --git a/util/check-sources.pl b/util/check-sources.pl
index a05b2afccb8c240a8bfec8313f7c12399dc42d21..bd83ac3c5260c9e0794b37a816b49a92c86f9cc9 100644 (file)
--- a/util/check-sources.pl
+++ b/util/check-sources.pl
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: check-sources.pl,v 1.8 2004/03/05 05:14:16 marka Exp $
+# $Id: check-sources.pl,v 1.9 2007/06/18 23:47:57 tbox Exp $
 
 # Rudimentary, primarily for use by the developers.
 # This just evolved with no serious attempt at making it

diff --git a/util/kit.sh b/util/kit.sh
index ea12ff86d4f4a9b924168f74fc6c91e369dd6ca7..36f3a75906cbb8fca1840e67fd70b2fb206d91fb 100644 (file)
--- a/util/kit.sh
+++ b/util/kit.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2003  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: kit.sh,v 1.29 2004/12/13 02:06:53 marka Exp $
+# $Id: kit.sh,v 1.30 2007/06/18 23:47:57 tbox Exp $
 
 # Make a release kit
 #

diff --git a/util/mandoc2docbook.pl b/util/mandoc2docbook.pl
index 63f4213d7aa2653b4f3f246eca90c8384146da76..cecc8fdbd83bbb490f4c330fc26aacd76cab7af2 100644 (file)
--- a/util/mandoc2docbook.pl
+++ b/util/mandoc2docbook.pl
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: mandoc2docbook.pl,v 1.4 2004/03/05 05:14:16 marka Exp $
+# $Id: mandoc2docbook.pl,v 1.5 2007/06/18 23:47:57 tbox Exp $
 
 #
 # Do a quick-and-dirty conversion of .mandoc man pages to
@@ -46,7 +46,7 @@ print <<\END;
  - WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: mandoc2docbook.pl,v 1.4 2004/03/05 05:14:16 marka Exp $ -->
+<!-- $Id: mandoc2docbook.pl,v 1.5 2007/06/18 23:47:57 tbox Exp $ -->
 
 <refentry>
 <refentryinfo>

diff --git a/util/mdnbuildtest.sh b/util/mdnbuildtest.sh
index 2b113ea3e7f6e9c2227005c52cabd0ba9f464ec3..b8acc94742ed168a9d16f61a753e03e3911ec433 100644 (file)
--- a/util/mdnbuildtest.sh
+++ b/util/mdnbuildtest.sh
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: mdnbuildtest.sh,v 1.3 2004/03/05 05:14:16 marka Exp $
+# $Id: mdnbuildtest.sh,v 1.4 2007/06/18 23:47:57 tbox Exp $
 
 # XXXDCL This is currently much too specific to the environment in which
 # it was written (NetBSD 1.5_alpha2 with libiconv in /usr/local/lib).  It

diff --git a/util/memleak.pl b/util/memleak.pl
index ef3a296e64fa420ecf5eb6681791bf393c2488e8..83a9e8f9a4dc66fb5f0dfce5b1ee9b0b48de64bb 100644 (file)
--- a/util/memleak.pl
+++ b/util/memleak.pl
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1999-2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: memleak.pl,v 1.12 2004/03/05 05:14:16 marka Exp $
+# $Id: memleak.pl,v 1.13 2007/06/18 23:47:57 tbox Exp $
 
 # Massage the output from ISC_MEM_DEBUG to extract mem_get() calls
 # with no corresponding mem_put().

diff --git a/util/merge_copyrights b/util/merge_copyrights
index eb341a03cb06d4c3488497322d335ed517973270..3d706b290d67cd7523ead4a9d0b5b269b43503b0 100644 (file)
--- a/util/merge_copyrights
+++ b/util/merge_copyrights
@@ -3,7 +3,7 @@
 # Copyright (C) 2004-2006  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2001, 2003  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: merge_copyrights,v 1.28 2006/12/22 01:49:46 marka Exp $
+# $Id: merge_copyrights,v 1.29 2007/06/18 23:47:57 tbox Exp $
 
 %file_types = ();
 %file_years = ();

diff --git a/util/mkreslib.pl b/util/mkreslib.pl
index a0c69883e129ed62b52747b66036c252596af15a..8c18cc4ea3394fd722e5e7227261d209ef24a678 100644 (file)
--- a/util/mkreslib.pl
+++ b/util/mkreslib.pl
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: mkreslib.pl,v 1.10 2004/03/05 05:14:16 marka Exp $
+# $Id: mkreslib.pl,v 1.11 2007/06/18 23:47:57 tbox Exp $
 
 # Build a res_* library distribution from the BIND 8 source
 

diff --git a/util/nanny.pl b/util/nanny.pl
index 3498a8804d1f7aa99391918af1c30aa5767e924f..c78261176cebe6b4be9f661ccf154f2eb78849a5 100644 (file)
--- a/util/nanny.pl
+++ b/util/nanny.pl
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: nanny.pl,v 1.8 2004/03/05 05:14:16 marka Exp $
+# $Id: nanny.pl,v 1.9 2007/06/18 23:47:57 tbox Exp $
 
 # A simple nanny to make sure named stays running.
 

diff --git a/util/new-func b/util/new-func
index 0098b69e5f99cd529ccff6e6d3ebd927144ee05d..fee6e721187157da2930411e9a7b72937ed97628 100644 (file)
--- a/util/new-func
+++ b/util/new-func
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2005  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: new-func,v 1.2 2005/09/06 03:51:37 marka Exp $
+# $Id: new-func,v 1.3 2007/06/18 23:47:57 tbox Exp $
 
 # Given two CHANGES files, list [bug] entries present in the
 # first one but not in the second one.

diff --git a/util/nt-kit b/util/nt-kit
index cb491493e3eb9c1b96fd672016f039f8cf330059..5d9e81eb1d1ec241eda2284545944659a7c45b9a 100644 (file)
--- a/util/nt-kit
+++ b/util/nt-kit
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1999-2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: nt-kit,v 1.7 2004/03/05 05:14:16 marka Exp $
+# $Id: nt-kit,v 1.8 2007/06/18 23:47:57 tbox Exp $
 
 # XXX no command line options at all.  especially useful would be a way
 # to specify the target directory on the NT machine, since it is needed

diff --git a/util/spacewhack.pl b/util/spacewhack.pl
index fc0d22a6b6dafcf822fcdc66781e43a9ed7ba2f6..f2b15fdfea8efdd71552e70872fb4fbe0c032050 100644 (file)
--- a/util/spacewhack.pl
+++ b/util/spacewhack.pl
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: spacewhack.pl,v 1.4 2004/03/05 05:14:17 marka Exp $
+# $Id: spacewhack.pl,v 1.5 2007/06/18 23:47:57 tbox Exp $
 
 $0 =~ s%.*/%%;
 

diff --git a/util/tabify-changes b/util/tabify-changes
index fea771573a7eac96a3775d7a0a0779afbe8cb2f6..36a370bb6324b873b7ddf71d3504bd4b95590728 100644 (file)
--- a/util/tabify-changes
+++ b/util/tabify-changes
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2004  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: tabify-changes,v 1.2 2004/03/08 00:18:34 marka Exp $
+# $Id: tabify-changes,v 1.3 2007/06/18 23:47:57 tbox Exp $
 
 expand ${1} |
 sed \

diff --git a/util/update-drafts.pl b/util/update-drafts.pl
index d5119a34945a8c300f5ce7eb4b1c0fa5cf16fe4b..97a38c98aeec21d315c9233d7fbb4fcec51f5a50 100644 (file)
--- a/util/update-drafts.pl
+++ b/util/update-drafts.pl
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: update-drafts.pl,v 1.5 2004/03/05 05:14:17 marka Exp $
+# $Id: update-drafts.pl,v 1.6 2007/06/18 23:47:57 tbox Exp $
 
 #
 # Replace internet drafts with updated versions, if any.

diff --git a/util/update_branches b/util/update_branches
index 49e7054826468da6fe8b2a69778253435f20a7aa..a8f6e4e0b205580d42c20a69cbbb9f8cafc02739 100644 (file)
--- a/util/update_branches
+++ b/util/update_branches
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2005, 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.
 #
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: update_branches,v 1.21 2007/01/30 23:52:54 marka Exp $
+# $Id: update_branches,v 1.22 2007/06/18 23:47:57 tbox Exp $
 
 #
 #  Track which branches are still open or not in the bind9 cvs repository.

diff --git a/win32utils/index.html b/win32utils/index.html
index 69700a414f335b8e12f0e75f5091a04030e22e22..2355854f9276d929cb3a9eff10c9ae26be20bcc7 100644 (file)
--- a/win32utils/index.html
+++ b/win32utils/index.html
@@ -1,7 +1,7 @@
 <!--
  - Copyright (C) 2006  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 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: index.html,v 1.4 2006/10/03 23:50:52 marka Exp $ -->
+<!-- $Id: index.html,v 1.5 2007/06/18 23:47:57 tbox Exp $ -->
 
 <html>
 <head>

diff --git a/win32utils/makedefs.pl b/win32utils/makedefs.pl
index 7979849369e96a4c775f0c35ec4100da7bd7f69f..8952cdd064d1ec84b1a281733cdd95b5bcc08ac9 100644 (file)
--- a/win32utils/makedefs.pl
+++ b/win32utils/makedefs.pl
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: makedefs.pl,v 1.6 2004/03/05 05:14:20 marka Exp $
+# $Id: makedefs.pl,v 1.7 2007/06/18 23:47:57 tbox Exp $
 
 # makedefs.pl
 # This script goes through all of the lib header files and creates a .def file

diff --git a/win32utils/makeversion.pl b/win32utils/makeversion.pl
index 4e39d9ca0699578433cd49135f73d5c605b3d791..45783400c93bd999a5005bc5334eb1466f3b8cb4 100644 (file)
--- a/win32utils/makeversion.pl
+++ b/win32utils/makeversion.pl
@@ -3,7 +3,7 @@
 # Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2001  Internet Software Consortium.
 #
-# 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,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: makeversion.pl,v 1.6 2004/03/05 05:14:21 marka Exp $ 
+# $Id: makeversion.pl,v 1.7 2007/06/18 23:47:57 tbox Exp $ 
 
 # This script takes the version information from the version file located
 # at the root of the source tree and the api files in each library directory

diff --git a/win32utils/updateopenssl.pl b/win32utils/updateopenssl.pl
index 819d674526905069fd56b481df2ece0b640300b1..9329a097fa4a7434e2b199187bcb6371f15355f7 100644 (file)
--- a/win32utils/updateopenssl.pl
+++ b/win32utils/updateopenssl.pl
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2006  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: updateopenssl.pl,v 1.5 2006/10/11 03:54:19 marka Exp $
+# $Id: updateopenssl.pl,v 1.6 2007/06/18 23:47:57 tbox Exp $
 
 # updateopenssl.pl
 # This script locates the latest version of OpenSSL in the grandparent