Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-2001

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

bk: 4e58685fEKinFGlH54puDHHEO75EFQ

diff --cc ChangeLog
Simple merge

diff --cc ntpd/ntp_request.c
index 54bd940b3ad8855777bb80c1290afbad1135f857,bc490fae80b5f20f7b2b74ed8f0cfec9753905ae..af7b4ffb9abe4749d797bea9e67299f3d012e2df
--- 1/ntpd/ntp_request.c
--- 2/ntpd/ntp_request.c
+++ b/ntpd/ntp_request.c
@@@ -1234,19 -1255,21 +1234,21 @@@ io_stats
   */
  static void
  timer_stats(
-       sockaddr_u *srcadr,
-       endpt *inter,
-       struct req_pkt *inpkt
+       sockaddr_u *            srcadr,
 -      struct interface *      inter,
++      endpt *                 inter,
+       struct req_pkt *        inpkt
        )
  {
-       register struct info_timer_stats *ts;
+       struct info_timer_stats *       ts;
+       u_long                          sincereset;
  
-       ts = (struct info_timer_stats *)prepare_pkt(srcadr, inter, inpkt,
-                                                   sizeof(struct info_timer_stats));
+       ts = (struct info_timer_stats *)prepare_pkt(srcadr, inter,
+                                                   inpkt, sizeof(*ts));
  
-       ts->timereset = htonl((u_int32)(current_time - timer_timereset));
-       ts->alarms = htonl((u_int32)alarm_overflow);
-       ts->overflows = htonl((u_int32)timer_overflows);
+       sincereset = current_time - timer_timereset;
+       ts->timereset = htonl((u_int32)sincereset);
+       ts->alarms = ts->timereset;
+       ts->overflows = htonl((u_int32)alarm_overflow);
        ts->xmtcalls = htonl((u_int32)timer_xmtcalls);
  
        (void) more_pkt();