Merge pogo.udel.edu:/pogo/users/stenn/ntp-dev

into  pogo.udel.edu:/pogo/users/stenn/ntp-dev-ag

bk: 441cbe6fjnAaab5tafRRJ-wdesV5wg

diff --cc include/ntpd.h
index 695112c6e67ea491f58ec3f75868056b8b6c7e5d,971202895cc624f07efa6e4c92c0db8f62947c0d..44f3ea08eeb0de830c4c1ef362fcd714e598f0ba
--- 1/include/ntpd.h
--- 2/include/ntpd.h
+++ b/include/ntpd.h
@@@ -209,8 -209,8 +209,8 @@@ extern     l_fp    sys_revoketime
  
  /* ntp_util.c */
  extern        void    init_util       P((void));
- extern        void    hourly_stats    P((void));
+ extern        void    write_stats     P((void));
 -extern        void    stats_config    P((int, char *));
 +extern        void    stats_config    P((int, const char *));
  extern        void    record_peer_stats P((struct sockaddr_storage *, int, double, double, double, double));
  extern        void    record_loop_stats P((double, double, double, double, int));
  extern        void    record_clock_stats P((struct sockaddr_storage *, const char *));

diff --cc ntpd/ntp_config.c
Simple merge

diff --cc ntpd/ntp_util.c
Simple merge

diff --cc ntpd/ntpd.c
Simple merge