Merge bk://maccarony.ntp.org/ntp-dev

into  pogo.udel.edu:/pogo/users/burnicki/ntp-dev-bug-1118

bk: 4974462d8SmA7VtAbhvgAFvCVPc7tQ

diff --cc ChangeLog
index 89f88bd75d84bfc964c2bf2f1fc53c31ae02f309,0f499d74f975fcfaa92217d1be94d589f19d3b07..1bfd4c48485d182329b5f7fdff210fedb4d1e8d8
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,10 +1,13 @@@
 +* [Bug 1118] Fixed sign extension for 32 bit time_t in caljulian() and prettydate().
 +  Fixed some compiler warnings about missing prototypes.
 +  Fixed some other simple compiler warnings.
+ * [Bug 1119] [CID 52] Avoid a possible null-dereference in ntp_crypto.c.
+ * [Bug 1120] [CID 51] INSIST that peer is non-null before we dereference it.
+ * [Bug 1121] [CID 47] double fclose() in ntp-keygen.c.
+ (4.2.5p155) 2009/01/18 Released by Harlan Stenn <stenn@ntp.org>
+ * Documentation updates from Dave Mills.
+ * CHU frequency updates.
+ * Design assertion fixes for ntp_crypto.c from Dave Mills.
  (4.2.5p154) 2009/01/13 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 992] support interface event change on Linux from
    Miroslav Lichvar.