From: Dave Hart <hart@ntp.org>
Date: Wed, 29 Apr 2009 05:54:23 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev
X-Git-Tag: NTP_4_2_5P168~2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d62730832be5dae4d7e264322990a4129087abef;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1169

bk: 49f7eb8f39kWttYydzbNyh-hFMehUQ
---

d62730832be5dae4d7e264322990a4129087abef
diff --cc ChangeLog
index e4d7b5a04,0d6703688..85665a77d
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,9 +1,13 @@@
 +* [Bug 1169] quiet compiler warnings
 +* Re-enable gcc -Wstrict-prototypes when not building with OpenSSL
 +* Enable gcc -Wstrict-overflow
 +* ntpq/ntpdc emit newline after accepting password on Windows
+ * Updates from Dave Mills:
+ * ntp-keygen.c: Updates.
+ * Fix the error return and syslog function ID in refclock_{param,ppsapi}.
+ * Make sure syspoll is within the peer's minpoll/maxpoll bounds.
+ * ntp_crypto.c: Use sign_siglen, not len. sign key filename cleanup.
+ * Bump NTP_MAXEXTEN from 1024 to 2048, update values for some field lengths.
  (4.2.5p167) 2009/04/26 Released by Harlan Stenn <stenn@ntp.org>
  * Crypto cleanup from Dave Mills.
  (4.2.5p166) 2009/04/25 Released by Harlan Stenn <stenn@ntp.org>
diff --cc ntpd/ntp_refclock.c
index cd1e51f35,58e948f18..f3dcdcfb0
--- a/ntpd/ntp_refclock.c
+++ b/ntpd/ntp_refclock.c
@@@ -1215,11 -1215,11 +1215,11 @@@ refclock_ppsapi
  	struct refclock_atom *ap	/* atom structure pointer */
  	)
  {
 -	if (ap->handle == NULL) {
 +	if (!ap->handle) {
  		if (time_pps_create(fddev, &ap->handle) < 0) {
  			msyslog(LOG_ERR,
- 			    "refclock_atom: time_pps_create failed: %m");
- 			return (errno);
+ 			    "refclock_ppsapi: time_pps_create: %m");
+ 			return (0);
  		}
  	}
  	return (1);