Merge whimsy.udel.edu:/backroom/ntp-stable

into whimsy.udel.edu:/backroom/ntp-dev

bk: 3ebf42f9M2yjKZqs4UKNgJfAQk4snw

diff --cc configure.in
index 2c45cd37d458e654ad1cb28ee2e04d79814876ad,99753d05f111639b66ae585d666d21df774f16dd..401bd6458a36be689b10276bb76bb158f38a2367
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -259,29 -238,20 +259,39 @@@ AC_CHECK_FUNC(setsockopt, , AC_CHECK_LI
  
  AC_HEADER_STDC
  AC_CHECK_HEADERS(bstring.h errno.h fcntl.h ieeefp.h math.h memory.h netdb.h)
 -AC_CHECK_HEADERS(poll.h resolv.h sched.h sgtty.h stdlib.h string.h termio.h)
 +AC_CHECK_HEADERS(poll.h)
 +AC_CHECK_HEADERS(sched.h sgtty.h stdlib.h string.h termio.h)
- AC_CHECK_HEADERS(termios.h timepps.h timex.h unistd.h utmp.h utmpx.h)
+ AC_CHECK_HEADERS(termios.h timepps.h timex.h unistd.h)
+ case "$host" in
+  *-*-aix*)
+     AC_CHECK_HEADERS(utmpx.h)
+     case "$ac_cv_header_utmpx_h" in
+      yes) ;;
+      *) AC_CHECK_HEADERS(utmp.h) ;;
+     esac
+     ;;
+  *) AC_CHECK_HEADERS(utmp.h utmpx.h) ;;
+ esac
 -AC_CHECK_HEADERS(arpa/nameser.h net/if.h netinet/in_system.h)
 -AC_CHECK_HEADERS(netinet/in_systm.h netinet/in.h netinet/ip.h)
 +AC_CHECK_HEADERS(arpa/nameser.h)
 +AC_CHECK_HEADERS(net/if.h, [], [],
 +[#if HAVE_SYS_SOCKET_H
 +#include <sys/socket.h>
 +#endif
 +])
 +AC_CHECK_HEADERS(net/if6.h)
 +AC_CHECK_HEADERS(netinet/in_system.h netinet/in_systm.h)
 +AC_CHECK_HEADERS(netinet/in.h)
 +AC_CHECK_HEADERS(netinet/ip.h, [], [],
 +[#if HAVE_SYS_TYPES_H
 +#include <sys/types.h>
 +#endif
 +#if HAVE_NETINET_IN_H
 +#include <netinet/in.h>
 +#endif
 +#if HAVE_NETINET_IN_SYSTM_H
 +#include <netinet/in_systm.h>
 +#endif
 +])
  AC_CHECK_HEADERS(netinfo/ni.h, [AC_DEFINE(HAVE_NETINFO, 1, [NetInfo support?])])
  AC_CHECK_HEADERS(sun/audioio.h sys/audioio.h)
  dnl AC_CHECK_HEADERS(sys/chudefs.h)

diff --cc ntpd/refclock_neoclock4x.c
index adcfafafd649d57c3cbb70ae8422c7fe3f2bb59c,326dc27c0f465cb723487bb7d0cd36aa0b0f13e7..cd8ba0c73a9da33dbcf014bc7a6640934e0caa79
--- 1/ntpd/refclock_neoclock4x.c
--- 2/ntpd/refclock_neoclock4x.c
+++ b/ntpd/refclock_neoclock4x.c
@@@ -418,10 -418,9 +418,10 @@@ neoclock4x_receive(struct recvbuf *rbuf
    int day;
    int month;  /* ddd conversion */
    int c;
 +  int dsec;
    unsigned char calc_chksum;
    int recv_chksum;
-   
+ 
    peer = (struct peer *)rbufp->recv_srcclock;
    pp = peer->procptr;
    up = (struct neoclock4x_unit *)pp->unitptr;
@@@ -522,9 -521,9 +522,9 @@@
    neol_atoi_len(&pp->a_lastcode[NEOCLOCK4X_OFFSET_HOUR], &pp->hour, 2);
    neol_atoi_len(&pp->a_lastcode[NEOCLOCK4X_OFFSET_MINUTE], &pp->minute, 2);
    neol_atoi_len(&pp->a_lastcode[NEOCLOCK4X_OFFSET_SECOND], &pp->second, 2);
 -  neol_atoi_len(&pp->a_lastcode[NEOCLOCK4X_OFFSET_HSEC], &pp->msec, 2);
 -  pp->msec *= 10; /* convert 1/100s from neoclock to real miliseconds */
 +  neol_atoi_len(&pp->a_lastcode[NEOCLOCK4X_OFFSET_HSEC], &dsec, 2);
 +  pp->nsec = dsec * 10000; /* convert 1/100s from neoclock to nanoseconds */
-   
+ 
    memcpy(up->radiosignal, &pp->a_lastcode[NEOCLOCK4X_OFFSET_RADIOSIGNAL], 3);
    up->radiosignal[3] = 0;
    memcpy(up->serial, &pp->a_lastcode[NEOCLOCK4X_OFFSET_SERIAL], 6);
@@@ -576,13 -575,13 +576,13 @@@
    */
    pp->day = ymd2yd(pp->year, month, day);
    pp->leap = 0;
-   
+ 
    if(pp->sloppyclockflag & CLK_FLAG4)
      {
 -      msyslog(LOG_DEBUG, "NeoClock4X(%d): calculated UTC date/time: %04d-%02d-%02d %02d:%02d:%02d.%03d",
 +      msyslog(LOG_DEBUG, "NeoClock4X(%d): calculated UTC date/time: %04d-%02d-%02d %02d:%02d:%02d.%03ld",
              up->unit,
              pp->year, month, day,
 -            pp->hour, pp->minute, pp->second, pp->msec);
 +            pp->hour, pp->minute, pp->second, pp->nsec/1000);
      }
  
    up->utc_year   = pp->year;
@@@ -591,8 -590,8 +591,8 @@@
    up->utc_hour   = pp->hour;
    up->utc_minute = pp->minute;
    up->utc_second = pp->second;
 -  up->utc_msec   = pp->msec;
 +  up->utc_msec   = pp->nsec/1000;
-   
+ 
    if(!refclock_process(pp))
      {
        NLOG(NLOG_CLOCKEVENT)