Merge tl.ntp.md:C:/ntp/stable/3864

into  tl.ntp.md:C:/ntp/stable/3847-64

bk: 654215a5c3s2n_lgMmrOo8sxpfpGCA

diff --cc ChangeLog
index 84e45b3979e5e10cbab30dd024e2bb123af8a6ca,8509fa55046b3e45cde79c396f4c053b65179be9..61a175e6b8a7e3995a9604d1fa71743dae3fd2ff
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,19 -1,9 +1,21 @@@
  ---
  
 +* [Bug 3872] Ignore restrict mask for hostname. <hart@ntp.org>
 +* [Bug 3871] 4.2.8p17 build without hopf6021 refclock enabled fails.
 +             Reported by Hans Mayer.  Moved NONEMPTY_TRANSLATION_UNIT
 +             declaration from ntp_types.h to config.h.  <hart@ntp.org>
 +* [Bug 3869] Remove long-gone "calldelay" & "crypto sign" from docs.
 +             Reported by PoolMUC@web.de. <hart@ntp.org>
 +* [Bug 3868] Cannot restrict a pool peer. <hart@ntp.org>  Thanks to
 +             Edward McGuire for tracking down the deficiency.
+ * [Bug 3864] ntpd IPv6 refid different for big-endian and little-endian.
+              <hart@ntp.org>
 +* [Bug 3859] Use NotifyIpInterfaceChange on Windows ntpd. <hart@ntp.org>
  * [Bug 3856] Enable Edit & Continue debugging with Visual Studio.
               <hart@ntp.org>
 +* [Bug 3855] ntpq lacks an equivalent to ntpdc's delrestrict. <hart@ntp.org>
 +* [Bug 3854] ntpd 4.2.8p17 corrupts rawstats file with space in refid.
 +             <hart@ntp.org>
  * [Bug 3853] Clean up warnings with modern compilers. <hart@ntp.org>
  * [Bug 3852] check-libntp.mf and friends are not triggering rebuilds as
               intended. <hart@ntp.org>

diff --cc include/ntp.h
index 9ff5a408f15dfa98dfcfe60a930288d43cc75558,441f5889d4abfd5c0d63e0790ab9a6dba920c071..98d1210f88897c51e5ef395f56900baed12448e3
--- 1/include/ntp.h
--- 2/include/ntp.h
+++ b/include/ntp.h
@@@ -944,10 -952,9 +947,14 @@@ struct endpoint 
  /* similar datagrams per response limit for ntpd */
  #define MRU_FRAGS_LIMIT       128
  
- 
 +/* found on POSIX systems in sysexit.h */
 +#ifndef EX_SOFTWARE
 +# define EX_SOFTWARE  70      /* internal software error */
 +#endif
 +
+ #define BYTESWAP32(u32)                                                       \
+                       (((u_int32)(u32) & 0xff000000) >> 24 |          \
+                        ((u_int32)(u32) &   0xff0000) >>  8 |          \
+                        ((u_int32)(u32) &     0xff00) <<  8 |          \
+                        ((u_int32)(u32) &       0xff) << 24)
  #endif /* NTP_H */

diff --cc ntpd/ntp_io.c
Simple merge

diff --cc ntpd/ntp_proto.c
Simple merge