[Opendnssec-commits] [keihatsu.kirei.se/svn/dnssec] r4143 - in trunk/OpenDNSSEC/enforcer: common utils

Sion Lloyd sion at nominet.org.uk
Tue Oct 26 10:42:49 CEST 2010


Author: sion
Date: 2010-10-26 10:42:48 +0200 (Tue, 26 Oct 2010)
New Revision: 4143

Modified:
   trunk/OpenDNSSEC/enforcer/common/daemon_util.c
   trunk/OpenDNSSEC/enforcer/utils/ksmutil.c
Log:
Tone down and explain warning when converting M or Y to seconds, pivotal chore 5734180.


Modified: trunk/OpenDNSSEC/enforcer/common/daemon_util.c
===================================================================
--- trunk/OpenDNSSEC/enforcer/common/daemon_util.c	2010-10-26 08:29:16 UTC (rev 4142)
+++ trunk/OpenDNSSEC/enforcer/common/daemon_util.c	2010-10-26 08:42:48 UTC (rev 4143)
@@ -696,7 +696,7 @@
         return status;
     }
     else if (status == -1) {
-        log_msg(config, LOG_INFO, "Warning: converting %s to seconds may not give what you expect", temp_char);
+        log_msg(config, LOG_INFO, "Info: converting %s to seconds; M interpreted as 31 days, Y interpreted as 365 days", temp_char);
     }
     config->interval = mysec;
     if (verbose) {
@@ -743,7 +743,7 @@
             return status;
         }
         else if (status == -1) {
-            log_msg(config, LOG_INFO, "Warning: converting %s to seconds may not give what you expect", temp_char);
+        log_msg(config, LOG_INFO, "Info: converting %s to seconds; M interpreted as 31 days, Y interpreted as 365 days", temp_char);
         }
         config->rolloverNotify = mysec;
         if (verbose) {

Modified: trunk/OpenDNSSEC/enforcer/utils/ksmutil.c
===================================================================
--- trunk/OpenDNSSEC/enforcer/utils/ksmutil.c	2010-10-26 08:29:16 UTC (rev 4142)
+++ trunk/OpenDNSSEC/enforcer/utils/ksmutil.c	2010-10-26 08:42:48 UTC (rev 4143)
@@ -4853,7 +4853,7 @@
                 return status;
             }
             else if (status == -1) {
-                printf("Warning: converting %s to seconds may not give what you expect\n", temp_char);
+                printf("Info: converting %s to seconds; M interpreted as 31 days, Y interpreted as 365 days", temp_char);
             }
             StrFree(temp_char);
         } else {
@@ -6237,7 +6237,7 @@
         return status;
     }
     else if (status == -1) {
-        printf("Warning: converting %s to seconds may not give what you expect\n", o_interval);
+        printf("Info: converting %s to seconds; M interpreted as 31 days, Y interpreted as 365 days", o_interval);
     }
 
     /* Connect to the hsm */
@@ -7488,7 +7488,7 @@
         return status;
     }
     else if (status == -1) {
-        printf("Warning: converting %s to seconds may not give what you expect\n", temp_char);
+        printf("Info: converting %s to seconds; M interpreted as 31 days, Y interpreted as 365 days", temp_char);
     }
     *interval = mysec;
     StrFree(temp_char);




More information about the Opendnssec-commits mailing list