[Opendnssec-commits] [keihatsu.kirei.se/svn/dnssec] r4142 - trunk/OpenDNSSEC/enforcer/utils

Sion Lloyd sion at nominet.org.uk
Tue Oct 26 10:29:17 CEST 2010


Author: sion
Date: 2010-10-26 10:29:16 +0200 (Tue, 26 Oct 2010)
New Revision: 4142

Modified:
   trunk/OpenDNSSEC/enforcer/utils/README
   trunk/OpenDNSSEC/enforcer/utils/ksmutil.c
   trunk/OpenDNSSEC/enforcer/utils/ods-ksmutil.1.in
Log:
Make names of key states consistent, pivotal story 2438546.


Modified: trunk/OpenDNSSEC/enforcer/utils/README
===================================================================
--- trunk/OpenDNSSEC/enforcer/utils/README	2010-10-25 15:26:40 UTC (rev 4141)
+++ trunk/OpenDNSSEC/enforcer/utils/README	2010-10-26 08:29:16 UTC (rev 4142)
@@ -142,6 +142,6 @@
         List the expected dates and times of upcoming rollovers.
 
 
-key states: GENERATED|PUBLISHED|READY|ACTIVE|RETIRED|REVOKED|DEAD
+key states: GENERATE|PUBLISH|READY|ACTIVE|RETIRE|DEAD
 key types:  KSK|ZSK
 

Modified: trunk/OpenDNSSEC/enforcer/utils/ksmutil.c
===================================================================
--- trunk/OpenDNSSEC/enforcer/utils/ksmutil.c	2010-10-25 15:26:40 UTC (rev 4141)
+++ trunk/OpenDNSSEC/enforcer/utils/ksmutil.c	2010-10-26 08:29:16 UTC (rev 4142)
@@ -441,7 +441,7 @@
 states_help()
 {
     fprintf(stderr,
-            "key states: GENERATED|PUBLISHED|READY|ACTIVE|RETIRED|REVOKED|DEAD\n");
+            "key states: GENERATE|PUBLISH|READY|ACTIVE|RETIRE|DEAD\n");
 }
 
 void
@@ -1374,7 +1374,7 @@
             state_id =  KSM_STATE_DSREADY;
         }
         else {
-            printf("Error: Unrecognised state %s; should be one of GENERATED, PUBLISHED, READY, ACTIVE, RETIRED, DEAD, DSSUB, DSPUBLISH, DSREADY or KEYPUBLISH\n", o_keystate);
+            printf("Error: Unrecognised state %s; should be one of GENERATE, PUBLISH, READY, ACTIVE, RETIRE, DEAD, DSSUB, DSPUBLISH, DSREADY or KEYPUBLISH\n", o_keystate);
 
             StrFree(case_keystate);
             return(1);
@@ -2685,7 +2685,7 @@
     /* some strings to hold upper case versions of arguments */
     char* case_keytype = NULL;    /* KSK or ZSK */
     char* case_algorithm = NULL;  /* RSASHA1 or RSASHA1-NSEC3-SHA1 (5 or 7) */
-    char* case_state = NULL;      /* GENERATED, PUBLISHED, READY, ACTIVE or RETIRED */
+    char* case_state = NULL;      /* GENERATE, PUBLISH, READY, ACTIVE or RETIRE */
 
     int repo_id = -1;
     int zone_id = -1;
@@ -2853,7 +2853,7 @@
         state_id = 5;
     }
     else {
-        printf("Error: Unrecognised state %s; should be one of GENERATED, PUBLISHED, READY, ACTIVE or RETIRED\n", o_keystate);
+        printf("Error: Unrecognised state %s; should be one of GENERATE, PUBLISH, READY, ACTIVE or RETIRE\n", o_keystate);
 
         db_disconnect(lock_fd);
         StrFree(case_state);

Modified: trunk/OpenDNSSEC/enforcer/utils/ods-ksmutil.1.in
===================================================================
--- trunk/OpenDNSSEC/enforcer/utils/ods-ksmutil.1.in	2010-10-25 15:26:40 UTC (rev 4141)
+++ trunk/OpenDNSSEC/enforcer/utils/ods-ksmutil.1.in	2010-10-26 08:29:16 UTC (rev 4142)
@@ -315,10 +315,10 @@
 .SH "KEY STATES"
 .LP
 .TP
-GENERATED
+GENERATE
 The key has just been generated, but is not ready for use.
 .TP
-PUBLISHED
+PUBLISH
 The key has been published in the parent zone.
 .TP
 READY
@@ -327,7 +327,7 @@
 ACTIVE
 The key is actively being used to sign one or more zones.
 .TP
-RETIRED
+RETIRE
 The key has either reached the end of its scheduled life, or it has been rolled prematurely. However, records signed with it may still be cached sp the key is still being published.
 .TP
 DEAD




More information about the Opendnssec-commits mailing list