Changeset 1724

Timestamp:

09/23/10 22:44:47 (3 years ago)

Author:

ahu

Message:

fix up pdnssec compilation

Location:

trunk/pdns/pdns

Files:

• dnsseckeeper.cc (modified) (4 diffs)
• dnsseckeeper.hh (modified) (1 diff)
• pdnssec.cc (modified) (2 diffs)

trunk/pdns/pdns/dnsseckeeper.cc

@@ -78 +78 @@
 
       if(dpk) {
-        getRSAKeyFromISC(&dpk->d_key.getContext(), dir_itr->path().file_string().c_str());
+        getRSAKeyFromISC(&dpk->d_key.getContext(), dir_itr->path().file_string().c_str());
         
-        if(getNSEC3PARAM(zone)) {
-          dpk->d_algorithm = 7;
-        }
-        else {
-          dpk->d_algorithm = 5;
-        }
-
+        if(getNSEC3PARAM(zone)) {
+          dpk->d_algorithm = 7;
+        }
+        else {
+          dpk->d_algorithm = 5;
+        }
+      
       }
       return true;
@@ -139 +139 @@
 }
 
+/*
 bool zskSortByDates(const DNSSECKeeper::zskset_t::value_type& a, const DNSSECKeeper::zskset_t::value_type& b)
 {
@@ -145 +146 @@
     tie(b.second.beginValidity, b.second.endValidity);
 }
+* */
 void DNSSECKeeper::deleteZSKFor(const std::string& zname, const std::string& fname)
 {
@@ -235 +237 @@
 
       KeyMetaData kmd;
+      /*
       kmd.beginValidity=timegm(&ts1);
       kmd.endValidity=timegm(&ts2);
       time_t now=time(0);
-      kmd.active = now > kmd.beginValidity && now < kmd.endValidity;
+      */
+      kmd.active = 1; // XXX FIXME GOOD ONE! // now > kmd.beginValidity && now < kmd.endValidity;
       kmd.fname = dir_itr->leaf();
       zskset.push_back(make_pair(dpk, kmd));
     }
-    sort(zskset.begin(), zskset.end(), zskSortByDates);
+    // sort(zskset.begin(), zskset.end(), zskSortByDates);
   }
 

trunk/pdns/pdns/dnsseckeeper.hh

@@ -85 +85 @@
   struct KeyMetaData
   {
-    time_t beginValidity, endValidity; // wart  
     bool active;
     string fname;
-  };  
+  }; 
+  typedef std::vector<std::pair<DNSSECPrivateKey, KeyMetaData> > zskset_t;
+   
 public:
   explicit DNSSECKeeper(const std::string& dirname) : d_dirname(dirname){}
+
   bool haveKSKFor(const std::string& zone, DNSSECPrivateKey* ksk=0);
   
-  typedef std::vector<std::pair<DNSSECPrivateKey, KeyMetaData> > zskset_t;
   zskset_t getZSKsFor(const std::string& zone, bool all=false);
   void addZSKFor(const std::string& zname, int algorithm, bool next=false);
+  
   void deleteZSKFor(const std::string& zname, const std::string& fname);
 
   void secureZone(const std::string& fname, int algorithm);
+
   bool getNSEC3PARAM(const std::string& zname, NSEC3PARAMRecordContent* n3p=0);
   void setNSEC3PARAM(const std::string& zname, const NSEC3PARAMRecordContent* n3p);

trunk/pdns/pdns/pdnssec.cc

@@ -234 +234 @@
       
       BOOST_FOREACH(DNSSECKeeper::zskset_t::value_type value, zskset) {
-        cout<<"Tag = "<<value.first.getDNSKEY().getTag()<<"\tActive: "<<value.second.active<<", "<<humanTime(value.second.beginValidity)<<" - "<<humanTime(value.second.endValidity)<<endl;
+        cout<<"Tag = "<<value.first.getDNSKEY().getTag()<<"\tActive: "<<value.second.active<<endl; // ", "<<humanTime(value.second.beginValidity)<<" - "<<humanTime(value.second.endValidity)<<endl;
         if(value.second.active) 
           inforce++;
-        if(value.second.endValidity < now - 2*86400) { // 'expired more than two days ago'  
+        if(!value.second.active) { // was: 'expired more than two days ago'  
           cout<<"\tThis key is no longer used and too old to keep around, deleting!\n";
           dk.deleteZSKFor(zone, value.second.fname);
-        } else if(value.second.endValidity < now) { // 'expired more than two days ago'  
+        } else /* if( value.second.endValidity < now  ) */{ // 'expired more than two days ago'  
           cout<<"\tThis key is no longer in active use, but needs to linger\n";
         }
@@ -291 +291 @@
       cout << "ZSKs for zone '"<<zone<<"':"<<endl;
       BOOST_FOREACH(DNSSECKeeper::zskset_t::value_type value, zskset) {
-        cout<<"Tag = "<<value.first.getDNSKEY().getTag()<<"\tActive: "<<value.second.active<<", "<< humanTime(value.second.beginValidity)<<" - "<<humanTime(value.second.endValidity)<<endl;
+        cout<<"Tag = "<<value.first.getDNSKEY().getTag()<<"\tActive: "<<value.second.active<<", "<< endl; // humanTime(value.second.beginValidity)<<" - "<<humanTime(value.second.endValidity)<<endl;
       }
     }