merge cleanup

bk: 46c6a8d7tu7ezD3p8wBokqeqbreL6w

diff --git a/ChangeLog b/ChangeLog
index d50d203f9e94bd18bead00897ea8634be8a328fb..47146badf8289131984f9018df6307dcf793ac0f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -90,6 +90,19 @@
 * [Bug 756] Require ANSI C (function prototypes).
 * codec (audio) and ICOM changes from Dave Mills.
 
+---
+
+* ntpd/refclock_parse.c: cleanup shutdown while the file descriptor is still
+  open.
+* [Bug 885] use emalloc() to get a message at the end of the memory
+  unsigned types cannot be less than 0
+  default_ai_family is a short
+  lose trailing , from enum list
+* [Bug 884] don't access recv buffers after having them passed to the free
+  list.
+* [Bug 882] allow loopback interfaces to share addresses with other
+  interfaces.
+
 ---
 (4.2.4p3) Released by Harlan Stenn <stenn@ntp.org>