BIND 10 trac2165_2, updated. 552c5782d796ec0c1091af6dd8212f23b9775af9 [2165] Remove another block of redundant code

[BIND 10 source code commits]

The branch, trac2165_2 has been updated
       via  552c5782d796ec0c1091af6dd8212f23b9775af9 (commit)
      from  3c20e037be36b32640289bb61f45d555649bad12 (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 552c5782d796ec0c1091af6dd8212f23b9775af9
Author: Mukund Sivaraman <muks at isc.org>
Date:   Mon Aug 27 03:49:17 2012 +0530

    [2165] Remove another block of redundant code
    
    This seems to be existing code from before #2165. It is also
    sub-optimal, so it's better replaced with stripRRsigs().

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

Summary of changes:
 src/bin/auth/tests/query_unittest.cc |   20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/auth/tests/query_unittest.cc b/src/bin/auth/tests/query_unittest.cc
index 513b18b..ab3359b 100644
--- a/src/bin/auth/tests/query_unittest.cc
+++ b/src/bin/auth/tests/query_unittest.cc
@@ -708,24 +708,8 @@ MockZoneFinder::find(const Name& name, const RRType& type,
         RRsetStore::const_iterator found_rrset =
             found_domain->second.find(type);
         if (found_rrset != found_domain->second.end()) {
-            ConstRRsetPtr rrset;
-            // Strip whatever signature there is in case DNSSEC is not required
-            // Just to make sure the Query asks for it when it is needed
-            if ((options & ZoneFinder::FIND_DNSSEC) != 0 &&
-                found_rrset->second->getRRsig()) {
-                rrset = found_rrset->second;
-            } else {
-                RRsetPtr noconst(new RRset(found_rrset->second->getName(),
-                                           found_rrset->second->getClass(),
-                                           found_rrset->second->getType(),
-                                           found_rrset->second->getTTL()));
-                for (RdataIteratorPtr
-                     i(found_rrset->second->getRdataIterator());
-                     !i->isLast(); i->next()) {
-                    noconst->addRdata(i->getCurrent());
-                }
-                rrset = noconst;
-            }
+            ConstRRsetPtr rrset = ZoneFinder::stripRRsigs(found_rrset->second,
+                                                          options);
             return (createContext(options, SUCCESS, rrset));
         }