update copyright notice

diff --git a/Makefile.in b/Makefile.in
index 4ac2b97fae47222a430ffd3d4523b6886dcb3a5e..cfdfb0019c279b34b2e6d2948da925dba93ea4db 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2002  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -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.51 2008/09/24 02:13:02 marka Exp $
+# $Id: Makefile.in,v 1.52 2008/09/25 04:02:38 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/bin/dnssec/dnssec-keygen.c b/bin/dnssec/dnssec-keygen.c
index c9197924b9a29466d4b04aefcec6209d21781e0b..614d388eb7e21c6698db8290dee46e34086673e5 100644 (file)
--- a/bin/dnssec/dnssec-keygen.c
+++ b/bin/dnssec/dnssec-keygen.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004-2008  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
@@ -29,7 +29,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-keygen.c,v 1.80 2008/09/24 02:46:21 marka Exp $ */
+/* $Id: dnssec-keygen.c,v 1.81 2008/09/25 04:02:38 tbox Exp $ */
 
 /*! \file */
 

diff --git a/bin/dnssec/dnssec-keygen.docbook b/bin/dnssec/dnssec-keygen.docbook
index abb032a3ea8975c9f79144cbd1b1ba78e59bfac8..cbdd88e42162c1e462e2147467e7722aff5c3567 100644 (file)
--- a/bin/dnssec/dnssec-keygen.docbook
+++ b/bin/dnssec/dnssec-keygen.docbook
@@ -2,7 +2,7 @@
                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
               [<!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004, 2005, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2003  Internet Software Consortium.
  -
  - Permission to use, copy, modify, and/or distribute this software for any
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: dnssec-keygen.docbook,v 1.20 2008/09/24 02:46:21 marka Exp $ -->
+<!-- $Id: dnssec-keygen.docbook,v 1.21 2008/09/25 04:02:38 tbox Exp $ -->
 <refentry id="man.dnssec-keygen">
   <refentryinfo>
     <date>June 30, 2000</date>
@@ -40,6 +40,7 @@
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
+      <year>2008</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
     <copyright>

diff --git a/bin/dnssec/dnssec-signzone.docbook b/bin/dnssec/dnssec-signzone.docbook
index 9c8592c1666c3e99a65ae9ab8b1e80fad1de648d..8808f35dff5daff71904e6fa472692db4385e81b 100644 (file)
--- a/bin/dnssec/dnssec-signzone.docbook
+++ b/bin/dnssec/dnssec-signzone.docbook
@@ -2,7 +2,7 @@
                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
               [<!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2003  Internet Software Consortium.
  -
  - Permission to use, copy, modify, and/or distribute this software for any
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: dnssec-signzone.docbook,v 1.29 2008/09/24 03:16:57 tbox Exp $ -->
+<!-- $Id: dnssec-signzone.docbook,v 1.30 2008/09/25 04:02:38 tbox Exp $ -->
 <refentry id="man.dnssec-signzone">
   <refentryinfo>
     <date>June 30, 2000</date>
@@ -41,6 +41,7 @@
       <year>2005</year>
       <year>2006</year>
       <year>2007</year>
+      <year>2008</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
     <copyright>

diff --git a/bin/dnssec/dnssectool.h b/bin/dnssec/dnssectool.h
index 299df70d0cbe1a82db6d1204ba9a94b17d9d74ae..ee476f4ea78bcd6a7efee5b8cd266878d58f7a0b 100644 (file)
--- a/bin/dnssec/dnssectool.h
+++ b/bin/dnssec/dnssectool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssectool.h,v 1.21 2008/09/24 02:46:21 marka Exp $ */
+/* $Id: dnssectool.h,v 1.22 2008/09/25 04:02:38 tbox Exp $ */
 
 #ifndef DNSSECTOOL_H
 #define DNSSECTOOL_H 1

diff --git a/bin/named/lwresd.docbook b/bin/named/lwresd.docbook
index f9b4f69ea9bce7ed8450137a80f6b15dcb209ff1..6d7378266d3fcc85eb09271031b38b9be2654ea1 100644 (file)
--- a/bin/named/lwresd.docbook
+++ b/bin/named/lwresd.docbook
@@ -2,7 +2,7 @@
                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
               [<!ENTITY mdash "&#8212;">]>
 <!--
- - Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004, 2005, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000, 2001  Internet Software Consortium.
  -
  - Permission to use, copy, modify, and/or distribute this software for any
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: lwresd.docbook,v 1.16 2008/09/24 21:40:58 jreed Exp $ -->
+<!-- $Id: lwresd.docbook,v 1.17 2008/09/25 04:02:38 tbox Exp $ -->
 <refentry>
   <refentryinfo>
     <date>June 30, 2000</date>
@@ -40,6 +40,7 @@
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
+      <year>2008</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
     <copyright>

diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
index e3f74b5df78d8bf6adf974cb4fde06eaa56daf14..0987638e1fdb96232e61cbea9279b0190a2ca12e 100644 (file)
--- a/bin/nsupdate/nsupdate.c
+++ b/bin/nsupdate/nsupdate.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsupdate.c,v 1.162 2008/09/25 02:20:27 marka Exp $ */
+/* $Id: nsupdate.c,v 1.163 2008/09/25 04:02:38 tbox Exp $ */
 
 /*! \file */
 
@@ -1405,7 +1405,7 @@ evaluate_ttl(char *cmdline) {
                default_ttl_set = ISC_FALSE;
                return (STATUS_MORE);
        }
- 
+
        result = isc_parse_uint32(&ttl, word, 10);
        if (result != ISC_R_SUCCESS)
                return (STATUS_SYNTAX);

diff --git a/bin/tests/Makefile.in b/bin/tests/Makefile.in
index 889919a93b119631775b8f854f5965c43ecec569..93b63f1c8df5ebc9b1bd43e5116d7ceb0d7553e8 100644 (file)
--- a/bin/tests/Makefile.in
+++ b/bin/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -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.130 2008/09/24 02:46:21 marka Exp $
+# $Id: Makefile.in,v 1.131 2008/09/25 04:02:38 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/bin/tests/db_test.c b/bin/tests/db_test.c
index 8879ac980e42e1296d90aa4e339b34954b4d1b83..9b0d90d2b24730641d6b50a1010252d52ea20e5a 100644 (file)
--- a/bin/tests/db_test.c
+++ b/bin/tests/db_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,9 +15,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: db_test.c,v 1.65 2008/09/24 02:46:21 marka Exp $ */
+/* $Id: db_test.c,v 1.66 2008/09/25 04:02:38 tbox Exp $ */
 
-/*! \file 
+/*! \file
  * \author
  * Principal Author: Bob Halley
  */
@@ -385,7 +385,7 @@ main(int argc, char *argv[]) {
        RUNTIME_CHECK(dns_dbtable_create(mctx, dns_rdataclass_in, &dbtable) ==
                      ISC_R_SUCCESS);
 
-       
+
 
        strcpy(dbtype, "rbt");
        while ((ch = isc_commandline_parse(argc, argv, "c:d:t:z:P:Q:glpqvT"))
@@ -404,7 +404,7 @@ main(int argc, char *argv[]) {
                case 'g':
                        options |= (DNS_DBFIND_GLUEOK|DNS_DBFIND_VALIDATEGLUE);
                        break;
-               case 'l':
+               case 'l':
                        RUNTIME_CHECK(isc_log_create(mctx, &lctx,
                                                     NULL) == ISC_R_SUCCESS);
                        isc_log_setcontext(lctx);

diff --git a/bin/tests/journalprint.c b/bin/tests/journalprint.c
index 0d0dcb506587ac7ae4b7b1dab504f5b8f472ae0a..d8bd72b38b224bf9f1898d33af0a1ad03a89a9cd 100644 (file)
--- a/bin/tests/journalprint.c
+++ b/bin/tests/journalprint.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: journalprint.c,v 1.13 2008/09/25 02:01:45 marka Exp $ */
+/* $Id: journalprint.c,v 1.14 2008/09/25 04:02:38 tbox Exp $ */
 
 /*! \file */
 #include <config.h>
@@ -50,9 +50,9 @@ setup_logging(isc_mem_t *mctx, FILE *errout, isc_log_t **logp) {
        destination.file.versions = ISC_LOG_ROLLNEVER;
        destination.file.maximum_size = 0;
        RUNTIME_CHECK(isc_log_createchannel(logconfig, "stderr",
-                                           ISC_LOG_TOFILEDESC,
-                                           ISC_LOG_DYNAMIC,
-                                           &destination, 0) == ISC_R_SUCCESS);
+                                           ISC_LOG_TOFILEDESC,
+                                           ISC_LOG_DYNAMIC,
+                                           &destination, 0) == ISC_R_SUCCESS);
        RUNTIME_CHECK(isc_log_usechannel(logconfig, "stderr",
                                         NULL, NULL) == ISC_R_SUCCESS);
 

diff --git a/bin/tests/nsec3hash.c b/bin/tests/nsec3hash.c
index 4c6f892eada410b15e7d7e88141ac3be46c33e5f..287330f92680618a7640234d57cb5fce5cdb356b 100644 (file)
--- a/bin/tests/nsec3hash.c
+++ b/bin/tests/nsec3hash.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2006, 2008  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsec3hash.c,v 1.2 2008/09/24 02:46:21 marka Exp $ */
+/* $Id: nsec3hash.c,v 1.3 2008/09/25 04:02:38 tbox Exp $ */
 
 #include <config.h>
 
@@ -38,20 +38,20 @@ const char *program = "nsec3hash";
 
 static void
 fatal(const char *format, ...) {
-        va_list args;
+       va_list args;
 
-        fprintf(stderr, "%s: ", program);
-        va_start(args, format);
-        vfprintf(stderr, format, args);
-        va_end(args);
-        fprintf(stderr, "\n");
-        exit(1);
+       fprintf(stderr, "%s: ", program);
+       va_start(args, format);
+       vfprintf(stderr, format, args);
+       va_end(args);
+       fprintf(stderr, "\n");
+       exit(1);
 }
 
 static void
 check_result(isc_result_t result, const char *message) {
-        if (result != ISC_R_SUCCESS)
-                fatal("%s: %s", message, isc_result_totext(result));
+       if (result != ISC_R_SUCCESS)
+               fatal("%s: %s", message, isc_result_totext(result));
 }
 
 static void
@@ -59,7 +59,7 @@ usage() {
        fatal("salt hash iterations domain");
 }
 
-int 
+int
 main(int argc, char **argv) {
        dns_fixedname_t fixed;
        dns_name_t *name;
@@ -112,6 +112,6 @@ main(int argc, char **argv) {
        isc_buffer_init(&buffer, text, sizeof(text));
        isc_base32hex_totext(&region, 1, "", &buffer);
        fprintf(stdout, "%.*s (salt=%s, hash=%u, iterations=%u)\n",
-               (int)isc_buffer_usedlength(&buffer), text, argv[1], hash_alg, iterations);
+               (int)isc_buffer_usedlength(&buffer), text, argv[1], hash_alg, iterations);
        exit(0);
 }

diff --git a/bin/tests/nsecify.c b/bin/tests/nsecify.c
index afc3a7ef8fa0f7b4a2d78774830979c20a502e38..2e055c66d5f6eb7a7e19d1b94d32e0c3daebdeb2 100644 (file)
--- a/bin/tests/nsecify.c
+++ b/bin/tests/nsecify.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsecify.c,v 1.7 2008/09/24 02:46:21 marka Exp $ */
+/* $Id: nsecify.c,v 1.8 2008/09/25 04:02:38 tbox Exp $ */
 
 #include <config.h>
 

diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in
index 306990a44aa799a94c174200954a50cb18651f5c..ef8fc582a4df4a94c8b7a1ae08f0e9cf16c32d6b 100644 (file)
--- a/bin/tests/system/Makefile.in
+++ b/bin/tests/system/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -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 2008/09/24 02:46:21 marka Exp $
+# $Id: Makefile.in,v 1.31 2008/09/25 04:02:38 tbox Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@

diff --git a/bin/tests/system/dnssec/clean.sh b/bin/tests/system/dnssec/clean.sh
index 333a72258b50210ada54880d04f14222679b0a8d..3f207d5c6a28dde877334af11ceceacefab69ea5 100644 (file)
--- a/bin/tests/system/dnssec/clean.sh
+++ b/bin/tests/system/dnssec/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2002  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.22 2008/09/24 02:46:21 marka Exp $
+# $Id: clean.sh,v 1.23 2008/09/25 04:02:38 tbox Exp $
 
 rm -f */K* */keyset-* */dsset-* */dlvset-* */signedkey-* */*.signed */trusted.conf */tmp* */*.jnl */*.bk
 rm -f ns1/root.db ns2/example.db ns3/secure.example.db

diff --git a/bin/tests/system/dnssec/ns1/sign.sh b/bin/tests/system/dnssec/ns1/sign.sh
index bb5977d8861b0cec8ef2498b709bf4f33c19cd2f..9bc0dddaf1c391b9231379738c93f1032c4b3b2e 100644 (file)
--- a/bin/tests/system/dnssec/ns1/sign.sh
+++ b/bin/tests/system/dnssec/ns1/sign.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2006, 2007  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2006-2008  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: sign.sh,v 1.24 2008/09/24 02:46:21 marka Exp $
+# $Id: sign.sh,v 1.25 2008/09/25 04:02:38 tbox Exp $
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/dnssec/ns2/child.nsec3.example.db b/bin/tests/system/dnssec/ns2/child.nsec3.example.db
index e165ccbcd4f7e02eb49d2a73432af6f9b3a93f04..c432b0626342bebd904671ab8032a0b2aab10c5e 100644 (file)
--- a/bin/tests/system/dnssec/ns2/child.nsec3.example.db
+++ b/bin/tests/system/dnssec/ns2/child.nsec3.example.db
@@ -1,4 +1,4 @@
-; Copyright (C) 2006  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2006, 2008  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: child.nsec3.example.db,v 1.2 2008/09/24 02:46:21 marka Exp $
+; $Id: child.nsec3.example.db,v 1.3 2008/09/25 04:02:38 tbox Exp $
 
 $TTL 300       ; 5 minutes
 @                      IN SOA  mname1. . (

diff --git a/bin/tests/system/dnssec/ns2/child.optout.example.db b/bin/tests/system/dnssec/ns2/child.optout.example.db
index adc5164e94bb0de4a831f5362e31becd0cfe8b4e..feb73a433b95f389a392789e8261d120aa2dab5f 100644 (file)
--- a/bin/tests/system/dnssec/ns2/child.optout.example.db
+++ b/bin/tests/system/dnssec/ns2/child.optout.example.db
@@ -1,4 +1,4 @@
-; Copyright (C) 2006  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2006, 2008  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: child.optout.example.db,v 1.2 2008/09/24 02:46:21 marka Exp $
+; $Id: child.optout.example.db,v 1.3 2008/09/25 04:02:38 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 b8a8bc07e3e68fa69d246435a506bbf6684994bf..c2b5e987a7e7eb66b74fd734df17c9f07d690df6 100644 (file)
--- a/bin/tests/system/dnssec/ns2/example.db.in
+++ b/bin/tests/system/dnssec/ns2/example.db.in
@@ -1,4 +1,4 @@
-; Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2004, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000-2002  Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
@@ -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.18 2008/09/24 02:46:21 marka Exp $
+; $Id: example.db.in,v 1.19 2008/09/25 04:02:38 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 bc7f51c8b9f54bca45997715de2d6e92847b5797..3160413010a5839743e26fa96aa33e93437fa73e 100644 (file)
--- a/bin/tests/system/dnssec/ns2/named.conf
+++ b/bin/tests/system/dnssec/ns2/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2006, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006-2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.29 2008/09/24 02:46:21 marka Exp $ */
+/* $Id: named.conf,v 1.30 2008/09/25 04:02:38 tbox Exp $ */
 
 // NS2
 

diff --git a/bin/tests/system/dnssec/ns2/sign.sh b/bin/tests/system/dnssec/ns2/sign.sh
index 72e8f106fbfec6281cc785fcbd55090fb3fb2ef5..4389678cd45b1331ccd61ba9bf7c1ad20a99fabe 100644 (file)
--- a/bin/tests/system/dnssec/ns2/sign.sh
+++ b/bin/tests/system/dnssec/ns2/sign.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2006, 2007  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2006-2008  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: sign.sh,v 1.29 2008/09/24 02:46:21 marka Exp $
+# $Id: sign.sh,v 1.30 2008/09/25 04:02:38 tbox Exp $
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/dnssec/ns3/multiple.example.db.in b/bin/tests/system/dnssec/ns3/multiple.example.db.in
index 5416ddbcf66b6ccc38db76285c6957632292c3d1..c805a3e806e08a9620b6af268b9d91d002ab89df 100644 (file)
--- a/bin/tests/system/dnssec/ns3/multiple.example.db.in
+++ b/bin/tests/system/dnssec/ns3/multiple.example.db.in
@@ -1,4 +1,4 @@
-; Copyright (C) 2006  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2006, 2008  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: multiple.example.db.in,v 1.2 2008/09/24 02:46:21 marka Exp $
+; $Id: multiple.example.db.in,v 1.3 2008/09/25 04:02:38 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 4e340c16d01d9782fab91d47834936475485951b..38f4ad022d51dd77be7fa1893ee6b11596576443 100644 (file)
--- a/bin/tests/system/dnssec/ns3/named.conf
+++ b/bin/tests/system/dnssec/ns3/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2006, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006-2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.32 2008/09/24 02:46:21 marka Exp $ */
+/* $Id: named.conf,v 1.33 2008/09/25 04:02:38 tbox Exp $ */
 
 // NS3
 

diff --git a/bin/tests/system/dnssec/ns3/nsec3-unknown.example.db.in b/bin/tests/system/dnssec/ns3/nsec3-unknown.example.db.in
index c0a3bf81b8176477af21beda814f9a3b2f43429a..ffdd3e30c6a61aa3704a8e64211824cec171cd5a 100644 (file)
--- a/bin/tests/system/dnssec/ns3/nsec3-unknown.example.db.in
+++ b/bin/tests/system/dnssec/ns3/nsec3-unknown.example.db.in
@@ -1,4 +1,4 @@
-; Copyright (C) 2006  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2006, 2008  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: nsec3-unknown.example.db.in,v 1.2 2008/09/24 02:46:21 marka Exp $
+; $Id: nsec3-unknown.example.db.in,v 1.3 2008/09/25 04:02:38 tbox Exp $
 
 $TTL 300       ; 5 minutes
 @                      IN SOA  mname1. . (

diff --git a/bin/tests/system/dnssec/ns3/nsec3.example.db.in b/bin/tests/system/dnssec/ns3/nsec3.example.db.in
index 660a1b60f981e3a7b2d136f63542ef208aeddcc4..97ac59c47afe23208e14e8c61db64370cd7eda2d 100644 (file)
--- a/bin/tests/system/dnssec/ns3/nsec3.example.db.in
+++ b/bin/tests/system/dnssec/ns3/nsec3.example.db.in
@@ -1,4 +1,4 @@
-; Copyright (C) 2006  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2006, 2008  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: nsec3.example.db.in,v 1.2 2008/09/24 02:46:21 marka Exp $
+; $Id: nsec3.example.db.in,v 1.3 2008/09/25 04:02:38 tbox Exp $
 
 $TTL 300       ; 5 minutes
 @                      IN SOA  mname1. . (

diff --git a/bin/tests/system/dnssec/ns3/nsec3.nsec3.example.db.in b/bin/tests/system/dnssec/ns3/nsec3.nsec3.example.db.in
index 461d7d7566cdfa720e7b08aa62b81457da3bd754..ca5b6e82391e66bacb2943d6254bc6d042fa3005 100644 (file)
--- a/bin/tests/system/dnssec/ns3/nsec3.nsec3.example.db.in
+++ b/bin/tests/system/dnssec/ns3/nsec3.nsec3.example.db.in
@@ -1,5 +1,4 @@
-; Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) 2000, 2001  Internet Software Consortium.
+; Copyright (C) 2008  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
@@ -13,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: nsec3.nsec3.example.db.in,v 1.2 2008/09/24 02:46:21 marka Exp $
+; $Id: nsec3.nsec3.example.db.in,v 1.3 2008/09/25 04:02:38 tbox Exp $
 
 $TTL 300       ; 5 minutes
 @                      IN SOA  mname1. . (

diff --git a/bin/tests/system/dnssec/ns3/nsec3.optout.example.db.in b/bin/tests/system/dnssec/ns3/nsec3.optout.example.db.in
index 10d7b9319e52d8eae5cec7dd777df6e81057f6dc..fd766e775da6864a32479e12960cdeabd7336287 100644 (file)
--- a/bin/tests/system/dnssec/ns3/nsec3.optout.example.db.in
+++ b/bin/tests/system/dnssec/ns3/nsec3.optout.example.db.in
@@ -1,5 +1,4 @@
-; Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) 2000, 2001  Internet Software Consortium.
+; Copyright (C) 2008  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
@@ -13,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: nsec3.optout.example.db.in,v 1.2 2008/09/24 02:46:21 marka Exp $
+; $Id: nsec3.optout.example.db.in,v 1.3 2008/09/25 04:02:38 tbox Exp $
 
 $TTL 300       ; 5 minutes
 @                      IN SOA  mname1. . (

diff --git a/bin/tests/system/dnssec/ns3/optout-unknown.example.db.in b/bin/tests/system/dnssec/ns3/optout-unknown.example.db.in
index f6d5cefc097460a1bfd39b03eab06e6ce09cf6fe..b001555b5db81e7e14fa2647e716262624e2add2 100644 (file)
--- a/bin/tests/system/dnssec/ns3/optout-unknown.example.db.in
+++ b/bin/tests/system/dnssec/ns3/optout-unknown.example.db.in
@@ -1,4 +1,4 @@
-; Copyright (C) 2006  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2006, 2008  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: optout-unknown.example.db.in,v 1.2 2008/09/24 02:46:21 marka Exp $
+; $Id: optout-unknown.example.db.in,v 1.3 2008/09/25 04:02:38 tbox Exp $
 
 $TTL 300       ; 5 minutes
 @                      IN SOA  mname1. . (

diff --git a/bin/tests/system/dnssec/ns3/optout.example.db.in b/bin/tests/system/dnssec/ns3/optout.example.db.in
index f661307ac16c298e3f4dcaf0430543cd41ece654..e41d15b9afd92538075ed7e9a899a531c69ea93a 100644 (file)
--- a/bin/tests/system/dnssec/ns3/optout.example.db.in
+++ b/bin/tests/system/dnssec/ns3/optout.example.db.in
@@ -1,4 +1,4 @@
-; Copyright (C) 2006  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2006, 2008  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: optout.example.db.in,v 1.2 2008/09/24 02:46:21 marka Exp $
+; $Id: optout.example.db.in,v 1.3 2008/09/25 04:02:38 tbox Exp $
 
 $TTL 300       ; 5 minutes
 @                      IN SOA  mname1. . (

diff --git a/bin/tests/system/dnssec/ns3/optout.nsec3.example.db.in b/bin/tests/system/dnssec/ns3/optout.nsec3.example.db.in
index 560ead2bbd8f6cbfaf03c56b499fb84b116567d3..150c386f1ab543e730176d0a75b9bd99d010d424 100644 (file)
--- a/bin/tests/system/dnssec/ns3/optout.nsec3.example.db.in
+++ b/bin/tests/system/dnssec/ns3/optout.nsec3.example.db.in
@@ -1,5 +1,4 @@
-; Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) 2000, 2001  Internet Software Consortium.
+; Copyright (C) 2008  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
@@ -13,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: optout.nsec3.example.db.in,v 1.2 2008/09/24 02:46:21 marka Exp $
+; $Id: optout.nsec3.example.db.in,v 1.3 2008/09/25 04:02:38 tbox Exp $
 
 $TTL 300       ; 5 minutes
 @                      IN SOA  mname1. . (

diff --git a/bin/tests/system/dnssec/ns3/optout.optout.example.db.in b/bin/tests/system/dnssec/ns3/optout.optout.example.db.in
index e27019ad52e6bb7932f385b9fd64b4e9b0514485..91b5b899521f86bd051ed5034179baf1048b4993 100644 (file)
--- a/bin/tests/system/dnssec/ns3/optout.optout.example.db.in
+++ b/bin/tests/system/dnssec/ns3/optout.optout.example.db.in
@@ -1,5 +1,4 @@
-; Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) 2000, 2001  Internet Software Consortium.
+; Copyright (C) 2008  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
@@ -13,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: optout.optout.example.db.in,v 1.2 2008/09/24 02:46:21 marka Exp $
+; $Id: optout.optout.example.db.in,v 1.3 2008/09/25 04:02:38 tbox Exp $
 
 $TTL 300       ; 5 minutes
 @                      IN SOA  mname1. . (

diff --git a/bin/tests/system/dnssec/ns3/secure.example.db.in b/bin/tests/system/dnssec/ns3/secure.example.db.in
index 26e9f0ea69db5dfeec2ea205f3cdbf71e678f3e8..9cd4d6f881a995e396eacfc56e7facee1abb4432 100644 (file)
--- a/bin/tests/system/dnssec/ns3/secure.example.db.in
+++ b/bin/tests/system/dnssec/ns3/secure.example.db.in
@@ -1,4 +1,4 @@
-; Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2004, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
 ; Copyright (C) 2000, 2001  Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
@@ -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.12 2008/09/24 02:46:21 marka Exp $
+; $Id: secure.example.db.in,v 1.13 2008/09/25 04:02:38 tbox Exp $
 
 $TTL 300       ; 5 minutes
 @                      IN SOA  mname1. . (

diff --git a/bin/tests/system/dnssec/ns3/secure.nsec3.example.db.in b/bin/tests/system/dnssec/ns3/secure.nsec3.example.db.in
index 4241bef27471e625a6421382033f2846e0aede39..92e720b08665d5a25921dc981812e1fffc19792b 100644 (file)
--- a/bin/tests/system/dnssec/ns3/secure.nsec3.example.db.in
+++ b/bin/tests/system/dnssec/ns3/secure.nsec3.example.db.in
@@ -1,5 +1,4 @@
-; Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) 2000, 2001  Internet Software Consortium.
+; Copyright (C) 2008  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
@@ -13,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: secure.nsec3.example.db.in,v 1.2 2008/09/24 02:46:21 marka Exp $
+; $Id: secure.nsec3.example.db.in,v 1.3 2008/09/25 04:02:38 tbox Exp $
 
 $TTL 300       ; 5 minutes
 @                      IN SOA  mname1. . (

diff --git a/bin/tests/system/dnssec/ns3/secure.optout.example.db.in b/bin/tests/system/dnssec/ns3/secure.optout.example.db.in
index 29b29e725366b0617499a95c0d6e53a7e7d80c99..d1ac6afc3509c7ff2f8e3fab4032580735e0b048 100644 (file)
--- a/bin/tests/system/dnssec/ns3/secure.optout.example.db.in
+++ b/bin/tests/system/dnssec/ns3/secure.optout.example.db.in
@@ -1,5 +1,4 @@
-; Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) 2000, 2001  Internet Software Consortium.
+; Copyright (C) 2008  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
@@ -13,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: secure.optout.example.db.in,v 1.2 2008/09/24 02:46:21 marka Exp $
+; $Id: secure.optout.example.db.in,v 1.3 2008/09/25 04:02:38 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 6e1167936d1372a84cbf8abc4b238086060664bf..eb362aa9a561c7890a36530996c79d90fd886e83 100644 (file)
--- a/bin/tests/system/dnssec/ns3/sign.sh
+++ b/bin/tests/system/dnssec/ns3/sign.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2006, 2007  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2006-2008  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2002  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: sign.sh,v 1.24 2008/09/24 02:46:21 marka Exp $
+# $Id: sign.sh,v 1.25 2008/09/25 04:02:38 tbox Exp $
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/bin/tests/system/dnssec/ns7/named.conf b/bin/tests/system/dnssec/ns7/named.conf
index 622fffff3bcf9d9055b31edfe45b89049e194ddd..0b5ce8997970f894a1e825e9c35345645667fe7f 100644 (file)
--- a/bin/tests/system/dnssec/ns7/named.conf
+++ b/bin/tests/system/dnssec/ns7/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2006, 2008  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.2 2008/09/24 02:46:21 marka Exp $ */
+/* $Id: named.conf,v 1.3 2008/09/25 04:02:38 tbox Exp $ */
 
 // NS3
 

diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh
index cc129061266cc4cfa4aae41cabfc6221fb4b024e..57faa63787af7df864260a0e4c1f0ec5365b526c 100644 (file)
--- a/bin/tests/system/dnssec/tests.sh
+++ b/bin/tests/system/dnssec/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2002  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: tests.sh,v 1.52 2008/09/24 02:46:21 marka Exp $
+# $Id: tests.sh,v 1.53 2008/09/25 04:02:38 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

diff --git a/contrib/sdb/pgsql/zonetodb.c b/contrib/sdb/pgsql/zonetodb.c
index 8e0b8abd11bcdc4545fcc66f99dc388ade00d3c9..ba93027c41d8660d5efd112f9ab88e444a4aade7 100644 (file)
--- a/contrib/sdb/pgsql/zonetodb.c
+++ b/contrib/sdb/pgsql/zonetodb.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zonetodb.c,v 1.19 2008/09/24 02:46:21 marka Exp $ */
+/* $Id: zonetodb.c,v 1.20 2008/09/25 04:02:38 tbox Exp $ */
 
 #include <stdlib.h>
 #include <string.h>
@@ -102,7 +102,7 @@ addrdata(dns_name_t *name, dns_ttl_t ttl, dns_rdata_t *rdata) {
        check_result(result, "dns_name_totext");
        namearray[isc_buffer_usedlength(&b)] = 0;
        quotestring(namearray, canonnamearray);
-       
+
        isc_buffer_init(&b, typearray, sizeof(typearray) - 1);
        result = dns_rdatatype_totext(rdata->type, &b);
        check_result(result, "dns_rdatatype_totext");
@@ -114,7 +114,7 @@ addrdata(dns_name_t *name, dns_ttl_t ttl, dns_rdata_t *rdata) {
        check_result(result, "dns_rdata_totext");
        dataarray[isc_buffer_usedlength(&b)] = 0;
        quotestring(dataarray, canondataarray);
-       
+
        snprintf(str, sizeof(str),
                 "INSERT INTO %s (NAME, TTL, RDTYPE, RDATA)"
                 " VALUES ('%s', %d, '%s', '%s')",

diff --git a/lib/dns/gen.c b/lib/dns/gen.c
index 85d516fb4a17f6404e3cc8a19a447b44e5650d53..ede8bc0962c1efd4c6590b67da6ca363c4b86765 100644 (file)
--- a/lib/dns/gen.c
+++ b/lib/dns/gen.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: gen.c,v 1.82 2008/09/24 02:46:22 marka Exp $ */
+/* $Id: gen.c,v 1.83 2008/09/25 04:02:38 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/include/dns/keyvalues.h b/lib/dns/include/dns/keyvalues.h
index df72fdf362c5b7f95ab6342c4ff57606330964f4..7040389403668f9a967eedca490ac73b3427aecc 100644 (file)
--- a/lib/dns/include/dns/keyvalues.h
+++ b/lib/dns/include/dns/keyvalues.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: keyvalues.h,v 1.22 2008/09/24 02:46:23 marka Exp $ */
+/* $Id: keyvalues.h,v 1.23 2008/09/25 04:02:39 tbox Exp $ */
 
 #ifndef DNS_KEYVALUES_H
 #define DNS_KEYVALUES_H 1

diff --git a/lib/dns/include/dns/ncache.h b/lib/dns/include/dns/ncache.h
index f16970b6f1eb08757305438717d257ee5a1895e4..a818fe63cce54782484c659af369e99dca0e156a 100644 (file)
--- a/lib/dns/include/dns/ncache.h
+++ b/lib/dns/include/dns/ncache.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ncache.h,v 1.24 2008/09/24 02:46:23 marka Exp $ */
+/* $Id: ncache.h,v 1.25 2008/09/25 04:02:39 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 46071c965cc157eded22ee9df4f4844206f696f7..335a46346787dae735afc1d3a7e68d15c29863f7 100644 (file)
--- a/lib/dns/include/dns/nsec.h
+++ b/lib/dns/include/dns/nsec.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsec.h,v 1.11 2008/09/24 02:46:23 marka Exp $ */
+/* $Id: nsec.h,v 1.12 2008/09/25 04:02:39 tbox Exp $ */
 
 #ifndef DNS_NSEC_H
 #define DNS_NSEC_H 1
@@ -64,13 +64,13 @@ dns_nsec_typepresent(dns_rdata_t *nsec, dns_rdatatype_t type);
  *\li  'nsec' points to a valid rdataset of type NSEC
  */
 
-isc_result_t 
+isc_result_t
 dns_nsec_nseconly(dns_db_t *db, dns_dbversion_t *version,
-                  isc_boolean_t *answer);
+                 isc_boolean_t *answer);
 /*
  * Report whether the DNSKEY RRset has a NSEC only algorithm.  Unknown
  * algorithms are assumed to support NSEC3.
- * 
+ *
  * Requires:
  *     'answer' to be non NULL.
  */

diff --git a/lib/dns/include/dns/rbt.h b/lib/dns/include/dns/rbt.h
index 26f4979184ffe8e1dfca3772b8ee5d91ba676b5c..06b55d52c1dcf965f95238b1d34d430c9ae18c0c 100644 (file)
--- a/lib/dns/include/dns/rbt.h
+++ b/lib/dns/include/dns/rbt.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rbt.h,v 1.70 2008/09/24 02:46:23 marka Exp $ */
+/* $Id: rbt.h,v 1.71 2008/09/25 04:02:39 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 b72aa617a0563dd855ae659ebb7c562f89ed8777..94e831bfd54e532afc81551ade00959763d31891 100644 (file)
--- a/lib/dns/include/dns/rcode.h
+++ b/lib/dns/include/dns/rcode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rcode.h,v 1.20 2008/09/24 02:46:23 marka Exp $ */
+/* $Id: rcode.h,v 1.21 2008/09/25 04:02:39 tbox Exp $ */
 
 #ifndef DNS_RCODE_H
 #define DNS_RCODE_H 1

diff --git a/lib/dns/include/dns/rdatatype.h b/lib/dns/include/dns/rdatatype.h
index 9c299bddb56152fa9e456ee4b83df47975162af4..ba9a92c13f028b5ead7f1c0efa36241fcbfd5b60 100644 (file)
--- a/lib/dns/include/dns/rdatatype.h
+++ b/lib/dns/include/dns/rdatatype.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdatatype.h,v 1.25 2008/09/24 02:46:23 marka Exp $ */
+/* $Id: rdatatype.h,v 1.26 2008/09/25 04:02:39 tbox Exp $ */
 
 #ifndef DNS_RDATATYPE_H
 #define DNS_RDATATYPE_H 1

diff --git a/lib/dns/include/dns/result.h b/lib/dns/include/dns/result.h
index c2feeabf845f69c7736c24e500c84ba5184781db..ed29bcd5d3f6000787502c72748b903a4f9052c3 100644 (file)
--- a/lib/dns/include/dns/result.h
+++ b/lib/dns/include/dns/result.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: result.h,v 1.115 2008/09/24 02:46:23 marka Exp $ */
+/* $Id: result.h,v 1.116 2008/09/25 04:02:39 tbox Exp $ */
 
 #ifndef DNS_RESULT_H
 #define DNS_RESULT_H 1

diff --git a/lib/dns/include/dns/validator.h b/lib/dns/include/dns/validator.h
index 1909297b1827e96d5d034ee283f8af1154543dd9..0a2417b8ed04200749e5126445143360ec66df2f 100644 (file)
--- a/lib/dns/include/dns/validator.h
+++ b/lib/dns/include/dns/validator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: validator.h,v 1.40 2008/09/24 02:46:23 marka Exp $ */
+/* $Id: validator.h,v 1.41 2008/09/25 04:02:39 tbox Exp $ */
 
 #ifndef DNS_VALIDATOR_H
 #define DNS_VALIDATOR_H 1

diff --git a/lib/dns/ncache.c b/lib/dns/ncache.c
index b833f9154718a116f31f8094c3cb77a40aa95292..af0450b525dc594fa353b46a2083be7a6e0997bb 100644 (file)
--- a/lib/dns/ncache.c
+++ b/lib/dns/ncache.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ncache.c,v 1.42 2008/09/24 02:46:22 marka Exp $ */
+/* $Id: ncache.c,v 1.43 2008/09/25 04:02:38 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/dns/nsec.c b/lib/dns/nsec.c
index ad26015a29a9c12995ac25ca1b0837f2d94f81f4..53a3b5e041781486d7c2ebedb4ddce414e660722 100644 (file)
--- a/lib/dns/nsec.c
+++ b/lib/dns/nsec.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsec.c,v 1.10 2008/09/24 02:46:22 marka Exp $ */
+/* $Id: nsec.c,v 1.11 2008/09/25 04:02:38 tbox Exp $ */
 
 /*! \file */
 
@@ -240,7 +240,7 @@ dns_nsec_nseconly(dns_db_t *db, dns_dbversion_t *version,
        result = dns_db_getoriginnode(db, &node);
        if (result != ISC_R_SUCCESS)
                return (result);
-       
+
        result = dns_db_findrdataset(db, node, version, dns_rdatatype_dnskey,
                                     0, 0, &rdataset, NULL);
        dns_db_detachnode(db, &node);

diff --git a/lib/dns/nsec3.c b/lib/dns/nsec3.c
index 84392fb144683f0eefe7301c7fc09101b1d440a1..e2837091691a2046a0e374af3d120200e633930e 100644 (file)
--- a/lib/dns/nsec3.c
+++ b/lib/dns/nsec3.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2006, 2008  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsec3.c,v 1.3 2008/09/24 16:33:27 each Exp $ */
+/* $Id: nsec3.c,v 1.4 2008/09/25 04:02:38 tbox Exp $ */
 
 #include <config.h>
 
@@ -101,7 +101,7 @@ dns_nsec3_buildrdata(dns_db_t *db, dns_dbversion_t *version,
 
        switch (hashalg) {
        case dns_hash_sha1:
-               REQUIRE(hash_length == ISC_SHA1_DIGESTLENGTH); 
+               REQUIRE(hash_length == ISC_SHA1_DIGESTLENGTH);
                break;
        }
 
@@ -215,7 +215,7 @@ dns_nsec3_typepresent(dns_rdata_t *rdata, dns_rdatatype_t type) {
        /* This should never fail */
        result = dns_rdata_tostruct(rdata, &nsec3, NULL);
        INSIST(result == ISC_R_SUCCESS);
-       
+
        present = ISC_FALSE;
        for (i = 0; i < nsec3.len; i += len) {
                INSIST(i + 2 <= nsec3.len);
@@ -309,7 +309,7 @@ dns_nsec3_supportedhash(dns_hash_t hash) {
  */
 static isc_result_t
 do_one_tuple(dns_difftuple_t **tuple, dns_db_t *db, dns_dbversion_t *ver,
-             dns_diff_t *diff)
+            dns_diff_t *diff)
 {
        dns_diff_t temp_diff;
        isc_result_t result;
@@ -347,9 +347,9 @@ do_one_tuple(dns_difftuple_t **tuple, dns_db_t *db, dns_dbversion_t *ver,
  */
 static isc_result_t
 name_exists(dns_db_t *db, dns_dbversion_t *version, dns_name_t *name,
-            isc_boolean_t *exists)
+           isc_boolean_t *exists)
 {
-        isc_result_t result;
+       isc_result_t result;
        dns_dbnode_t *node = NULL;
        dns_rdatasetiter_t *iter = NULL;
 
@@ -383,7 +383,7 @@ name_exists(dns_db_t *db, dns_dbversion_t *version, dns_name_t *name,
 
 static isc_boolean_t
 match_nsec3param(const dns_rdata_nsec3_t *nsec3,
-                const dns_rdata_nsec3param_t *nsec3param)
+                const dns_rdata_nsec3param_t *nsec3param)
 {
        if (nsec3->hash == nsec3param->hash &&
            nsec3->iterations == nsec3param->iterations &&
@@ -415,7 +415,7 @@ delete(dns_db_t *db, dns_dbversion_t *version, dns_name_t *name,
 
        dns_rdataset_init(&rdataset);
        result = dns_db_findrdataset(db, node, version, dns_rdatatype_nsec3, 0,
-                                     (isc_stdtime_t) 0, &rdataset, NULL);
+                                    (isc_stdtime_t) 0, &rdataset, NULL);
 
        if (result == ISC_R_NOTFOUND) {
                result = ISC_R_SUCCESS;
@@ -434,7 +434,7 @@ delete(dns_db_t *db, dns_dbversion_t *version, dns_name_t *name,
 
                if (!match_nsec3param(&nsec3, nsec3param))
                        continue;
-               
+
                result = dns_difftuple_create(diff->mctx, DNS_DIFFOP_DEL, name,
                                              rdataset.ttl, &rdata, &tuple);
                if (result != ISC_R_SUCCESS)
@@ -718,7 +718,7 @@ dns_nsec3_addnsec3(dns_db_t *db, dns_dbversion_t *version,
                                   salt, salt_length, nexthash, next_length,
                                   nsec3buf, &rdata));
        dns_db_detachnode(db, &node);
-       
+
        /*
         * Delete the old NSEC3 and record the change.
         */
@@ -943,7 +943,7 @@ dns_nsec3_addnsec3s(dns_db_t *db, dns_dbversion_t *version,
 
 isc_result_t
 dns_nsec3_delnsec3(dns_db_t *db, dns_dbversion_t *version, dns_name_t *name,
-                   const dns_rdata_nsec3param_t *nsec3param, dns_diff_t *diff)
+                  const dns_rdata_nsec3param_t *nsec3param, dns_diff_t *diff)
 {
        dns_dbiterator_t *dbit = NULL;
        dns_dbnode_t *node = NULL;
@@ -1119,7 +1119,7 @@ dns_nsec3_delnsec3(dns_db_t *db, dns_dbversion_t *version, dns_name_t *name,
                if (result != ISC_R_SUCCESS)
                        goto failure;
 
-               result = find_nsec3(&nsec3, &rdataset, nsec3param); 
+               result = find_nsec3(&nsec3, &rdataset, nsec3param);
                if (result == ISC_R_SUCCESS) {
                        next_length = nsec3.next_length;
                        INSIST(next_length <= sizeof(nexthash));
@@ -1147,7 +1147,7 @@ dns_nsec3_delnsec3(dns_db_t *db, dns_dbversion_t *version, dns_name_t *name,
                        dns_db_detachnode(db, &node);
                        if (result != ISC_R_SUCCESS)
                                continue;
-                       result = find_nsec3(&nsec3, &rdataset, nsec3param); 
+                       result = find_nsec3(&nsec3, &rdataset, nsec3param);
                        if (result == ISC_R_NOMORE) {
                                dns_rdataset_disassociate(&rdataset);
                                continue;

diff --git a/lib/dns/rcode.c b/lib/dns/rcode.c
index 1e61ff89eb0eb6a840f69f86d663db5cc1a1aeb4..58ade8587e8cdefe4982718b3360e75a1d754391 100644 (file)
--- a/lib/dns/rcode.c
+++ b/lib/dns/rcode.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rcode.c,v 1.7 2008/09/24 02:46:22 marka Exp $ */
+/* $Id: rcode.c,v 1.8 2008/09/25 04:02:38 tbox Exp $ */
 
 #include <config.h>
 #include <ctype.h>

diff --git a/lib/dns/rdata/generic/nsec3_50.c b/lib/dns/rdata/generic/nsec3_50.c
index 89d34f9e83177c9c0a8f43883546a8c1d27fb396..3d7945145c24bbbb1e917d463efa5afd11d15b98 100644 (file)
--- a/lib/dns/rdata/generic/nsec3_50.c
+++ b/lib/dns/rdata/generic/nsec3_50.c
@@ -1,8 +1,7 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2003  Internet Software Consortium.
+ * Copyright (C) 2008  Internet Systems Consortium, Inc. ("ISC")
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
@@ -15,6 +14,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+/* $Id: nsec3_50.c,v 1.4 2008/09/25 04:02:39 tbox Exp $ */
+
 /*
  * Copyright (C) 2004  Nominet, Ltd.
  *
@@ -170,7 +171,7 @@ totext_nsec3(ARGS_TOTEXT) {
        j = uint8_fromregion(&sr);
        isc_region_consume(&sr, 1);
        INSIST(j <= sr.length);
-       
+
        if (j != 0) {
                i = sr.length;
                sr.length = j;
@@ -356,7 +357,7 @@ fromstruct_nsec3(ARGS_FROMSTRUCT) {
                window = nsec3->typebits[i];
                len = nsec3->typebits[i+1];
                i += 2;
-               INSIST(first || window > lastwindow); 
+               INSIST(first || window > lastwindow);
                INSIST(len > 0 && len <= 32);
                INSIST(i + len <= nsec3->len);
                INSIST(nsec3->typebits[i + len - 1] != 0);

diff --git a/lib/dns/rdata/generic/nsec3_50.h b/lib/dns/rdata/generic/nsec3_50.h
index 1140f36e601c1f4c276c48831cb9f5f7685fa121..658dd9d6e889d2bd4a9c0dbec61561426ad1c0d4 100644 (file)
--- a/lib/dns/rdata/generic/nsec3_50.h
+++ b/lib/dns/rdata/generic/nsec3_50.h
@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2004  Nominet, Ltd.
+ * Copyright (C) 2008  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.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND NOMINET DISCLAIMS ALL WARRANTIES WITH
+ * 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
@@ -18,7 +18,7 @@
 #ifndef GENERIC_NSEC3_50_H
 #define GENERIC_NSEC3_50_H 1
 
-/* $Id: nsec3_50.h,v 1.3 2008/09/24 02:46:23 marka Exp $ */
+/* $Id: nsec3_50.h,v 1.4 2008/09/25 04:02:39 tbox Exp $ */
 
 /*!
  * \brief Per RFC 5155 */
@@ -77,7 +77,7 @@ typedef struct dns_rdata_nsec3 {
 /*%
  * Non-standard, NSEC3PARAM only.
  *
- * Used to identify NSEC3PARAM records added in this UPDATE request. 
+ * Used to identify NSEC3PARAM records added in this UPDATE request.
  */
 #define DNS_NSEC3FLAG_UPDATE 0x20U
 

diff --git a/lib/dns/rdata/generic/nsec3param_51.c b/lib/dns/rdata/generic/nsec3param_51.c
index 5ab3b220d82aca9e43aec2c77e610de3f0be03d6..90de7248f8bd9c08d8480f5355aa0d4fcae11e00 100644 (file)
--- a/lib/dns/rdata/generic/nsec3param_51.c
+++ b/lib/dns/rdata/generic/nsec3param_51.c
@@ -1,8 +1,7 @@
 /*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2003  Internet Software Consortium.
+ * Copyright (C) 2008  Internet Systems Consortium, Inc. ("ISC")
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
@@ -15,6 +14,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+/* $Id: nsec3param_51.c,v 1.4 2008/09/25 04:02:39 tbox Exp $ */
+
 /*
  * Copyright (C) 2004  Nominet, Ltd.
  *
@@ -128,7 +129,7 @@ totext_nsec3param(ARGS_TOTEXT) {
        j = uint8_fromregion(&sr);
        isc_region_consume(&sr, 1);
        INSIST(j <= sr.length);
-       
+
        if (j != 0) {
                i = sr.length;
                sr.length = j;

diff --git a/lib/dns/rdata/generic/nsec3param_51.h b/lib/dns/rdata/generic/nsec3param_51.h
index 2ae6a9c74e45bc0a08213baf99012de06b11c069..2efd7e6cf06882f6d84e0b60fc8254597b6ae2bb 100644 (file)
--- a/lib/dns/rdata/generic/nsec3param_51.h
+++ b/lib/dns/rdata/generic/nsec3param_51.h
@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2004  Nominet, Ltd.
+ * Copyright (C) 2008  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.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND NOMINET DISCLAIMS ALL WARRANTIES WITH
+ * 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
@@ -18,7 +18,7 @@
 #ifndef GENERIC_NSEC3PARAM_51_H
 #define GENERIC_NSEC3PARAM_51_H 1
 
-/* $Id: nsec3param_51.h,v 1.3 2008/09/24 02:46:23 marka Exp $ */
+/* $Id: nsec3param_51.h,v 1.4 2008/09/25 04:02:39 tbox Exp $ */
 
 /*!
  * \brief Per RFC 5155 */

diff --git a/lib/dns/rdatalist_p.h b/lib/dns/rdatalist_p.h
index 65d9235e131d644ae06fc5a54bd00b2c1288e2ff..3e73e20aa5adf2ba72cdec65d41dac3f039fc532 100644 (file)
--- a/lib/dns/rdatalist_p.h
+++ b/lib/dns/rdatalist_p.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdatalist_p.h,v 1.10 2008/09/24 02:46:22 marka Exp $ */
+/* $Id: rdatalist_p.h,v 1.11 2008/09/25 04:02:38 tbox Exp $ */
 
 #ifndef DNS_RDATALIST_P_H
 #define DNS_RDATALIST_P_H

diff --git a/lib/dns/result.c b/lib/dns/result.c
index 1f940e54a7d85a5a31678768de3d7b043c694c55..54c70e0e9088f673d8e7582278b649988808682d 100644 (file)
--- a/lib/dns/result.c
+++ b/lib/dns/result.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: result.c,v 1.124 2008/09/24 02:46:22 marka Exp $ */
+/* $Id: result.c,v 1.125 2008/09/25 04:02:38 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/buffer.c b/lib/isc/buffer.c
index 25fde0c2240e824ee5c93eb88685ae11e8763f59..1b59e650acdec237559b82f91799a1b264a26465 100644 (file)
--- a/lib/isc/buffer.c
+++ b/lib/isc/buffer.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: buffer.c,v 1.48 2008/09/24 02:46:23 marka Exp $ */
+/* $Id: buffer.c,v 1.49 2008/09/25 04:02:39 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/commandline.c b/lib/isc/commandline.c
index af7ca184e889027b30d89b9d043b60b058a3073b..aca1203ce338a12a38242c55f398ba73db53ce5d 100644 (file)
--- a/lib/isc/commandline.c
+++ b/lib/isc/commandline.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004, 2005, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -48,7 +48,7 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: commandline.c,v 1.21 2008/09/24 02:46:23 marka Exp $ */
+/* $Id: commandline.c,v 1.22 2008/09/25 04:02:39 tbox Exp $ */
 
 /*! \file
  * This file was adapted from the NetBSD project's source tree, RCS ID:

diff --git a/lib/isc/hex.c b/lib/isc/hex.c
index 94c2b56cbdf37a8d6b10f463d1bf1d645b762c31..3fa0e699fa553c49c0d5e07d1b50726cce532b8b 100644 (file)
--- a/lib/isc/hex.c
+++ b/lib/isc/hex.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: hex.c,v 1.19 2008/09/24 02:46:23 marka Exp $ */
+/* $Id: hex.c,v 1.20 2008/09/25 04:02:39 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isc/include/isc/base32.h b/lib/isc/include/isc/base32.h
index 2d9779d8b212c5feec58d38621fae7ec51c2ac83..978a8db463ae2737308f77d50afdbd3fc7a3c690 100644 (file)
--- a/lib/isc/include/isc/base32.h
+++ b/lib/isc/include/isc/base32.h
@@ -1,8 +1,7 @@
 /*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 1999-2001  Internet Software Consortium.
+ * Copyright (C) 2008  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 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: base32.h,v 1.2 2008/09/24 02:46:23 marka Exp $ */
+/* $Id: base32.h,v 1.3 2008/09/25 04:02:39 tbox Exp $ */
 
 #ifndef ISC_BASE32_H
 #define ISC_BASE32_H 1

diff --git a/lib/isc/include/isc/buffer.h b/lib/isc/include/isc/buffer.h
index c531fa0277295bedfc2501e80018249ff804ad70..2a02d88e4e8e7e263b29f4ad9d45f2f12e3f8ff1 100644 (file)
--- a/lib/isc/include/isc/buffer.h
+++ b/lib/isc/include/isc/buffer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: buffer.h,v 1.52 2008/09/24 02:46:23 marka Exp $ */
+/* $Id: buffer.h,v 1.53 2008/09/25 04:02:39 tbox Exp $ */
 
 #ifndef ISC_BUFFER_H
 #define ISC_BUFFER_H 1

diff --git a/lib/isc/include/isc/hex.h b/lib/isc/include/isc/hex.h
index da8bd07901348758dda2fd524b6c81faa7069b50..a5e2f532d91b02ff121f94ec86e85bdab96e556d 100644 (file)
--- a/lib/isc/include/isc/hex.h
+++ b/lib/isc/include/isc/hex.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: hex.h,v 1.12 2008/09/24 02:46:23 marka Exp $ */
+/* $Id: hex.h,v 1.13 2008/09/25 04:02:39 tbox Exp $ */
 
 #ifndef ISC_HEX_H
 #define ISC_HEX_H 1

diff --git a/lib/isc/include/isc/iterated_hash.h b/lib/isc/include/isc/iterated_hash.h
index 01ecc2e027553ae6f98feb6fffd51a32e4edfd70..a8173f0ab22fea86333f00f4c04d8f983ab3a9af 100644 (file)
--- a/lib/isc/include/isc/iterated_hash.h
+++ b/lib/isc/include/isc/iterated_hash.h
@@ -1,20 +1,20 @@
 /*
- * Copyright (C) 2004  Nominet, Ltd.
+ * Copyright (C) 2008  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.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND NOMINET DISCLAIMS ALL WARRANTIES WITH
+ * 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 NOMINET BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
  * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
  * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: iterated_hash.h,v 1.2 2008/09/24 02:46:23 marka Exp $ */
+/* $Id: iterated_hash.h,v 1.3 2008/09/25 04:02:39 tbox Exp $ */
 
 #ifndef ISC_ITERATED_HASH_H
 #define ISC_ITERATED_HASH_H 1

diff --git a/lib/isc/include/isc/result.h b/lib/isc/include/isc/result.h
index 9ddd0cf41564f478d60ce04bb1dfae361b321513..56b4ca6d691a837fc2086ea859a276a46c0f8757 100644 (file)
--- a/lib/isc/include/isc/result.h
+++ b/lib/isc/include/isc/result.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: result.h,v 1.70 2008/09/24 02:46:23 marka Exp $ */
+/* $Id: result.h,v 1.71 2008/09/25 04:02:39 tbox Exp $ */
 
 #ifndef ISC_RESULT_H
 #define ISC_RESULT_H 1

diff --git a/lib/isc/result.c b/lib/isc/result.c
index 331c56e33ab622272b38d5085b5762d16ffdd7af..571358054e8f9b60a75cafbcdde42f57f66f35e6 100644 (file)
--- a/lib/isc/result.c
+++ b/lib/isc/result.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: result.c,v 1.70 2008/09/24 02:46:23 marka Exp $ */
+/* $Id: result.c,v 1.71 2008/09/25 04:02:39 tbox Exp $ */
 
 /*! \file */
 

diff --git a/lib/isccfg/include/isccfg/grammar.h b/lib/isccfg/include/isccfg/grammar.h
index aa372e99233524367221979c3e9c4633531ff279..f194d4cc571bf1c398b1768292b93ee8ea3f5ccf 100644 (file)
--- a/lib/isccfg/include/isccfg/grammar.h
+++ b/lib/isccfg/include/isccfg/grammar.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2002, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: grammar.h,v 1.16 2008/09/24 02:46:23 marka Exp $ */
+/* $Id: grammar.h,v 1.17 2008/09/25 04:02:39 tbox Exp $ */
 
 #ifndef ISCCFG_GRAMMAR_H
 #define ISCCFG_GRAMMAR_H 1
@@ -186,8 +186,8 @@ struct cfg_parser {
        /*%
         * The stack of currently active files, represented
         * as a configuration list of configuration strings.
-        * The head is the top-level file, subsequent elements 
-        * (if any) are the nested include files, and the 
+        * The head is the top-level file, subsequent elements
+        * (if any) are the nested include files, and the
         * last element is the file currently being parsed.
         */
        cfg_obj_t *     open_files;
@@ -435,7 +435,7 @@ cfg_doc_terminal(cfg_printer_t *pctx, const cfg_type_t *type);
 void
 cfg_parser_error(cfg_parser_t *pctx, unsigned int flags,
                 const char *fmt, ...) ISC_FORMAT_PRINTF(3, 4);
-/*! 
+/*!
  * Pass one of these flags to cfg_parser_error() to include the
  * token text in log message.
  */

diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c
index 21f044b0523ccdac80546b3e4950232609fb5c2e..ee19cf545f5b03303bf984856103dfac00a4945e 100644 (file)
--- a/lib/isccfg/parser.c
+++ b/lib/isccfg/parser.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: parser.c,v 1.128 2008/09/24 02:46:23 marka Exp $ */
+/* $Id: parser.c,v 1.129 2008/09/25 04:02:39 tbox Exp $ */
 
 /*! \file */
 
@@ -50,7 +50,7 @@
 
 /* Check a return value. */
 #define CHECK(op)                                              \
-       do { result = (op);                                     \
+       do { result = (op);                                     \
                if (result != ISC_R_SUCCESS) goto cleanup;      \
        } while (0)
 
@@ -192,7 +192,7 @@ cfg_print(const cfg_obj_t *obj,
 
 
 /* Tuples. */
-  
+
 isc_result_t
 cfg_create_tuple(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) {
        isc_result_t result;
@@ -303,7 +303,7 @@ cfg_tuple_get(const cfg_obj_t *tupleobj, const char* name) {
        unsigned int i;
        const cfg_tuplefielddef_t *fields;
        const cfg_tuplefielddef_t *f;
-       
+
        REQUIRE(tupleobj != NULL && tupleobj->type->rep == &cfg_rep_tuple);
 
        fields = tupleobj->type->of;
@@ -317,7 +317,7 @@ cfg_tuple_get(const cfg_obj_t *tupleobj, const char* name) {
 
 isc_result_t
 cfg_parse_special(cfg_parser_t *pctx, int special) {
-        isc_result_t result;
+       isc_result_t result;
        CHECK(cfg_gettoken(pctx, 0));
        if (pctx->token.type == isc_tokentype_special &&
            pctx->token.value.as_char == special)
@@ -338,7 +338,7 @@ cfg_parse_special(cfg_parser_t *pctx, int special) {
  */
 static isc_result_t
 parse_semicolon(cfg_parser_t *pctx) {
-        isc_result_t result;
+       isc_result_t result;
        CHECK(cfg_gettoken(pctx, 0));
        if (pctx->token.type == isc_tokentype_special &&
            pctx->token.value.as_char == ';')
@@ -355,7 +355,7 @@ parse_semicolon(cfg_parser_t *pctx) {
  */
 static isc_result_t
 parse_eof(cfg_parser_t *pctx) {
-        isc_result_t result;
+       isc_result_t result;
        CHECK(cfg_gettoken(pctx, 0));
 
        if (pctx->token.type == isc_tokentype_eof)
@@ -519,7 +519,7 @@ cfg_parse_buffer(cfg_parser_t *pctx, isc_buffer_t *buffer,
 {
        isc_result_t result;
        REQUIRE(buffer != NULL);
-       CHECK(isc_lex_openbuffer(pctx->lexer, buffer)); 
+       CHECK(isc_lex_openbuffer(pctx->lexer, buffer));
        CHECK(parse2(pctx, type, ret));
  cleanup:
        return (result);
@@ -577,7 +577,7 @@ cfg_type_t cfg_type_void = {
  */
 isc_result_t
 cfg_parse_uint32(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) {
-        isc_result_t result;
+       isc_result_t result;
        cfg_obj_t *obj = NULL;
        UNUSED(type);
 
@@ -690,7 +690,7 @@ create_string(cfg_parser_t *pctx, const char *contents, const cfg_type_t *type,
 
 isc_result_t
 cfg_parse_qstring(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) {
-        isc_result_t result;
+       isc_result_t result;
        UNUSED(type);
 
        CHECK(cfg_gettoken(pctx, CFG_LEXOPT_QSTRING));
@@ -708,7 +708,7 @@ cfg_parse_qstring(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) {
 
 static isc_result_t
 parse_ustring(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) {
-        isc_result_t result;
+       isc_result_t result;
        UNUSED(type);
 
        CHECK(cfg_gettoken(pctx, 0));
@@ -728,7 +728,7 @@ isc_result_t
 cfg_parse_astring(cfg_parser_t *pctx, const cfg_type_t *type,
                  cfg_obj_t **ret)
 {
-        isc_result_t result;
+       isc_result_t result;
        UNUSED(type);
 
        CHECK(cfg_getstringtoken(pctx));
@@ -761,14 +761,14 @@ check_enum(cfg_parser_t *pctx, cfg_obj_t *obj, const char *const *enums) {
 
 isc_result_t
 cfg_parse_enum(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) {
-        isc_result_t result;
+       isc_result_t result;
        cfg_obj_t *obj = NULL;
        CHECK(parse_ustring(pctx, NULL, &obj));
        CHECK(check_enum(pctx, obj, type->of));
        *ret = obj;
        return (ISC_R_SUCCESS);
  cleanup:
-       CLEANUP_OBJ(obj);       
+       CLEANUP_OBJ(obj);
        return (result);
 }
 
@@ -851,7 +851,7 @@ cfg_obj_asboolean(const cfg_obj_t *obj) {
 static isc_result_t
 parse_boolean(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret)
 {
-        isc_result_t result;
+       isc_result_t result;
        isc_boolean_t value;
        cfg_obj_t *obj = NULL;
        UNUSED(type);
@@ -1327,7 +1327,7 @@ parse_symtab_elt(cfg_parser_t *pctx, const char *name,
 
        if (callback && pctx->callback != NULL)
                CHECK(pctx->callback(name, obj, pctx->callbackarg));
-       
+
        symval.as_pointer = obj;
        CHECK(isc_symtab_define(symtab, name,
                                1, symval,
@@ -1374,7 +1374,7 @@ parse_any_named_map(cfg_parser_t *pctx, cfg_type_t *nametype, const cfg_type_t *
 }
 
 /*
- * Parse a map identified by a string name.  E.g., "name { foo 1; }".  
+ * Parse a map identified by a string name.  E.g., "name { foo 1; }".
  * Used for the "key" and "channel" statements.
  */
 isc_result_t
@@ -1454,7 +1454,7 @@ void
 cfg_doc_mapbody(cfg_printer_t *pctx, const cfg_type_t *type) {
        const cfg_clausedef_t * const *clauseset;
        const cfg_clausedef_t *clause;
-       
+
        for (clauseset = type->of; *clauseset != NULL; clauseset++) {
                for (clause = *clauseset;
                     clause->name != NULL;
@@ -1512,7 +1512,7 @@ void
 cfg_doc_map(cfg_printer_t *pctx, const cfg_type_t *type) {
        const cfg_clausedef_t * const *clauseset;
        const cfg_clausedef_t *clause;
-       
+
        if (type->parse == cfg_parse_named_map) {
                cfg_doc_obj(pctx, &cfg_type_astring);
                cfg_print_chars(pctx, " ", 1);
@@ -1523,9 +1523,9 @@ cfg_doc_map(cfg_printer_t *pctx, const cfg_type_t *type) {
                cfg_doc_obj(pctx, &cfg_type_netprefix);
                cfg_print_chars(pctx, " ", 1);
        }
-       
+
        print_open(pctx);
-       
+
        for (clauseset = type->of; *clauseset != NULL; clauseset++) {
                for (clause = *clauseset;
                     clause->name != NULL;
@@ -1554,13 +1554,13 @@ cfg_map_get(const cfg_obj_t *mapobj, const char* name, const cfg_obj_t **obj) {
        isc_result_t result;
        isc_symvalue_t val;
        const cfg_map_t *map;
-       
+
        REQUIRE(mapobj != NULL && mapobj->type->rep == &cfg_rep_map);
        REQUIRE(name != NULL);
        REQUIRE(obj != NULL && *obj == NULL);
 
        map = &mapobj->value.map;
-       
+
        result = isc_symtab_lookup(map->symtab, name, MAP_SYM, &val);
        if (result != ISC_R_SUCCESS)
                return (result);
@@ -1579,7 +1579,7 @@ cfg_map_getname(const cfg_obj_t *mapobj) {
 static isc_result_t
 parse_token(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) {
        cfg_obj_t *obj = NULL;
-        isc_result_t result;
+       isc_result_t result;
        isc_region_t r;
 
        UNUSED(type);
@@ -1670,7 +1670,7 @@ cfg_type_t cfg_type_unsupported = {
  *
  * If CFG_ADDR_WILDOK is set in flags, "*" can be used as a wildcard
  * and at least one of CFG_ADDR_V4OK and CFG_ADDR_V6OK must also be set.  The
- * "*" is interpreted as the IPv4 wildcard address if CFG_ADDR_V4OK is 
+ * "*" is interpreted as the IPv4 wildcard address if CFG_ADDR_V4OK is
  * set (including the case where CFG_ADDR_V4OK and CFG_ADDR_V6OK are both set),
  * and the IPv6 wildcard address otherwise.
  */
@@ -1868,7 +1868,7 @@ cfg_doc_netaddr(cfg_printer_t *pctx, const cfg_type_t *type) {
                if (n != 0)
                        cfg_print_chars(pctx, " | ", 3);
                cfg_print_cstr(pctx, "<ipv6_address>");
-               n++;                    
+               n++;
        }
        if (*flagp & CFG_ADDR_WILDOK) {
                if (n != 0)
@@ -2055,7 +2055,7 @@ cfg_doc_sockaddr(cfg_printer_t *pctx, const cfg_type_t *type) {
                if (n != 0)
                        cfg_print_chars(pctx, " | ", 3);
                cfg_print_cstr(pctx, "<ipv6_address>");
-               n++;                    
+               n++;
        }
        if (*flagp & CFG_ADDR_WILDOK) {
                if (n != 0)

diff --git a/util/altbuild.sh b/util/altbuild.sh
index 05f70df4c32a5d484add6299f1c4b68cca72cb7c..7fb65555b5229473bfb0a5526c8786411e01705a 100644 (file)
--- a/util/altbuild.sh
+++ b/util/altbuild.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2002  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: altbuild.sh,v 1.18 2008/09/24 04:16:53 each Exp $
+# $Id: altbuild.sh,v 1.19 2008/09/25 04:02:39 tbox Exp $
 
 #
 # "Alternative build" test.