Changeset 1893 for trunk/pdns/pdns/packethandler.cc

Timestamp:

01/18/11 15:55:39 (2 years ago)

Author:

ahu

Message:

implement 'pdnssec set-presigned', allowing PowerDNSSEC to serve pre-signed zones. Rather experimental, but does appear to work

Files:

• trunk/pdns/pdns/packethandler.cc (modified) (5 diffs)

trunk/pdns/pdns/packethandler.cc

@@ -1 +1 @@
 /*
     PowerDNS Versatile Database Driven Nameserver
-    Copyright (C) 2002-2010  PowerDNS.COM BV
+    Copyright (C) 2002-2011  PowerDNS.COM BV
 
     This program is free software; you can redistribute it and/or modify
@@ -1018 +1018 @@
   r->addRecord(rr);
   
-  if(p->d_dnssecOk && d_dk.haveActiveKSKFor(sd.qname))
+  if(p->d_dnssecOk && d_dk.isSecuredZone(sd.qname))
     addNSECX(p, r, target, sd.qname, 1);
   
@@ -1037 +1037 @@
   r->addRecord(rr);
 
-  if(p->d_dnssecOk && d_dk.haveActiveKSKFor(sd.qname))
+  if(p->d_dnssecOk && d_dk.isSecuredZone(sd.qname))
     addNSECX(p, r, target, sd.qname, 0);
 
@@ -1071 +1071 @@
   r->setA(false);
 
-  if(p->d_dnssecOk && d_dk.haveActiveKSKFor(sd.qname) && !addDSforNS(p, r, sd, rrset.begin()->qname))
+  if(p->d_dnssecOk && d_dk.isSecuredZone(sd.qname) && !addDSforNS(p, r, sd, rrset.begin()->qname))
     addNSECX(p, r, rrset.begin()->qname, sd.qname, 0);
   
@@ -1083 +1083 @@
   //  cerr<<"Need to add all the NSEC too.."<<endl; /// XXX FIXME THE ABOVE IF IS WEIRD
   
-  if(!d_dk.haveActiveKSKFor(sd.qname))
+  if(!d_dk.isSecuredZone(sd.qname))
     return;