BIND 10 trac1176, updated. 04b04226b726b6e1fea6bba970556b9ed5cc3446 [1176] Cleanup of previous commit

[BIND 10 source code commits]

The branch, trac1176 has been updated
       via  04b04226b726b6e1fea6bba970556b9ed5cc3446 (commit)
      from  3a838eb454ed0de4f073b99e94e02014eca63a56 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 04b04226b726b6e1fea6bba970556b9ed5cc3446
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Tue Sep 6 11:01:26 2011 +0200

    [1176] Cleanup of previous commit
    
    * Avoid infinite recursion - the operator | kind of happened to call
      itself by accident.
    * Re-added lost | dnssec_opt_.

-----------------------------------------------------------------------

Summary of changes:
 src/bin/auth/query.cc  |    2 +-
 src/lib/datasrc/zone.h |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/auth/query.cc b/src/bin/auth/query.cc
index f095399..898fff7 100644
--- a/src/bin/auth/query.cc
+++ b/src/bin/auth/query.cc
@@ -67,7 +67,7 @@ Query::findAddrs(ZoneFinder& zone, const Name& qname,
     // Find A rrset
     if (qname_ != qname || qtype_ != RRType::A()) {
         ZoneFinder::FindResult a_result = zone.find(qname, RRType::A(), NULL,
-                                                    options);
+                                                    options | dnssec_opt_);
         if (a_result.code == ZoneFinder::SUCCESS) {
             response_.addRRset(Message::SECTION_ADDITIONAL,
                     boost::const_pointer_cast<RRset>(a_result.rrset), dnssec_);
diff --git a/src/lib/datasrc/zone.h b/src/lib/datasrc/zone.h
index 5d5f86f..989b250 100644
--- a/src/lib/datasrc/zone.h
+++ b/src/lib/datasrc/zone.h
@@ -214,7 +214,8 @@ public:
 inline ZoneFinder::FindOptions operator |(ZoneFinder::FindOptions a,
                                           ZoneFinder::FindOptions b)
 {
-    return (static_cast<ZoneFinder::FindOptions>(a | b));
+    return (static_cast<ZoneFinder::FindOptions>(static_cast<unsigned>(a) |
+                                                 static_cast<unsigned>(b)));
 }
 
 /// \brief A pointer-like type pointing to a \c ZoneFinder object.