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

into  psp-deb1.ntp.org:/home/perlinger/ntp-dev-1875

bk: 4d9d516b8Su9RoxGqSjc4QuMDTGIXg

diff --cc ChangeLog
index 76549e834a28112f113a1c76355198515b46fe3f,64566e88a059fc3038a7eec0cbb1dc02b0fa1915..a6cbb92c3804a1ca1db6fae2efe9130571f3bec6
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,8 +1,10 @@@
 +* [Bug 1875] 'asn2ntp()' rewritten with 'caltontp()'; 'timegm()'
 +  substitute likely to crash with 64bit time_t.
+ (4.2.7p146) 2011/04/05 Released by Harlan Stenn <stenn@ntp.org>
+ * String buffer safety cleanup, converting to strlcpy() and strlcat().
+ * Use utmpname() before pututline() so repeated steps do not
+   accidentally record into wtmp where utmp was intended.
+ * Use setutent() before each pututline() including first.
  (4.2.7p145) 2011/04/04 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1840] ntp_lists.h FIFO macros buggy.
  (4.2.7p144) 2011/04/03 Released by Harlan Stenn <stenn@ntp.org>