[svn] commit: r1092 - in /trunk/src: bin/auth/auth_srv.cc lib/auth/cpp/data_source.cc

[BIND 10 source code commits]

Author: jinmei
Date: Wed Mar  3 20:09:21 2010
New Revision: 1092

Log:
refer to the DO bit of incoming query to decide whether to include DNSSEC RRs
now that we support EDNS.

Modified:
    trunk/src/bin/auth/auth_srv.cc
    trunk/src/lib/auth/cpp/data_source.cc

Modified: trunk/src/bin/auth/auth_srv.cc
==============================================================================
--- trunk/src/bin/auth/auth_srv.cc (original)
+++ trunk/src/bin/auth/auth_srv.cc Wed Mar  3 20:09:21 2010
@@ -116,7 +116,7 @@
         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);

Modified: trunk/src/lib/auth/cpp/data_source.cc
==============================================================================
--- trunk/src/lib/auth/cpp/data_source.cc (original)
+++ trunk/src/lib/auth/cpp/data_source.cc Wed Mar  3 20:09:21 2010
@@ -332,10 +332,6 @@
     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;