From: JINMEI Tatuya <jinmei@isc.org>
Date: Tue, 25 Sep 2012 21:43:03 +0000 (-0700)
Subject: [2282] Merge branch 'trac2219' into trac2282
X-Git-Tag: trac2351_base~37^2~1^2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=360b20fadb0530d2cb069f428c09fa6320d941ad;p=thirdparty%2Fkea.git

[2282] Merge branch 'trac2219' into trac2282
---

360b20fadb0530d2cb069f428c09fa6320d941ad
diff --cc src/lib/datasrc/memory/zone_finder.cc
index cb56b8f8b6,25c276427d..b3c8ba0243
--- a/src/lib/datasrc/memory/zone_finder.cc
+++ b/src/lib/datasrc/memory/zone_finder.cc
@@@ -558,9 -626,13 +626,9 @@@ InMemoryZoneFinder::find_internal(cons
          LOG_DEBUG(logger, DBG_TRACE_DATA, DATASRC_MEM_ANY_SUCCESS).
              arg(name);
          return (createFindResult(rrclass_, zone_data_, SUCCESS, NULL, node,
-                                  wild, &name));
+                                  options, wild, &name));
      }
  
 -    const RdataSet* currds = node->getData();
 -    while (currds != NULL) {
 -        currds = currds->getNext();
 -    }
      found = RdataSet::find(node->getData(), type);
      if (found != NULL) {
          // Good, it is here