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

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

bk: 3d2156a0z6qfnKADuwLYRxew4VtkVQ

diff --cc include/ntp.h
Simple merge

diff --cc ntpd/ntp_config.c
Simple merge

diff --cc ntpd/ntp_crypto.c
Simple merge

diff --cc ntpd/ntp_peer.c
Simple merge

diff --cc ntpd/ntp_proto.c
index 9a290e5f001fc27a03465834e26a34d0a9c5311a,11bf9fb444be425e67ffa59d54b6adba30421234..185ee1c6575c239e7c05bedc00edd326fb028f51
--- 1/ntpd/ntp_proto.c
--- 2/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@@ -205,8 -204,8 +205,8 @@@ transmit
                                clock_select();
                        }
                        if ((peer->stratum > 1 && peer->refid ==
 -                          peer->dstadr->sin.sin_addr.s_addr) ||
 +                          ((struct sockaddr_in*)&peer->dstadr->sin)->sin_addr.s_addr) ||
-                           peer->stratum >= STRATUM_UNSPEC)
+                           peer->stratum == STRATUM_UNSPEC)
                                hpoll++;
                        else
                                hpoll = sys_poll;
@@@ -1386,12 -1320,10 +1321,10 @@@ clock_update(void
                sys_stratum = sys_peer->stratum + 1;
                if (sys_stratum == 1)
                        sys_refid = sys_peer->refid;
-               if (sys_stratum == 1)
-                       sys_refid = sys_peer->refid;;
-               if (sys_stratum == STRATUM_UNSPEC)
+               else if (sys_stratum == STRATUM_UNSPEC)
                        memcpy(&sys_refid, "UNSP", 4);
                else
 -                      sys_refid = sys_peer->srcadr.sin_addr.s_addr;
 +                      sys_refid = 0;  /* <**** REFID case to solve *****> */
                sys_reftime = sys_peer->rec;
                sys_rootdelay = sys_peer->rootdelay + sys_peer->delay;
                sys_leap = leap_consensus;