Merge psp-at1.ntp.org:/home/stenn/ntp-stable

into  psp-at1.ntp.org:/a/local/amd/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-2962

bk: 564ad9c4zrnEWMcjB89B4ktSXh82Dw

diff --cc ChangeLog
index baf817f545ce7a8c3b714f20c63a90d2d8c91aa7,7780aafd0fec6a56e08b0c6e24c15c29f5abc375..d69d1058220e1156b0a409953f00fba6beee7346
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -5,11 -5,12 +5,17 @@@
  * [Bug 2954] Version 4.2.8p4 crashes on startup with sig fault
    - fixed data race conditions in threaded DNS worker. perlinger@ntp.org
    - limit threading warm-up to linux; FreeBSD bombs on it. perlinger@ntp.org
 -  - fixed several other warnings (cast-alignment, missing const, missing prorotypes)
 +* [Bug 2957] 'unsigned int' vs 'size_t' format clash. perlinger@ntp.org
 +  - accept key file only if there are no parsing errors
 +  - fixed size_t/u_int format clash
 +  - fixed wrong use of 'strlcpy'
+ * [Bug 2962] truncation of size_t/ptrdiff_t on 64bit targets. perlinger@ntp.org
++  - fixed several other warnings (cast-alignment, missing const, missing prototypes)
+   - promote use of 'size_t' for values that express a size
+   - use ptr-to-const for read-only arguments
+   - make sure SOCKET values are not truncated (win32-specific)
+   - format string fixes
 +* [Bug 2965] Local clock didn't work since 4.2.8p4.  Martin Burnicki.
  * Unity cleanup for FreeBSD-6.4.  Harlan Stenn.
  * Unity test cleanup.  Harlan Stenn.
  ---

diff --cc libntp/authkeys.c
index 5bd696cc2758aca6d843d8568e5472a74a1f72d7,c84df449091852c55110da87372964571392a3f0..f7462a2463aea2c4091086991c2d6913a8d9a2f5
--- 1/libntp/authkeys.c
--- 2/libntp/authkeys.c
+++ b/libntp/authkeys.c
@@@ -657,9 -645,9 +657,9 @@@ size_
  authencrypt(
        keyid_t         keyno,
        u_int32 *       pkt,
-       int             length
+       size_t          length
        )
 -{\
 +{
        /*
         * A zero key identifier means the sender has not verified
         * the last message was correctly authenticated. The MAC

diff --cc tests/sandbox/uglydate.c
index d4a30e3950151ad1de269cd981fd27df8ed75375,519bddca6d467f8be8f9bca08e1291ffbfc05106..394d59436e4f446c36ac4849f65843dd6a51864d
--- 1/tests/sandbox/uglydate.c
--- 2/tests/sandbox/uglydate.c
+++ b/tests/sandbox/uglydate.c
@@@ -5,10 -5,11 +5,11 @@@
  //#include "ntp_stdlib.h"
  //#include "libntptest.h"
  
 -extern void test_ConstantDateTime(void);
 +void test_ConstantDateTime(void);
  
  void
- test_ConstantDateTime(void) {
+ test_ConstantDateTime(void)
+ {
        const u_int32 HALF = 2147483648UL;
  
        l_fp e_time = {{3485080800UL}, HALF}; // 2010-06-09 14:00:00.5