From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 24 Oct 2005 08:35:24 +0000 (-0400)
Subject: Fixes from Dave Mills
X-Git-Tag: NTP_4_2_0B_RC1~36^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32bdc6e01109c074f70b7a20926dfc72c4971767;p=thirdparty%2Fntp.git

Fixes from Dave Mills

bk: 435c9cccxWQy_Lb3Tm2bhzKgYNhTUg
---

diff --git a/ntpd/ntp_control.c b/ntpd/ntp_control.c
index 56f8502a8..6d6dceb90 100644
--- 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 f17b0d4de..8e1529451 100644
--- 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);
 
 	/*