Fixes from Dave Mills

bk: 435c9cccxWQy_Lb3Tm2bhzKgYNhTUg

diff --git a/ntpd/ntp_control.c b/ntpd/ntp_control.c
index 56f8502a8e2627bade99b4148fe22b629c2de495..6d6dceb90e05bcbdd275d3f07d7b78cc3e40cdaa 100644 (file)
--- a/ntpd/ntp_control.c
+++ b/ntpd/ntp_control.c
@@ -1027,8 +1027,8 @@ ctl_putfs(
        if (tm == NULL)
                return;
 
-       sprintf(cp, "%04d%02d%02d%02d%02d", tm->tm_year + 1900, tm->tm_mon,
-           tm->tm_mday, tm->tm_hour, tm->tm_min);
+       sprintf(cp, "%04d%02d%02d%02d%02d", tm->tm_year + 1900,
+           tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min);
        while (*cp != '\0')
                cp++;
        ctl_putdata(buffer, (unsigned)( cp - buffer ), 0);

diff --git a/ntpd/ntp_crypto.c b/ntpd/ntp_crypto.c
index f17b0d4de9a932db63c98226ca33738b30a0cb44..8e15294513795befb159e0d211b813279985479a 100644 (file)
--- a/ntpd/ntp_crypto.c
+++ b/ntpd/ntp_crypto.c
@@ -1880,11 +1880,6 @@ crypto_update(void)
        if ((tstamp = crypto_time()) == 0)
                return;
 
-       if (tstamp < cinfo->first || tstamp > cinfo->last) {
-               msyslog(
-                   LOG_ERR, "crypto_update: expired certificate\n");
-               return;
-       }
        hostval.tstamp = htonl(tstamp);
 
        /*