From: Bert Hubert <bert.hubert@netherlabs.nl>
Date: Mon, 27 Dec 2010 15:57:34 +0000 (+0000)
Subject: fix up pdns_server for new key api
X-Git-Tag: auth-3.0~488
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5b90a19663f0ac1ca9f96116b5acb10c113754a9;p=pdns

fix up pdns_server for new key api


git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@1759 d19b8d6e-7fed-0310-83ef-9ca221ded41b
---

diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc
index e8cb29d5c..e3c4dcd8c 100644
--- a/pdns/packethandler.cc
+++ b/pdns/packethandler.cc
@@ -210,7 +210,7 @@ int PacketHandler::doDNSKEYRequest(DNSPacket *p, DNSPacket *r)
   bool haveOne=false;
   DNSSECPrivateKey dpk;
 
-  if(dk.haveKSKFor(p->qdomain, &dpk)) {
+  if(dk.haveActiveKSKFor(p->qdomain, &dpk)) {
     rr.qtype=QType::DNSKEY;
     rr.ttl=3600;
     rr.qname=p->qdomain;
@@ -220,8 +220,8 @@ int PacketHandler::doDNSKEYRequest(DNSPacket *p, DNSPacket *r)
     haveOne=true;
   }
 
-  DNSSECKeeper::zskset_t zskset = dk.getZSKsFor(p->qdomain);
-  BOOST_FOREACH(DNSSECKeeper::zskset_t::value_type value, zskset) {
+  DNSSECKeeper::keyset_t zskset = dk.getKeys(p->qdomain, false);
+  BOOST_FOREACH(DNSSECKeeper::keyset_t::value_type value, zskset) {
     rr.qtype=QType::DNSKEY;
     rr.ttl=3600;
     rr.qname=p->qdomain;