pullup:

1070.  [bug]           Copy DNSSEC OK (DO) to response as specified by
                       draft-ietf-dnsext-dnssec-okbit-03.txt.

diff --git a/CHANGES b/CHANGES
index ebd06b74a50a533f7d9ad9c3b40275a85ce02971..cda34bb26df05a03d4e23ca8d1d5ac99f4a4fce7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -100,6 +100,9 @@
 
 1109.  [bug]           nsupdate accepted illegal ttl values.
 
+1070.  [bug]           Copy DNSSEC OK (DO) to response as specified by
+                       draft-ietf-dnsext-dnssec-okbit-03.txt.
+
 1014.  [bug]           Some queries would cause statistics counters to
                        increment more than once or not at all. [RT #1321]
 

diff --git a/bin/named/client.c b/bin/named/client.c
index ef9fc19af8db239804a4935451e26c70ced355c7..6fc3106067a4a1a77853d576675aab4022039f59 100644 (file)
--- a/bin/named/client.c
+++ b/bin/named/client.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: client.c,v 1.176.2.8 2001/11/16 21:21:42 bwelling Exp $ */
+/* $Id: client.c,v 1.176.2.9 2002/01/24 19:00:24 gson Exp $ */
 
 #include <config.h>
 
@@ -1014,7 +1014,7 @@ client_addopt(ns_client_t *client) {
        /*
         * Set EXTENDED-RCODE, VERSION, and Z to 0.
         */
-       rdatalist->ttl = 0;
+       rdatalist->ttl = (client->extflags & DNS_MESSAGEEXTFLAG_REPLYPRESERVE);
 
        /*
         * No ENDS options in the default case.

diff --git a/lib/dns/include/dns/message.h b/lib/dns/include/dns/message.h
index 3f3150dc88a063f992cb783469d4bd06ae4ce583..d9bfa4cd0fbef6c32ad70f4ca9a7a2aab40500dc 100644 (file)
--- a/lib/dns/include/dns/message.h
+++ b/lib/dns/include/dns/message.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: message.h,v 1.100 2001/08/28 03:58:17 marka Exp $ */
+/* $Id: message.h,v 1.100.2.1 2002/01/24 19:00:27 gson Exp $ */
 
 #ifndef DNS_MESSAGE_H
 #define DNS_MESSAGE_H 1
@@ -100,6 +100,7 @@
 #define DNS_MESSAGEEXTFLAG_DO          0x8000U
 
 #define DNS_MESSAGE_REPLYPRESERVE      (DNS_MESSAGEFLAG_RD)
+#define DNS_MESSAGEEXTFLAG_REPLYPRESERVE (DNS_MESSAGEEXTFLAG_DO)
 
 #define DNS_MESSAGE_HEADERLEN          12 /* 6 isc_uint16_t's */