Clean up from recent merges from ntp-stable.

bk: 3de453db5_KGzDo8prreTfgK6VTgLA

diff --git a/configure.in b/configure.in
index 15e5f149cbb824a66b284f3f12406037fbc24a6e..d40a0e9d4c582e8fd8b5ed916513c929aa92c77e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3495,6 +3495,7 @@ AC_CONFIG_FILES(scripts/freq_adj, [chmod +x scripts/freq_adj])
 AC_CONFIG_FILES(scripts/mkver,         [chmod +x scripts/mkver])
 AC_CONFIG_FILES(scripts/ntp-wait,      [chmod +x scripts/ntp-wait])
 AC_CONFIG_FILES(scripts/ntpsweep,      [chmod +x scripts/ntpsweep])
+AC_CONFIG_FILES(scripts/ntptrace,      [chmod +x scripts/ntptrace])
 AC_CONFIG_FILES(scripts/ntpver,                [chmod +x scripts/ntpver])
 AC_CONFIG_FILES(scripts/plot_summary,  [chmod +x scripts/plot_summary])
 AC_CONFIG_FILES(scripts/summary,       [chmod +x scripts/summary])

diff --git a/ntpd/ntp_request.c b/ntpd/ntp_request.c
index cd739078fdbd5ded78ed7bea93bd603bdc261529..762d111e52518bb7e68960067a5763fc76db6590 100644 (file)
--- a/ntpd/ntp_request.c
+++ b/ntpd/ntp_request.c
@@ -436,7 +436,7 @@ process_private(
            || (++ec, INFO_MBZ(inpkt->mbz_itemsize) != 0)
            || (++ec, rbufp->recv_length < REQ_LEN_HDR)
                ) {
-               msyslog(LOG_ERR, "process_private: INFO_ERR_FMT: test %d failed, pkt from %s", ec, inet_ntoa(srcadr->sin_addr));
+               msyslog(LOG_ERR, "process_private: INFO_ERR_FMT: test %d failed, pkt from %s", ec, stoa(&srcadr));
                req_ack(srcadr, inter, inpkt, INFO_ERR_FMT);
                return;
        }