Merge bk://ntp.bkbits.net/ntp-dev

into  pogo.udel.edu:/pogo/users/utterback/ntp-dev-smf

bk: 46820e05NZ8A0fKOF0PT34QxeeTV3A

diff --cc ChangeLog
index 1d2965ba4e6aba2fbaef3ad279e82259b7ba25fb,262465e4589a86809d644e0e031f35e7a891f4d9..21d302b72fdd1ab2ac54d2bdbd09ffcb9b1f24d9
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,13 -1,9 +1,14 @@@
+ * [Bug 864] Place ntpd service in maintenance mode if using SMF on Solaris
 +* [Bug 862] includefile nesting; preserve phonelist on reconfig.
 +* [Bug 604] ntpd regularly dies on linux/alpha.
 +* more leap second infrastructure fixes from Dave Mills.
 +* [Bug 858] recent leapfile changes broke non-OpenSSL builds.
 +* Use emalloc() instead of malloc() in refclock_datum.c (Calysto).
  * Start using 'design by contract' assertions.
 +* [Bug 767] Fast sync to refclocks wanted.
  * Allow null driftfile.
 -* leap second infrastructure fixes from Dave Mills.
  * Use YYERROR_VERBOSE for the new parser, and fix related BUILT_SOURCES.
 -* [Bug #629] changes to ensure broadcast works including on wildcard addresses
 +* [Bug 629] changes to ensure broadcast works including on wildcard addresses
  * [Bug 853] get_node() must return a pointer to maximally-aligned memory.
  * Initial leap file fixes from Dave Mills.
  * [Bug 858] Recent leapfile changes broke without OPENSSL.

diff --cc ntpd/ntp_proto.c
Simple merge