Commit 04b04226 authored by Michal 'vorner' Vaner's avatar Michal 'vorner' Vaner
Browse files

[1176] Cleanup of previous commit

* Avoid infinite recursion - the operator | kind of happened to call
  itself by accident.
* Re-added lost | dnssec_opt_.
parent 3a838eb4
...@@ -67,7 +67,7 @@ Query::findAddrs(ZoneFinder& zone, const Name& qname, ...@@ -67,7 +67,7 @@ Query::findAddrs(ZoneFinder& zone, const Name& qname,
// Find A rrset // Find A rrset
if (qname_ != qname || qtype_ != RRType::A()) { if (qname_ != qname || qtype_ != RRType::A()) {
ZoneFinder::FindResult a_result = zone.find(qname, RRType::A(), NULL, ZoneFinder::FindResult a_result = zone.find(qname, RRType::A(), NULL,
options); options | dnssec_opt_);
if (a_result.code == ZoneFinder::SUCCESS) { if (a_result.code == ZoneFinder::SUCCESS) {
response_.addRRset(Message::SECTION_ADDITIONAL, response_.addRRset(Message::SECTION_ADDITIONAL,
boost::const_pointer_cast<RRset>(a_result.rrset), dnssec_); boost::const_pointer_cast<RRset>(a_result.rrset), dnssec_);
......
...@@ -214,7 +214,8 @@ public: ...@@ -214,7 +214,8 @@ public:
inline ZoneFinder::FindOptions operator |(ZoneFinder::FindOptions a, inline ZoneFinder::FindOptions operator |(ZoneFinder::FindOptions a,
ZoneFinder::FindOptions b) 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. /// \brief A pointer-like type pointing to a \c ZoneFinder object.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment