update copyright notice

diff --git a/CHANGES b/CHANGES
index dc5ef35fad6f2905794bd955431844e1b8d8db93..91c816212293d35d2833ea1c9fb89d4952bb5988 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -3,7 +3,7 @@
                        default 10 seconds, limit 30). This can reduce
                        the frequency of retries when an authoritative
                        server is known to be failing, e.g., due to
-                       ongoing DNSSEC validation problems. [RT #21347] 
+                       ongoing DNSSEC validation problems. [RT #21347]
 
 3942.  [bug]           Wildcard responses from a optout range should be
                        marked as insecure. [RT #37072]

diff --git a/bin/tests/system/inline/ns5/named.conf.post b/bin/tests/system/inline/ns5/named.conf.post
index 8e8850b0df25b1292fd9aba3820890f79d3a09cd..9b7dee8df61427906d0af4db45d4e03ac1603293 100644 (file)
--- a/bin/tests/system/inline/ns5/named.conf.post
+++ b/bin/tests/system/inline/ns5/named.conf.post
@@ -14,6 +14,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+/* $Id$ */
+
 // NS5
 
 include "../../common/rndc.key";

diff --git a/bin/tests/system/nsupdate/ns1/named.conf b/bin/tests/system/nsupdate/ns1/named.conf
index 4263e381e455e8bb7acc9134dab340395135c1cc..4947ccea5288d6cac001b2bd98bd27b3396f73bc 100644 (file)
--- a/bin/tests/system/nsupdate/ns1/named.conf
+++ b/bin/tests/system/nsupdate/ns1/named.conf
@@ -129,7 +129,7 @@ zone "keytests.nil" {
 };
 
 zone "many.test" {
-        type master;
-        allow-update { any; };
-        file "many.test.db";
+       type master;
+       allow-update { any; };
+       file "many.test.db";
 };

diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 94b11c783fcfe0b06e2f2cc94d9fb455edb53420..31e23063f1eac2af85bb21cc2db95ce1786c0e2d 100644 (file)
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -43,7 +43,6 @@
       <year>2003</year>
       <holder>Internet Software Consortium.</holder>
     </copyright>
-    <xi:include href="releaseinfo.xml"/>
   </bookinfo>
 
   <chapter id="Bv9ARM.ch01">

diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c
index 9bfd6b98374d72920e4d1e85034fb42c76a74f42..af5ce82567d7a57ba9ce4814251e9e33967039ec 100644 (file)
--- a/lib/dns/dispatch.c
+++ b/lib/dns/dispatch.c
@@ -2519,11 +2519,11 @@ dns_dispatch_createtcp(dns_dispatchmgr_t *mgr, isc_socket_t *sock,
 
 isc_result_t
 dns_dispatch_createtcp2(dns_dispatchmgr_t *mgr, isc_socket_t *sock,
-                       isc_taskmgr_t *taskmgr, isc_sockaddr_t *localaddr,
+                       isc_taskmgr_t *taskmgr, isc_sockaddr_t *localaddr,
                        isc_sockaddr_t *destaddr, unsigned int buffersize,
-                       unsigned int maxbuffers, unsigned int maxrequests,
-                       unsigned int buckets, unsigned int increment,
-                       unsigned int attributes, dns_dispatch_t **dispp)
+                       unsigned int maxbuffers, unsigned int maxrequests,
+                       unsigned int buckets, unsigned int increment,
+                       unsigned int attributes, dns_dispatch_t **dispp)
 {
        isc_result_t result;
        dns_dispatch_t *disp;

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 709d5f8dd41c65542dc1a7f9c283c1644ff773cd..ede2594a897f192ce83303b64c9408b48d3ffc11 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -14927,12 +14927,12 @@ sendtomaster(dns_forward_t *forward) {
                goto unlock;
        }
        result = dns_request_createraw4(forward->zone->view->requestmgr,
-                                       forward->msgbuf,
-                                       &src, &forward->addr, dscp,
-                                       DNS_REQUESTOPT_TCP, 15 /* XXX */,
-                                       0, 0, forward->zone->task,
-                                       forward_callback, forward,
-                                       &forward->request);
+                                       forward->msgbuf,
+                                       &src, &forward->addr, dscp,
+                                       DNS_REQUESTOPT_TCP, 15 /* XXX */,
+                                       0, 0, forward->zone->task,
+                                       forward_callback, forward,
+                                       &forward->request);
        if (result == ISC_R_SUCCESS) {
                if (!ISC_LINK_LINKED(forward, link))
                        ISC_LIST_APPEND(forward->zone->forwards, forward, link);