Merge pogo.udel.edu:/pogo/users/hart/ntp-stable-3888

into  pogo.udel.edu:/pogo/users/hart/ntp-stable-3847-64-88

bk: 65ae1ca820CV5beMa_9GddoHcFvfvw

diff --cc ChangeLog
index 61a175e6b8a7e3995a9604d1fa71743dae3fd2ff,767326838c591a7ca9a28af1390a9f8b81a780a9..642fbf6867b2c6c7f9658d085e415b05146b4f2c
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -53,13 -54,14 +58,22 @@@
  * Remove dead code libntp/numtohost.c and its unit tests. <hart@ntp.org>
  * Remove class A, B, C IPv4 distinctions in netof(). <hart@ntp.org>
  * Use NONEMPTY_COMPILATION_UNIT in more conditionally-compiled files.
 +* Use @configure_input@ in various *.in files to include a comment that
 +  the file is generated from another pointing to the *.in. <hart@ntp.org>
 +* Correct underquoting, indents in ntp_facilitynames.m4. <hart@ntp.org>
 +* Clean up a few warnings seen building with older gcc. <hart@ntp.org>
 +* Fix build on older FreeBSD lacking sys/procctl.h. <hart@ntp.org>
 +* Disable [Bug 3627] workaround on newer FreeBSD which has the kernel fix
 +  that makes it unnecessary, re-enabling ASLR stack gap. <hart@ntp.org>
++* Use NONEMPTY_COMPILATION_UNIT in more conditionally-compiled files.
+ * Remove useless pointer to Windows Help from system error messages.
+ * Avoid newlines within Windows error messages. <hart@ntp.org>
+ * Ensure unique association IDs if wrapped. <hart@ntp.org>
+ * Simplify calc_addr_distance(). <hart@ntp.org>
+ * Clamp min/maxpoll in edge cases in newpeer(). <hart@ntp.org>
+ * Quiet local addr change logging when unpeering. <hart@ntp.org>
+ * Correct missing arg for %s printf specifier in 
+   send_blocking_resp_internal(). <hart@ntp.org>
  
  ---
  (4.2.8p17) 2023/06/06 Released by Harlan Stenn <stenn@ntp.org>

diff --cc include/ntp.h
Simple merge

diff --cc ntpd/ntp_io.c
Simple merge

diff --cc ntpd/ntp_proto.c
Simple merge

diff --cc ntpd/ntp_util.c
Simple merge

diff --cc ntpq/ntpq-subs.c
Simple merge