[Opendnssec-commits] [keihatsu.kirei.se/svn/dnssec] r5375 - in branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src: enforcer keystate

Yuri Schaeffer yuri at keihatsu.kirei.se
Mon Aug 8 14:36:19 CEST 2011


Author: yuri
Date: 2011-08-08 14:36:19 +0200 (Mon, 08 Aug 2011)
New Revision: 5375

Modified:
   branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/enforcer/enforcer.cpp
   branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/enforcer/enforcerdata.h
   branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/enforcer/enforcerzone.cpp
   branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/enforcer/enforcerzone.h
   branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/keystate/keystate.proto
Log:
Rollback 5368:5361
Figured out a better way to handle changed TTLs


Modified: branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/enforcer/enforcer.cpp
===================================================================
--- branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/enforcer/enforcer.cpp	2011-08-08 09:54:29 UTC (rev 5374)
+++ branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/enforcer/enforcer.cpp	2011-08-08 12:36:19 UTC (rev 5375)
@@ -785,10 +785,7 @@
 			
 			/** Make new key from HSM_key and set defaults */
 			KeyData &new_key = zone.keyDataList().addNewKey( algorithm, 
-				now, (KeyRole)role, false, false, false,
-				policy->parent().ttlds(),
-				policy->keys().ttl(),
-				policy->signatures().ttl());
+				now, (KeyRole)role, false, false, false);
 			new_key.setLocator( newkey_hsmkey->locator() );
 			new_key.setDSSeen( false );
 			new_key.setSubmitToParent( false );

Modified: branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/enforcer/enforcerdata.h
===================================================================
--- branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/enforcer/enforcerdata.h	2011-08-08 09:54:29 UTC (rev 5374)
+++ branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/enforcer/enforcerdata.h	2011-08-08 12:36:19 UTC (rev 5375)
@@ -181,18 +181,13 @@
     
     virtual void setPublish(bool value) = 0;
     virtual void setActive(bool value) = 0;
-    
-    virtual int ttl_ds() = 0;
-    virtual int ttl_dnskey() = 0;
-    virtual int ttl_signature() = 0;
 };
 
 class KeyDataList {
 public:
     virtual KeyData &addNewKey(int algorithm, time_t inception, KeyRole role,
                                bool minimizeDS, bool minimizeRRSIG, 
-                               bool minimizeDNSKEY,
-                               int ttl_ds, int ttl_dnskey, int ttl_signature) = 0;
+                               bool minimizeDNSKEY) = 0;
     virtual int numKeys() = 0;
     virtual KeyData &key(int index) = 0;
     virtual void delKey(int index) = 0;

Modified: branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/enforcer/enforcerzone.cpp
===================================================================
--- branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/enforcer/enforcerzone.cpp	2011-08-08 09:54:29 UTC (rev 5374)
+++ branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/enforcer/enforcerzone.cpp	2011-08-08 12:36:19 UTC (rev 5375)
@@ -184,36 +184,7 @@
     _keydata->set_active(value);
 }
 
-int KeyDataPB::ttl_ds()
-{
-    return _keydata->ttl_ds();
-}
 
-void KeyDataPB::setTtl_ds(int value)
-{
-    _keydata->set_ttl_ds(value);
-}
-
-int KeyDataPB::ttl_dnskey()
-{
-    return _keydata->ttl_dnskey();
-}
-
-void KeyDataPB::setTtl_dnskey(int value)
-{
-    _keydata->set_ttl_dnskey(value);
-}
-
-int KeyDataPB::ttl_signature()
-{
-    return _keydata->ttl_signature();
-}
-
-void KeyDataPB::setTtl_signature(int value)
-{
-    _keydata->set_ttl_signature(value);
-}
-
 // KeyDataListPB
 
 KeyDataListPB::KeyDataListPB(::ods::keystate::EnforcerZone *zone)
@@ -228,8 +199,7 @@
 
 KeyData &KeyDataListPB::addNewKey(int algorithm, time_t inception, KeyRole role,
                        bool minimizeDS, bool minimizeRRSIG, 
-                       bool minimizeDNSKEY,
-                       int ttl_ds, int ttl_dnskey, int ttl_signature)
+                       bool minimizeDNSKEY)
 {
     KeyDataPB key( _zone->add_keys() );
     key.setAlgorithm( algorithm );
@@ -238,9 +208,6 @@
     ((KeyStatePB&)key.keyStateDS()).setMinimize( minimizeDS );
     ((KeyStatePB&)key.keyStateRRSIG()).setMinimize( minimizeRRSIG );
     ((KeyStatePB&)key.keyStateDNSKEY()).setMinimize( minimizeDNSKEY );
-    key.setTtl_ds( ttl_ds );
-    key.setTtl_dnskey( ttl_dnskey );
-    key.setTtl_signature( ttl_signature );
     _keys.push_back(key);
     return _keys.back();
 }

Modified: branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/enforcer/enforcerzone.h
===================================================================
--- branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/enforcer/enforcerzone.h	2011-08-08 09:54:29 UTC (rev 5374)
+++ branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/enforcer/enforcerzone.h	2011-08-08 12:36:19 UTC (rev 5375)
@@ -73,13 +73,6 @@
 
     virtual void setPublish(bool value);
     virtual void setActive(bool value);
-    
-    virtual int ttl_ds();
-    virtual void setTtl_ds(int value);
-    virtual int ttl_dnskey();
-    virtual void setTtl_dnskey(int value);
-    virtual int ttl_signature();
-    virtual void setTtl_signature(int value);
 };
 
 class KeyDataListPB : public KeyDataList {
@@ -91,8 +84,7 @@
 
     virtual KeyData &addNewKey(int algorithm, time_t inception, KeyRole role,
                                bool minimizeDS, bool minimizeRRSIG, 
-                               bool minimizeDNSKEY,
-                               int ttl_ds, int ttl_dnskey, int ttl_signature);
+                               bool minimizeDNSKEY);
     virtual int numKeys();
     virtual KeyData &key(int index);
     virtual void delKey(int index);

Modified: branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/keystate/keystate.proto
===================================================================
--- branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/keystate/keystate.proto	2011-08-08 09:54:29 UTC (rev 5374)
+++ branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/keystate/keystate.proto	2011-08-08 12:36:19 UTC (rev 5375)
@@ -39,10 +39,6 @@
     optional bool publish = 14 [default = false, (xml).path="Publish"];
 
     required KeyState rrsigdnskey = 15 [(xml).path="RRSIGDNSKEY"];
-    required int32 ttl_ds = 16 [(xml).path="TTLds", (xml).type=duration];
-    required int32 ttl_dnskey = 17 [(xml).path="TTLdnskey", (xml).type=duration];
-    required int32 ttl_signature = 18 [(xml).path="TTLsignature", (xml).type=duration];
-
 }
 
 message KeyState {




More information about the Opendnssec-commits mailing list