Changes from Dave Mills (near as I can tell).

bk: 3d41eff3oF2sX4etjjpogjndHWXngg

diff --git a/ntpd/ntp_control.c b/ntpd/ntp_control.c
index 3942f423d11a9cc40cbea39781dd1f986a50c042..1c8b039079d8979de3a780715f6a254fe3382447 100644 (file)
--- a/ntpd/ntp_control.c
+++ b/ntpd/ntp_control.c
@@ -1646,7 +1646,7 @@ ctl_putpeer(
                ctl_putint(peer_var[CP_INITSEQ].text, ap->seq);
                ctl_puthex(peer_var[CP_INITKEY].text, ap->key);
                ctl_putuint(peer_var[CP_INITTSP].text,
-                   peer->recval.tstamp);
+                   ntohl(peer->recval.tstamp));
                break;
 #endif /* OPENSSL */
        }

diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c
index 1a0ae9701958d0c005d95cbc3e178a3e9d2e4ff1..34b60e59660aeb8ca1808fc8b39053656a8e1494 100644 (file)
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -1262,7 +1262,7 @@ clock_update(void)
         */
        if (sys_peer == NULL)
                return;
-       if (sys_peer->pollsw == FALSE || sys_peer->burst > 0)
+       if (sys_peer->pollsw == FALSE)
                return;
        sys_peer->pollsw = FALSE;
 #ifdef DEBUG