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

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1293

bk: 4a999e0cIJK-_wtd0jjz8XJlsHijTg

diff --cc ChangeLog
index 2ebf42aa7e8982509555375c73d839b100873ac5,c216d20e39683f233e34c260efc21d495a1746ae..4e6bb1265f69abfcfe19a9ab7a328490db8acfb6
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,16 +1,18 @@@
+ * [Bug 1293] make configuration dumper ready for release, specifically:
+ * rename ntpq dumpcfg command to "saveconfig".
+ * require authentication for saveconfig.
+ * "restrict ... nomodify" prevents saveconfig and :config.
+ * "saveconfig ." shorthand to save to startup configuration file.
+ * support strftime() substitution in saveconfig arg to timestamp
+   the output filename, for example "saveconfig %Y%m%d-%H%M%S.conf".
+ * display saveconfig response message from ntpd in ntpq.
+ * save output filename in "savedconfig" variable, fetched with ntpq -c
+   "rv 0 savedconfig".
+ * document saveconfig in html/ntpq.html.
+ * add ./configure --disable-saveconfig to build a smaller ntpd.
+ * log saveconfig failures and successes to syslog.
 +(4.2.5p207) 2009/08/29 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 1292] Minor Windows source tweaks for VC6-era SDK headers.
  (4.2.5p206) 2009/08/26 Released by Harlan Stenn <stenn@ntp.org>
  * accopt.html typo fixes from Dave Mills.
  * [Bug 1283] default to remembering KoD in sntp.

diff --cc ports/winnt/include/config.h
Simple merge