From 723715b99b66aaa9d545fcb51b2b518f2526d18f Mon Sep 17 00:00:00 2001
From: JINMEI Tatuya <jinmei@isc.org>
Date: Wed, 3 Mar 2010 20:09:21 +0000
Subject: [PATCH] refer to the DO bit of incoming query to decide whether to
 include DNSSEC RRs now that we support EDNS.

git-svn-id: svn://bind10.isc.org/svn/bind10/trunk@1092 e5f2f494-b856-4b98-b285-d166d9295462
---
 src/bin/auth/auth_srv.cc        | 2 +-
 src/lib/auth/cpp/data_source.cc | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/bin/auth/auth_srv.cc b/src/bin/auth/auth_srv.cc
index b5abd04e8d..521444fdfd 100644
--- a/src/bin/auth/auth_srv.cc
+++ b/src/bin/auth/auth_srv.cc
@@ -116,7 +116,7 @@ AuthSrv::processMessage()
         msg.setUDPSize(sizeof(recvbuf));
 
         // do the DataSource call here
-        data_src.doQuery(Query(msg, false));
+        data_src.doQuery(Query(msg, dnssec_ok));
 
         OutputBuffer obuffer(remote_bufsize);
         MessageRenderer renderer(obuffer);
diff --git a/src/lib/auth/cpp/data_source.cc b/src/lib/auth/cpp/data_source.cc
index d9f8791812..e5efaf0a09 100644
--- a/src/lib/auth/cpp/data_source.cc
+++ b/src/lib/auth/cpp/data_source.cc
@@ -332,10 +332,6 @@ DataSrc::doQuery(Query q) {
     Message& m = q.message();
     vector<RRsetPtr> additional;
 
-    // XXX: this is for testing purposes; it should be done when 
-    // parsing the message for EDNS0 options
-    q.setWantDnssec(true);
-
     m.clearHeaderFlag(MessageFlag::AA());
     while (!q.tasks().empty()) {
         RRsetList data;