From: Juergen Perlinger <perlinger@ntp.org>
Date: Sat, 27 Aug 2022 06:35:15 +0000 (+0200)
Subject: Merge ntp.org:/home/jnperlin/Projects/NTP-DEV/src/ntp-stable-p16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3da64eb091bde2e51abbd67d14a180ed5a24eca;p=thirdparty%2Fntp.git

Merge ntp.org:/home/jnperlin/Projects/NTP-DEV/src/ntp-stable-p16
into  ntp.org:/home/jnperlin/Projects/NTP-DEV/src/ntp-stable-3758

bk: 6309bb23Uw9DXd9ftW2Wln_HFZHToA
---

c3da64eb091bde2e51abbd67d14a180ed5a24eca
diff --cc ChangeLog
index daa4020cb,c4e56b299..3edb482da
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,43 -1,7 +1,44 @@@
  ---
 -* [Bug 3741] 4.2.8p15 can't build with glibc 2.34 <perlinger@ntp.org>
 -* [Bug 3757] Improve handling of Linux-PPS in NTPD <perlinger@ntp.org>
+ * [Bug 3758] Provide a 'device' config statement for refclocks <perlinger@ntp.org> 
 +* [Bug 3757] Improve handling of Linux-PPS in NTPD <perlinger@ntp.org>
 +* [Bug 3741] 4.2.8p15 can't build with glibc 2.34 <perlinger@ntp.org>
 +* [Bug 3694] NMEA refclock seems to unnecessarily require location in messages
 +  - misleading title; essentially a request to ignore the receiver status.
 +    Added a mode bit for this. <perlinger@ntp.org>
 +* [Bug 3693] Improvement of error handling key lengths <perlinger@ntp.org>
 +  - original patch by Richard Schmidt, with mods & unit test fixes
 +* [Bug 3692] /dev/gpsN requirement prevents KPPS <perlinger@ntp.org>
 +  - implement/wrap 'realpath()' to resolve symlinks in device names
 +* [Bug 3691] Buffer Overflow reading GPSD output
 +  - original patch by matt<ntpbr@mattcorallo.com>
 +  - increased max PDU size to 4k to avoid truncation
 +* [Bug 3690] newline in ntp clock variable (parse) <perlinger@ntp.org>
 +  - patch by Frank Kardel
 +* [Bug 3689] Extension for MD5, SHA-1 and other keys <perlinger@ntp.org>
 +  - ntp{q,dc} now use the same password processing as ntpd does in the key
 +    file, so havin a binary secret >= 11 bytes is possible for all keys.
 +    (This is a different approach to the roblem than suggested)
 +* [Bug 3688] GCC 10 build errors in testsuite <perlinger@ntp.org>
 +* [Bug 3687] ntp_crypto_rand RNG status not known <perlinger@ntp.org>
 +  - patch by Gerry Garvey
 +* [Bug 3682] Fixes for warnings when compiled without OpenSSL <perlinger@ntp.org>
 +  - original patch by Gerry Garvey
 +* [Bug 3677] additional peer events not decoded in associations listing <perlinger@ntp.org>
 +  - original patch by Gerry Garvey
 +* [Bug 3676] compiler warnings (CMAC, interrupt_buf, typo, fallthrough)
 +  - applied patches by Gerry Garvey
 +* [Bug 3675] ntpq ccmds[] stores pointer to non-persistent storage
 +* [Bug 3674] ntpq command 'execute only' using '~' prefix <perlinger@ntp.org>
 +  - idea+patch by Gerry Garvey
 +* [Bug 3672] fix biased selection in median cut <perlinger@ntp.org>
 +* [Bug 3666] avoid unlimited receive buffer allocation <perlinger@ntp.org>
 +  - follow-up: fix inverted sense in check, reset shortfall counter
 +* [Bug 3626] (SNTP) UTC offset calculation needs dst flag <perlinger@ntp.org>
 +  - applied patch by Gerry Garvey
 +* [Bug 3432] refclocks that 'write()' should check the result <perlinger@ntp.org>
 +  - backport from -dev, plus some more work on warnings for unchecked results
 +* Implement NTP_FUNC_REALPATH.  <stenn@ntp.org>
 +* Lose a gmake construct in ntpd/Makefile.am.  <stenn@ntp.org>
  
  ---
  (4.2.8p15) 2020/06/23 Released by Harlan Stenn <stenn@ntp.org>
diff --cc ntpd/refclock_gpsdjson.c
index 825008fb2,038b0e433..354d89c0c
--- a/ntpd/refclock_gpsdjson.c
+++ b/ntpd/refclock_gpsdjson.c
@@@ -501,10 -502,10 +502,11 @@@ gpsd_start
  {
  	clockprocT  * const pp = peer->procptr;
  	gpsd_unitT  * up;
- 	gpsd_unitT ** uscan    = &s_clock_units;	
+ 	gpsd_unitT ** uscan    = &s_clock_units;
+ 	const char  *tmpName;
  
 -	struct stat sb;
 +	struct stat	sb;
 +	char *		devname = NULL;
  
  	/* check if we can proceed at all or if init failed */
  	if ( ! gpsd_init_check())