This commit was manufactured by cvs2git to create tag 'v9_8_0b1'.

bin/tests/log_test.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2011  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/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: log_test.c,v 1.28 2011/01/14 00:51:43 tbox Exp $ */
+/* $Id: log_test.c,v 1.26 2007/06/19 23:46:59 tbox Exp $ */
 
 /* Principal Authors: DCL */
 
@@ -306,16 +306,16 @@ main(int argc, char **argv) {
 	isc_log_write1(lctx, DNS_LOGCATEGORY_GENERAL, DNS_LOGMODULE_RBTDB,
 		       ISC_LOG_CRITICAL, "%s", message);
 	isc_log_write1(lctx, DNS_LOGCATEGORY_GENERAL, DNS_LOGMODULE_RBTDB,
-		       ISC_LOG_CRITICAL, "%s", message);
+		       ISC_LOG_CRITICAL, message);
 
 	isc_log_setduplicateinterval(lcfg, 1);
 	message = "This message should appear twice on stderr";
 
 	isc_log_write1(lctx, DNS_LOGCATEGORY_GENERAL, DNS_LOGMODULE_RBTDB,
-		       ISC_LOG_CRITICAL, "%s", message);
+		       ISC_LOG_CRITICAL, message);
 	sleep(2);
 	isc_log_write1(lctx, DNS_LOGCATEGORY_GENERAL, DNS_LOGMODULE_RBTDB,
-		       ISC_LOG_CRITICAL, "%s", message);
+		       ISC_LOG_CRITICAL, message);
 
 	/*
 	 * Review where everything went.

doc/arm/Bv9ARM-book.xml

@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- File: $Id: Bv9ARM-book.xml,v 1.478 2011/01/22 01:21:05 marka Exp $ -->
+<!-- File: $Id: Bv9ARM-book.xml,v 1.476 2011/01/13 01:59:27 marka Exp $ -->
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <title>BIND 9 Administrator Reference Manual</title>
 
@@ -891,7 +891,7 @@ zone "eng.example.com" {
       </para>
       <para>
         For more detail on ordering responses, check the
-        <command>rrset-order</command> sub-statement in the
+        <command>rrset-order</command> substatement in the
         <command>options</command> statement, see
         <xref endterm="rrset_ordering_title" linkend="rrset_ordering"/>.
       </para>
@@ -5139,7 +5139,7 @@ badresp:1,adberr:0,findfail:0,valfail:0]
 	<optional> mapped { <replaceable>address_match_list</replaceable> }; </optional>
         <optional> exclude { <replaceable>address_match_list</replaceable> }; </optional>
 	<optional> suffix IPv6-address; </optional>
-	<optional> recursive-only <replaceable>yes_or_no</replaceable>; </optional>
+	<optional> recursion-only <replaceable>yes_or_no</replaceable>; </optional>
 	<optional> break-dnssec <replaceable>yes_or_no</replaceable>; </optional>
     }; </optional>;
     <optional> dns64-server <replaceable>name</replaceable> </optional>
@@ -5795,7 +5795,7 @@ options {
 		IPv6 addresses will be ignored for the purposes
 		of determining if dns64 is to be applied.  Any
 		non matching address will prevent any further
-		DNS64 processing from occurring for this client.
+		DNS64 processing from occuring for this client.
 	      </para>
 	      <para>
 		A optional <command>suffix</command> can also
@@ -8640,7 +8640,7 @@ avoid-v6-udp-ports { 40000; range 50000 60000; };
 		  buffer (<command>edns-udp-size</command>).
 		</para>
 		<para>
-		  Setting this to a low value will encourage additional
+		  Setting this to a low value will encourge additional
 		  TCP traffic to the nameserver.
 		</para>
 	      </listitem>
@@ -9764,7 +9764,7 @@ ns.domain.com.rpz-nsdname   CNAME   .
             to the master file as soon as possible afterward; in the case
             of the managed key database, this will usually occur within 30
             seconds.  So, whenever <command>named</command> is using
-            automatic key maintenance, those two files can be expected to
+            automatic key maintenace, those two files can be expected to
             exist in the working directory.  (For this reason among others,
             the working directory should be always be writable by
             <command>named</command>.)
@@ -11026,7 +11026,7 @@ example.com. NS ns2.example.net.
                 <listitem>
                   <para>
                     Zones configured for dynamic DNS may also use this
-                    option to allow varying levels of automatic DNSSEC key
+                    option to allow varying levels of autonatic DNSSEC key
                     management. There are four possible settings:
                   </para>
                   <para>

doc/arm/Bv9ARM.ch03.html

@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: Bv9ARM.ch03.html,v 1.83 2011/01/21 01:14:13 tbox Exp $ -->
+<!-- $Id: Bv9ARM.ch03.html,v 1.82 2011/01/05 01:14:07 tbox Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -282,7 +282,7 @@ zone "eng.example.com" {
       </p>
 <p>
         For more detail on ordering responses, check the
-        <span><strong class="command">rrset-order</strong></span> sub-statement in the
+        <span><strong class="command">rrset-order</strong></span> substatement in the
         <span><strong class="command">options</strong></span> statement, see
         <a href="Bv9ARM.ch06.html#rrset_ordering">RRset Ordering</a>.
       </p>

doc/arm/Bv9ARM.ch06.html

@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: Bv9ARM.ch06.html,v 1.275 2011/01/23 01:14:18 tbox Exp $ -->
+<!-- $Id: Bv9ARM.ch06.html,v 1.273 2011/01/13 05:13:50 tbox Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -2232,7 +2232,7 @@ badresp:1,adberr:0,findfail:0,valfail:0]
         [<span class="optional"> mapped { <em class="replaceable"><code>address_match_list</code></em> }; </span>]
         [<span class="optional"> exclude { <em class="replaceable"><code>address_match_list</code></em> }; </span>]
         [<span class="optional"> suffix IPv6-address; </span>]
-        [<span class="optional"> recursive-only <em class="replaceable"><code>yes_or_no</code></em>; </span>]
+        [<span class="optional"> recursion-only <em class="replaceable"><code>yes_or_no</code></em>; </span>]
         [<span class="optional"> break-dnssec <em class="replaceable"><code>yes_or_no</code></em>; </span>]
     }; </span>];
     [<span class="optional"> dns64-server <em class="replaceable"><code>name</code></em> </span>]
@@ -2741,7 +2741,7 @@ options {
                 IPv6 addresses will be ignored for the purposes
                 of determining if dns64 is to be applied.  Any
                 non matching address will prevent any further
-                DNS64 processing from occurring for this client.
+                DNS64 processing from occuring for this client.
               </p>
 <p>
                 A optional <span><strong class="command">suffix</strong></span> can also
@@ -5030,7 +5030,7 @@ avoid-v6-udp-ports { 40000; range 50000 60000; };
                   buffer (<span><strong class="command">edns-udp-size</strong></span>).
                 </p>
 <p>
-                  Setting this to a low value will encourage additional
+                  Setting this to a low value will encourge additional
                   TCP traffic to the nameserver.
                 </p>
 </dd>
@@ -6011,7 +6011,7 @@ ns.domain.com.rpz-nsdname   CNAME   .
             to the master file as soon as possible afterward; in the case
             of the managed key database, this will usually occur within 30
             seconds.  So, whenever <span><strong class="command">named</strong></span> is using
-            automatic key maintenance, those two files can be expected to
+            automatic key maintenace, those two files can be expected to
             exist in the working directory.  (For this reason among others,
             the working directory should be always be writable by
             <span><strong class="command">named</strong></span>.)
@@ -7012,7 +7012,7 @@ example.com. NS ns2.example.net.
 <dd>
 <p>
                     Zones configured for dynamic DNS may also use this
-                    option to allow varying levels of automatic DNSSEC key
+                    option to allow varying levels of autonatic DNSSEC key
                     management. There are four possible settings:
                   </p>
 <p>

doc/private/SRCID

@@ -1,6 +1,6 @@
-# $Id: SRCID,v 1.535 2011/01/23 01:15:32 tbox Exp $
+# $Id: SRCID,v 1.526 2011/01/13 23:16:45 tbox Exp $
 # 
 # This file must follow /bin/sh rules.  It is imported directly via
 # configure.
 #
-SRCID="( $Date: 2011/01/23 01:15:32 $ )"
+SRCID="( $Date: 2011/01/13 23:16:45 $ )"

lib/dns/ecdb.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 2010  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: ecdb.c,v 1.8 2011/01/14 00:51:43 tbox Exp $ */
+/* $Id: ecdb.c,v 1.6 2010/02/25 05:08:01 tbox Exp $ */
 
 #include "config.h"
 
@@ -578,9 +578,7 @@ static dns_dbmethods_t ecdb_methods = {
 	NULL,			/* getsigningtime */
 	NULL,			/* resigned */
 	NULL,			/* isdnssec */
-	NULL,			/* getrrsetstats */
-	NULL,			/* rpz_enabled */
-	NULL			/* rpz_findips */
+	NULL			/* getrrsetstats */
 };
 
 static isc_result_t

lib/dns/opensslgost_link.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010  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: opensslgost_link.c,v 1.5 2011/01/19 23:47:12 tbox Exp $ */
+/* $Id: opensslgost_link.c,v 1.3 2010/12/23 23:47:08 tbox Exp $ */
 
 #include <config.h>
 
@@ -371,8 +371,6 @@ static dst_func_t opensslgost_functions = {
 	opensslgost_parse,
 	opensslgost_cleanup,
 	NULL, /*%< fromlabel */
-	NULL, /*%< dump */
-	NULL  /*%< restore */
 };
 
 isc_result_t

lib/dns/rpz.c

@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rpz.c,v 1.7 2011/01/17 04:27:23 marka Exp $ */
+/* $Id: rpz.c,v 1.6 2011/01/13 06:48:14 marka Exp $ */
 
 /*! \file */
 
@@ -706,7 +706,7 @@ ffbit(dns_rpz_cidr_word_t w) {
 
 	if (w == 0)
 		return (DNS_RPZ_CIDR_WORD_BITS);
-	for (bit = 0; (w & (1U << (DNS_RPZ_CIDR_WORD_BITS-1))) == 0; bit++)
+	for (bit = 0; (w & (1 << (DNS_RPZ_CIDR_WORD_BITS-1))) == 0; bit++)
 		w <<= 1;
 	return (bit);
 }

util/copyrights

@@ -394,7 +394,7 @@
 ./bin/tests/keyboard_test.c			C	2000,2001,2004,2005,2007
 ./bin/tests/lex_test.c				C	1998,1999,2000,2001,2004,2005,2007
 ./bin/tests/lfsr_test.c				C	1999,2000,2001,2004,2005,2007
-./bin/tests/log_test.c				C	1999,2000,2001,2004,2007,2011
+./bin/tests/log_test.c				C	1999,2000,2001,2004,2007
 ./bin/tests/lwres_test.c			C	2000,2001,2004,2005,2007
 ./bin/tests/lwresconf_test.c			C	2000,2001,2004,2007
 ./bin/tests/master/.cvsignore			X	1999,2000,2001
@@ -1998,7 +1998,7 @@
 ./lib/dns/dst_parse.c				C.NAI	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010
 ./lib/dns/dst_parse.h				C.NAI	2000,2001,2002,2004,2005,2006,2007,2008,2009,2010
 ./lib/dns/dst_result.c				C	1999,2000,2001,2004,2005,2007,2008
-./lib/dns/ecdb.c				C	2009,2010,2011
+./lib/dns/ecdb.c				C	2009,2010
 ./lib/dns/forward.c				C	2000,2001,2004,2005,2007,2009
 ./lib/dns/gen-unix.h				C	1999,2000,2001,2004,2005,2007,2009
 ./lib/dns/gen-win32.h				C	1999,2000,2001,2004,2005,2006,2007,2009
@@ -2115,7 +2115,7 @@
 ./lib/dns/openssl_link.c			C.NAI	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010
 ./lib/dns/openssldh_link.c			C.NAI	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011
 ./lib/dns/openssldsa_link.c			C.NAI	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011
-./lib/dns/opensslgost_link.c			C	2010,2011
+./lib/dns/opensslgost_link.c			C	2010
 ./lib/dns/opensslrsa_link.c			C	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011
 ./lib/dns/order.c				C	2002,2004,2005,2007
 ./lib/dns/peer.c				C	2000,2001,2003,2004,2005,2006,2007,2008,2009