From ab1f1aa8333369a83ff284848fc3fc2e52d5f29f Mon Sep 17 00:00:00 2001
From: Cy Schubert
Date: Tue, 6 Jun 2023 05:26:44 -0700
Subject: [PATCH] ntp: import ntp-4.2.8p17
---
ChangeLog | 14 +
CommitLog | 464 ++++++++++++++++++
NEWS | 25 +
configure | 20 +-
include/ntp.h | 2 +-
include/ntp_md5.h | 4 +
include/ntp_stdlib.h | 39 +-
libntp/a_md5encrypt.c | 23 +-
libntp/authkeys.c | 27 +-
libntp/authreadkeys.c | 12 +-
libntp/msyslog.c | 5 +-
libparse/clk_hopf6021.c | 5 +-
libparse/clk_wharton.c | 5 +-
ntpd/invoke-ntp.conf.texi | 2 +-
ntpd/invoke-ntp.keys.texi | 2 +-
ntpd/invoke-ntpd.texi | 4 +-
ntpd/ntp.conf.5man | 4 +-
ntpd/ntp.conf.5mdoc | 4 +-
ntpd/ntp.conf.html | 2 +-
ntpd/ntp.conf.man.in | 4 +-
ntpd/ntp.conf.mdoc.in | 4 +-
ntpd/ntp.keys.5man | 4 +-
ntpd/ntp.keys.5mdoc | 4 +-
ntpd/ntp.keys.html | 2 +-
ntpd/ntp.keys.man.in | 4 +-
ntpd/ntp.keys.mdoc.in | 4 +-
ntpd/ntp_config.c | 18 +
ntpd/ntp_control.c | 1 -
ntpd/ntp_loopfilter.c | 3 -
ntpd/ntp_proto.c | 5 +-
ntpd/ntpd-opts.c | 14 +-
ntpd/ntpd-opts.h | 6 +-
ntpd/ntpd.1ntpdman | 4 +-
ntpd/ntpd.1ntpdmdoc | 4 +-
ntpd/ntpd.c | 6 +-
ntpd/ntpd.html | 4 +-
ntpd/ntpd.man.in | 4 +-
ntpd/ntpd.mdoc.in | 4 +-
ntpdc/invoke-ntpdc.texi | 4 +-
ntpdc/ntpdc-opts.c | 14 +-
ntpdc/ntpdc-opts.h | 6 +-
ntpdc/ntpdc.1ntpdcman | 4 +-
ntpdc/ntpdc.1ntpdcmdoc | 4 +-
ntpdc/ntpdc.html | 4 +-
ntpdc/ntpdc.man.in | 4 +-
ntpdc/ntpdc.mdoc.in | 4 +-
ntpq/invoke-ntpq.texi | 4 +-
ntpq/ntpq-opts.c | 14 +-
ntpq/ntpq-opts.h | 6 +-
ntpq/ntpq.1ntpqman | 4 +-
ntpq/ntpq.1ntpqmdoc | 4 +-
ntpq/ntpq.html | 4 +-
ntpq/ntpq.man.in | 4 +-
ntpq/ntpq.mdoc.in | 4 +-
ntpsnmpd/invoke-ntpsnmpd.texi | 2 +-
ntpsnmpd/ntpsnmpd-opts.c | 14 +-
ntpsnmpd/ntpsnmpd-opts.h | 6 +-
ntpsnmpd/ntpsnmpd.1ntpsnmpdman | 4 +-
ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc | 4 +-
ntpsnmpd/ntpsnmpd.html | 2 +-
ntpsnmpd/ntpsnmpd.man.in | 4 +-
ntpsnmpd/ntpsnmpd.mdoc.in | 4 +-
packageinfo.sh | 2 +-
.../calc_tickadj.1calc_tickadjman | 4 +-
.../calc_tickadj.1calc_tickadjmdoc | 4 +-
scripts/calc_tickadj/calc_tickadj.html | 2 +-
scripts/calc_tickadj/calc_tickadj.man.in | 4 +-
scripts/calc_tickadj/calc_tickadj.mdoc.in | 4 +-
scripts/calc_tickadj/invoke-calc_tickadj.texi | 2 +-
scripts/invoke-plot_summary.texi | 4 +-
scripts/invoke-summary.texi | 4 +-
scripts/ntp-wait/invoke-ntp-wait.texi | 4 +-
scripts/ntp-wait/ntp-wait-opts | 4 +-
scripts/ntp-wait/ntp-wait.1ntp-waitman | 4 +-
scripts/ntp-wait/ntp-wait.1ntp-waitmdoc | 4 +-
scripts/ntp-wait/ntp-wait.html | 4 +-
scripts/ntp-wait/ntp-wait.man.in | 4 +-
scripts/ntp-wait/ntp-wait.mdoc.in | 4 +-
scripts/ntpsweep/invoke-ntpsweep.texi | 4 +-
scripts/ntpsweep/ntpsweep-opts | 4 +-
scripts/ntpsweep/ntpsweep.1ntpsweepman | 4 +-
scripts/ntpsweep/ntpsweep.1ntpsweepmdoc | 4 +-
scripts/ntpsweep/ntpsweep.html | 4 +-
scripts/ntpsweep/ntpsweep.man.in | 4 +-
scripts/ntpsweep/ntpsweep.mdoc.in | 4 +-
scripts/ntptrace/invoke-ntptrace.texi | 4 +-
scripts/ntptrace/ntptrace-opts | 4 +-
scripts/ntptrace/ntptrace.1ntptraceman | 4 +-
scripts/ntptrace/ntptrace.1ntptracemdoc | 4 +-
scripts/ntptrace/ntptrace.html | 4 +-
scripts/ntptrace/ntptrace.man.in | 4 +-
scripts/ntptrace/ntptrace.mdoc.in | 4 +-
scripts/plot_summary-opts | 4 +-
scripts/plot_summary.1plot_summaryman | 4 +-
scripts/plot_summary.1plot_summarymdoc | 4 +-
scripts/plot_summary.html | 4 +-
scripts/plot_summary.man.in | 4 +-
scripts/plot_summary.mdoc.in | 4 +-
scripts/summary-opts | 4 +-
scripts/summary.1summaryman | 4 +-
scripts/summary.1summarymdoc | 4 +-
scripts/summary.html | 4 +-
scripts/summary.man.in | 4 +-
scripts/summary.mdoc.in | 4 +-
scripts/update-leap/invoke-update-leap.texi | 2 +-
scripts/update-leap/update-leap-opts | 4 +-
.../update-leap/update-leap.1update-leapman | 4 +-
.../update-leap/update-leap.1update-leapmdoc | 4 +-
scripts/update-leap/update-leap.html | 2 +-
scripts/update-leap/update-leap.man.in | 4 +-
scripts/update-leap/update-leap.mdoc.in | 4 +-
sntp/configure | 20 +-
sntp/crypto.c | 5 -
sntp/crypto.h | 1 -
sntp/include/version.def | 2 +-
sntp/include/version.texi | 6 +-
sntp/invoke-sntp.texi | 4 +-
sntp/m4/version.m4 | 2 +-
sntp/scm-rev | 2 +-
sntp/sntp-opts.c | 14 +-
sntp/sntp-opts.h | 6 +-
sntp/sntp.1sntpman | 4 +-
sntp/sntp.1sntpmdoc | 4 +-
sntp/sntp.html | 4 +-
sntp/sntp.man.in | 4 +-
sntp/sntp.mdoc.in | 4 +-
tests/libntp/Makefile.am | 39 +-
tests/libntp/Makefile.in | 176 ++++---
tests/libntp/data/mills,david-03.jpg | Bin 0 -> 40964 bytes
tests/libntp/data/ntp.keys | 34 ++
tests/libntp/digests.c | 415 ++++++++++++++++
tests/libntp/run-digests.c | 80 +++
util/invoke-ntp-keygen.texi | 4 +-
util/ntp-keygen-opts.c | 14 +-
util/ntp-keygen-opts.h | 6 +-
util/ntp-keygen.1ntp-keygenman | 4 +-
util/ntp-keygen.1ntp-keygenmdoc | 4 +-
util/ntp-keygen.html | 4 +-
util/ntp-keygen.man.in | 4 +-
util/ntp-keygen.mdoc.in | 4 +-
140 files changed, 1546 insertions(+), 400 deletions(-)
create mode 100644 tests/libntp/data/mills,david-03.jpg
create mode 100644 tests/libntp/data/ntp.keys
create mode 100644 tests/libntp/digests.c
create mode 100644 tests/libntp/run-digests.c
diff --git a/ChangeLog b/ChangeLog
index 8e34d2a96696..93cdab8b94eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+---
+(4.2.8p17) 2023/06/06 Released by Harlan Stenn
+
+* [Bug 3824] Spurious "ntpd: daemon failed to notify parent!" logged at
+ event_sync. Reported by Edward McGuire.
+* [Bug 3822] ntpd significantly delays first poll of servers specified by name.
+ Miroslav Lichvar identified regression in 4.2.8p16.
+* [Bug 3821] 4.2.8p16 misreads hex authentication keys, won't interop with
+ 4.2.8p15 or earlier. Reported by Matt Nordhoff, thanks to
+ Miroslav Lichvar and Matt for rapid testing and identifying the
+ problem.
+* Add tests/libntp/digests.c to catch regressions reading keys file or with
+ symmetric authentication digest output.
+
---
(4.2.8p16) 2023/05/31 Released by Harlan Stenn
diff --git a/CommitLog b/CommitLog
index 54bf0f9a45fc..adeda2c60402 100644
--- a/CommitLog
+++ b/CommitLog
@@ -1,3 +1,467 @@
+ChangeSet@1.4004, 2023-06-06 04:40:27-07:00, ntpreleng@ntp-build.tal1.ntfo.org
+ NTP_4_2_8P17
+ TAG: NTP_4_2_8P17
+
+ ChangeLog@1.2053 +1 -0
+ NTP_4_2_8P17
+
+ ntpd/invoke-ntp.conf.texi@1.225 +1 -1
+ NTP_4_2_8P17
+
+ ntpd/invoke-ntp.keys.texi@1.210 +1 -1
+ NTP_4_2_8P17
+
+ ntpd/invoke-ntpd.texi@1.524 +2 -2
+ NTP_4_2_8P17
+
+ ntpd/ntp.conf.5man@1.259 +2 -2
+ NTP_4_2_8P17
+
+ ntpd/ntp.conf.5mdoc@1.259 +2 -2
+ NTP_4_2_8P17
+
+ ntpd/ntp.conf.html@1.207 +1 -1
+ NTP_4_2_8P17
+
+ ntpd/ntp.conf.man.in@1.259 +2 -2
+ NTP_4_2_8P17
+
+ ntpd/ntp.conf.mdoc.in@1.259 +2 -2
+ NTP_4_2_8P17
+
+ ntpd/ntp.keys.5man@1.244 +2 -2
+ NTP_4_2_8P17
+
+ ntpd/ntp.keys.5mdoc@1.244 +2 -2
+ NTP_4_2_8P17
+
+ ntpd/ntp.keys.html@1.204 +1 -1
+ NTP_4_2_8P17
+
+ ntpd/ntp.keys.man.in@1.244 +2 -2
+ NTP_4_2_8P17
+
+ ntpd/ntp.keys.mdoc.in@1.244 +2 -2
+ NTP_4_2_8P17
+
+ ntpd/ntpd-opts.c@1.549 +7 -7
+ NTP_4_2_8P17
+
+ ntpd/ntpd-opts.h@1.548 +3 -3
+ NTP_4_2_8P17
+
+ ntpd/ntpd.1ntpdman@1.353 +2 -2
+ NTP_4_2_8P17
+
+ ntpd/ntpd.1ntpdmdoc@1.353 +2 -2
+ NTP_4_2_8P17
+
+ ntpd/ntpd.html@1.198 +2 -2
+ NTP_4_2_8P17
+
+ ntpd/ntpd.man.in@1.353 +2 -2
+ NTP_4_2_8P17
+
+ ntpd/ntpd.mdoc.in@1.353 +2 -2
+ NTP_4_2_8P17
+
+ ntpdc/invoke-ntpdc.texi@1.523 +2 -2
+ NTP_4_2_8P17
+
+ ntpdc/ntpdc-opts.c@1.544 +7 -7
+ NTP_4_2_8P17
+
+ ntpdc/ntpdc-opts.h@1.543 +3 -3
+ NTP_4_2_8P17
+
+ ntpdc/ntpdc.1ntpdcman@1.354 +2 -2
+ NTP_4_2_8P17
+
+ ntpdc/ntpdc.1ntpdcmdoc@1.354 +2 -2
+ NTP_4_2_8P17
+
+ ntpdc/ntpdc.html@1.368 +2 -2
+ NTP_4_2_8P17
+
+ ntpdc/ntpdc.man.in@1.354 +2 -2
+ NTP_4_2_8P17
+
+ ntpdc/ntpdc.mdoc.in@1.354 +2 -2
+ NTP_4_2_8P17
+
+ ntpq/invoke-ntpq.texi@1.533 +2 -2
+ NTP_4_2_8P17
+
+ ntpq/ntpq-opts.c@1.553 +7 -7
+ NTP_4_2_8P17
+
+ ntpq/ntpq-opts.h@1.551 +3 -3
+ NTP_4_2_8P17
+
+ ntpq/ntpq.1ntpqman@1.361 +2 -2
+ NTP_4_2_8P17
+
+ ntpq/ntpq.1ntpqmdoc@1.361 +2 -2
+ NTP_4_2_8P17
+
+ ntpq/ntpq.html@1.198 +2 -2
+ NTP_4_2_8P17
+
+ ntpq/ntpq.man.in@1.361 +2 -2
+ NTP_4_2_8P17
+
+ ntpq/ntpq.mdoc.in@1.361 +2 -2
+ NTP_4_2_8P17
+
+ ntpsnmpd/invoke-ntpsnmpd.texi@1.523 +1 -1
+ NTP_4_2_8P17
+
+ ntpsnmpd/ntpsnmpd-opts.c@1.544 +7 -7
+ NTP_4_2_8P17
+
+ ntpsnmpd/ntpsnmpd-opts.h@1.543 +3 -3
+ NTP_4_2_8P17
+
+ ntpsnmpd/ntpsnmpd.1ntpsnmpdman@1.352 +2 -2
+ NTP_4_2_8P17
+
+ ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc@1.352 +2 -2
+ NTP_4_2_8P17
+
+ ntpsnmpd/ntpsnmpd.html@1.190 +1 -1
+ NTP_4_2_8P17
+
+ ntpsnmpd/ntpsnmpd.man.in@1.352 +2 -2
+ NTP_4_2_8P17
+
+ ntpsnmpd/ntpsnmpd.mdoc.in@1.352 +2 -2
+ NTP_4_2_8P17
+
+ packageinfo.sh@1.550 +2 -2
+ NTP_4_2_8P17
+
+ scripts/calc_tickadj/calc_tickadj.1calc_tickadjman@1.113 +2 -2
+ NTP_4_2_8P17
+
+ scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc@1.115 +2 -2
+ NTP_4_2_8P17
+
+ scripts/calc_tickadj/calc_tickadj.html@1.114 +1 -1
+ NTP_4_2_8P17
+
+ scripts/calc_tickadj/calc_tickadj.man.in@1.112 +2 -2
+ NTP_4_2_8P17
+
+ scripts/calc_tickadj/calc_tickadj.mdoc.in@1.115 +2 -2
+ NTP_4_2_8P17
+
+ scripts/calc_tickadj/invoke-calc_tickadj.texi@1.117 +1 -1
+ NTP_4_2_8P17
+
+ scripts/invoke-plot_summary.texi@1.135 +2 -2
+ NTP_4_2_8P17
+
+ scripts/invoke-summary.texi@1.134 +2 -2
+ NTP_4_2_8P17
+
+ scripts/ntp-wait/invoke-ntp-wait.texi@1.346 +2 -2
+ NTP_4_2_8P17
+
+ scripts/ntp-wait/ntp-wait-opts@1.82 +2 -2
+ NTP_4_2_8P17
+
+ scripts/ntp-wait/ntp-wait.1ntp-waitman@1.341 +2 -2
+ NTP_4_2_8P17
+
+ scripts/ntp-wait/ntp-wait.1ntp-waitmdoc@1.343 +2 -2
+ NTP_4_2_8P17
+
+ scripts/ntp-wait/ntp-wait.html@1.362 +2 -2
+ NTP_4_2_8P17
+
+ scripts/ntp-wait/ntp-wait.man.in@1.341 +2 -2
+ NTP_4_2_8P17
+
+ scripts/ntp-wait/ntp-wait.mdoc.in@1.343 +2 -2
+ NTP_4_2_8P17
+
+ scripts/ntpsweep/invoke-ntpsweep.texi@1.132 +2 -2
+ NTP_4_2_8P17
+
+ scripts/ntpsweep/ntpsweep-opts@1.85 +2 -2
+ NTP_4_2_8P17
+
+ scripts/ntpsweep/ntpsweep.1ntpsweepman@1.120 +2 -2
+ NTP_4_2_8P17
+
+ scripts/ntpsweep/ntpsweep.1ntpsweepmdoc@1.120 +2 -2
+ NTP_4_2_8P17
+
+ scripts/ntpsweep/ntpsweep.html@1.134 +2 -2
+ NTP_4_2_8P17
+
+ scripts/ntpsweep/ntpsweep.man.in@1.120 +2 -2
+ NTP_4_2_8P17
+
+ scripts/ntpsweep/ntpsweep.mdoc.in@1.121 +2 -2
+ NTP_4_2_8P17
+
+ scripts/ntptrace/invoke-ntptrace.texi@1.135 +2 -2
+ NTP_4_2_8P17
+
+ scripts/ntptrace/ntptrace-opts@1.85 +2 -2
+ NTP_4_2_8P17
+
+ scripts/ntptrace/ntptrace.1ntptraceman@1.120 +2 -2
+ NTP_4_2_8P17
+
+ scripts/ntptrace/ntptrace.1ntptracemdoc@1.122 +2 -2
+ NTP_4_2_8P17
+
+ scripts/ntptrace/ntptrace.html@1.135 +2 -2
+ NTP_4_2_8P17
+
+ scripts/ntptrace/ntptrace.man.in@1.120 +2 -2
+ NTP_4_2_8P17
+
+ scripts/ntptrace/ntptrace.mdoc.in@1.123 +2 -2
+ NTP_4_2_8P17
+
+ scripts/plot_summary-opts@1.86 +2 -2
+ NTP_4_2_8P17
+
+ scripts/plot_summary.1plot_summaryman@1.133 +2 -2
+ NTP_4_2_8P17
+
+ scripts/plot_summary.1plot_summarymdoc@1.133 +2 -2
+ NTP_4_2_8P17
+
+ scripts/plot_summary.html@1.137 +2 -2
+ NTP_4_2_8P17
+
+ scripts/plot_summary.man.in@1.133 +2 -2
+ NTP_4_2_8P17
+
+ scripts/plot_summary.mdoc.in@1.133 +2 -2
+ NTP_4_2_8P17
+
+ scripts/summary-opts@1.85 +2 -2
+ NTP_4_2_8P17
+
+ scripts/summary.1summaryman@1.132 +2 -2
+ NTP_4_2_8P17
+
+ scripts/summary.1summarymdoc@1.132 +2 -2
+ NTP_4_2_8P17
+
+ scripts/summary.html@1.136 +2 -2
+ NTP_4_2_8P17
+
+ scripts/summary.man.in@1.132 +2 -2
+ NTP_4_2_8P17
+
+ scripts/summary.mdoc.in@1.132 +2 -2
+ NTP_4_2_8P17
+
+ scripts/update-leap/invoke-update-leap.texi@1.33 +1 -1
+ NTP_4_2_8P17
+
+ scripts/update-leap/update-leap-opts@1.35 +2 -2
+ NTP_4_2_8P17
+
+ scripts/update-leap/update-leap.1update-leapman@1.33 +2 -2
+ NTP_4_2_8P17
+
+ scripts/update-leap/update-leap.1update-leapmdoc@1.34 +2 -2
+ NTP_4_2_8P17
+
+ scripts/update-leap/update-leap.html@1.33 +1 -1
+ NTP_4_2_8P17
+
+ scripts/update-leap/update-leap.man.in@1.33 +2 -2
+ NTP_4_2_8P17
+
+ scripts/update-leap/update-leap.mdoc.in@1.34 +2 -2
+ NTP_4_2_8P17
+
+ sntp/invoke-sntp.texi@1.523 +2 -2
+ NTP_4_2_8P17
+
+ sntp/sntp-opts.c@1.545 +7 -7
+ NTP_4_2_8P17
+
+ sntp/sntp-opts.h@1.543 +3 -3
+ NTP_4_2_8P17
+
+ sntp/sntp.1sntpman@1.358 +2 -2
+ NTP_4_2_8P17
+
+ sntp/sntp.1sntpmdoc@1.358 +2 -2
+ NTP_4_2_8P17
+
+ sntp/sntp.html@1.539 +2 -2
+ NTP_4_2_8P17
+
+ sntp/sntp.man.in@1.358 +2 -2
+ NTP_4_2_8P17
+
+ sntp/sntp.mdoc.in@1.358 +2 -2
+ NTP_4_2_8P17
+
+ util/invoke-ntp-keygen.texi@1.526 +2 -2
+ NTP_4_2_8P17
+
+ util/ntp-keygen-opts.c@1.547 +7 -7
+ NTP_4_2_8P17
+
+ util/ntp-keygen-opts.h@1.545 +3 -3
+ NTP_4_2_8P17
+
+ util/ntp-keygen.1ntp-keygenman@1.354 +2 -2
+ NTP_4_2_8P17
+
+ util/ntp-keygen.1ntp-keygenmdoc@1.354 +2 -2
+ NTP_4_2_8P17
+
+ util/ntp-keygen.html@1.199 +2 -2
+ NTP_4_2_8P17
+
+ util/ntp-keygen.man.in@1.354 +2 -2
+ NTP_4_2_8P17
+
+ util/ntp-keygen.mdoc.in@1.354 +2 -2
+ NTP_4_2_8P17
+
+ChangeSet@1.4003, 2023-06-06 04:28:11-07:00, ntpreleng@ntp-build.tal1.ntfo.org
+ p17
+
+ tests/libntp/run-digests.c@1.2 +7 -7
+ p17
+
+ChangeSet@1.4002, 2023-06-06 04:09:35-07:00, ntpreleng@ntp-build.tal1.ntfo.org
+ p17
+
+ packageinfo.sh@1.549 +1 -1
+ p17
+
+ChangeSet@1.4001, 2023-06-06 09:43:55+00:00, hart@ntp-devbuild.chi1.ntfo.org
+ Makefile.am:
+ Fix make distcheck failure with generated srcdir.c
+
+ tests/libntp/Makefile.am@1.104 +2 -2
+ Fix make distcheck failure with generated srcdir.c
+
+ChangeSet@1.4000, 2023-06-06 03:43:29-05:00, stenn@stenn.chi1.ntfo.org
+ prep for p17
+
+ ChangeLog@1.2052 +8 -6
+ prep for p17
+
+ NEWS@1.219 +25 -0
+ prep for p17
+
+ChangeSet@1.3998, 2023-06-05 00:21:10+00:00, davehart@tl.davehart.net
+ Add tests for loading and using all supported symmetric auth digests.
+
+ ChangeLog@1.2050 +2 -0
+ Add tests/libntp/digests.c to catch regressions reading keys file or with
+ symmetric authentication digest output.
+
+ include/ntp.h@1.235 +1 -1
+ move KEY_TYPE_MD5 to ntp_md5.h
+
+ include/ntp_md5.h@1.15 +4 -0
+ move a few items here where they better fit.
+
+ include/ntp_stdlib.h@1.91 +21 -18
+ Move items to ntp_md5.h, add some arg names to prototypes.
+
+ libntp/a_md5encrypt.c@1.55 +13 -10
+ %zu isn't supported by all compilers we support
+
+ libntp/authkeys.c@1.46 +11 -12
+ Get rid of magic number 4 for sizeof(u_int32), use zero_mem()
+
+ libntp/authreadkeys.c@1.36 +10 -2
+ Warn if AES128CMAC key is less than 128 bits.
+
+ libntp/msyslog.c@1.57 +3 -2
+ Comment grammar
+
+ libparse/clk_hopf6021.c@1.14 +3 -2
+ include ascii.h after ntp_stdlib.h to avoid clash with EM define
+
+ libparse/clk_wharton.c@1.13 +3 -2
+ include ascii.h after ntp_stdlib.h to avoid clash with EM define
+
+ ntpd/ntp_control.c@1.241 +0 -1
+ ntp_md5.h in ntp_stdlib.h now
+
+ ntpd/ntp_loopfilter.c@1.197 +0 -3
+ Move PATH_MAX definition to header file.
+
+ sntp/crypto.c@1.42 +0 -5
+ Remove redundancies
+
+ sntp/crypto.h@1.15 +0 -1
+ separate include of ntp_md5.h no longer needed
+
+ tests/libntp/Makefile.am@1.103 +33 -6
+ add digests.c
+
+ tests/libntp/data/ntp.keys@1.2 +1 -1
+ typo
+
+ tests/libntp/digests.c@1.1 +415 -0
+ Unit test for loading and using all supported symmetric auth methods.
+
+ tests/libntp/digests.c@1.0 +0 -0
+
+ tests/libntp/run-digests.c@1.1 +80 -0
+ Unity generated runner for digests.c
+
+ tests/libntp/run-digests.c@1.0 +0 -0
+
+ChangeSet@1.3996.2.1, 2023-06-03 22:48:12+00:00, davehart@tl.davehart.net
+ [Bug 3822] ntpd significantly delays first poll of servers specified by name.
+
+ ChangeLog@1.2048.2.1 +4 -0
+ [Bug 3822] ntpd significantly delays first poll of servers specified by name.
+
+ ntpd/ntp_config.c@1.383 +18 -0
+ Treat associations from ntp.conf with hostnames the same as those with IP addresses.
+
+ChangeSet@1.3996.1.1, 2023-06-02 23:42:10+00:00, davehart@tl.davehart.net
+ [Bug 3824] Spurious "ntpd: daemon failed to notify parent!" logged at event_sync.
+
+ ChangeLog@1.2048.1.1 +4 -0
+ [Bug 3824] Spurious "ntpd: daemon failed to notify parent!" logged at event_sync.
+
+ ntpd/ntp_proto.c@1.446 +3 -2
+ CLarify error message
+
+ ntpd/ntpd.c@1.189 +4 -2
+ Fix logic error, clarify message
+
+ChangeSet@1.3997, 2023-06-02 19:29:12+00:00, davehart@tl.davehart.net
+ [Bug 3821] 4.2.8p16 misreads hex auth keys, won't interop with 4.2.8p15.
+
+ ChangeLog@1.2049 +5 -0
+ [Bug 3821] 4.2.8p16 misreads hex auth keys, won't interop with 4.2.8p15.
+
+ libntp/authkeys.c@1.45 +2 -2
+ > typo for >>
+
+ tests/libntp/data/mills,david-03.jpg@1.1 +912 -0
+ The internet's Father Time
+
+ tests/libntp/data/mills,david-03.jpg@1.0 +0 -0
+
+ tests/libntp/data/ntp.keys@1.1 +34 -0
+ Test keys for libntp/tests/digest.c
+
+ tests/libntp/data/ntp.keys@1.0 +0 -0
+
ChangeSet@1.3996, 2023-05-31 20:05:32-07:00, ntpreleng@ntp-build.tal1.ntfo.org
NTP_4_2_8P16
TAG: NTP_4_2_8P16
diff --git a/NEWS b/NEWS
index d9d8a0987ab6..432c3d324575 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,28 @@
+---
+NTP 4.2.8p17 (Harlan Stenn , 2023 Jun 06)
+
+Focus: Bug fixes
+
+Severity: HIGH (for people running 4.2.8p16)
+
+This release:
+
+- fixes 3 bugs, including a regression
+- adds new unit tests
+
+Details below:
+
+* [Bug 3824] Spurious "ntpd: daemon failed to notify parent!" logged at
+ event_sync. Reported by Edward McGuire.
+* [Bug 3822] ntpd significantly delays first poll of servers specified by name.
+ Miroslav Lichvar identified regression in 4.2.8p16.
+* [Bug 3821] 4.2.8p16 misreads hex authentication keys, won't interop with
+ 4.2.8p15 or earlier. Reported by Matt Nordhoff, thanks to
+ Miroslav Lichvar and Matt for rapid testing and identifying the
+ problem.
+* Add tests/libntp/digests.c to catch regressions reading keys file or with
+ symmetric authentication digest output.
+
---
NTP 4.2.8p16 (Harlan Stenn , 2023 May 30)
diff --git a/configure b/configure
index a8c2ba593aa3..5d09904bea03 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for ntp 4.2.8p16.
+# Generated by GNU Autoconf 2.71 for ntp 4.2.8p17.
#
# Report bugs to .
#
@@ -621,8 +621,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='ntp'
PACKAGE_TARNAME='ntp'
-PACKAGE_VERSION='4.2.8p16'
-PACKAGE_STRING='ntp 4.2.8p16'
+PACKAGE_VERSION='4.2.8p17'
+PACKAGE_STRING='ntp 4.2.8p17'
PACKAGE_BUGREPORT='https://bugs.ntp.org/'
PACKAGE_URL='https://www.ntp.org/'
@@ -1651,7 +1651,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures ntp 4.2.8p16 to adapt to many kinds of systems.
+\`configure' configures ntp 4.2.8p17 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1722,7 +1722,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ntp 4.2.8p16:";;
+ short | recursive ) echo "Configuration of ntp 4.2.8p17:";;
esac
cat <<\_ACEOF
@@ -1967,7 +1967,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ntp configure 4.2.8p16
+ntp configure 4.2.8p17
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2624,7 +2624,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by ntp $as_me 4.2.8p16, which was
+It was created by ntp $as_me 4.2.8p17, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -4039,7 +4039,7 @@ fi
# Define the identity of the package.
PACKAGE='ntp'
- VERSION='4.2.8p16'
+ VERSION='4.2.8p17'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -35365,7 +35365,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by ntp $as_me 4.2.8p16, which was
+This file was extended by ntp $as_me 4.2.8p17, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -35434,7 +35434,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-ntp config.status 4.2.8p16
+ntp config.status 4.2.8p17
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
diff --git a/include/ntp.h b/include/ntp.h
index c037f5986016..258ddd6138f7 100644
--- a/include/ntp.h
+++ b/include/ntp.h
@@ -134,7 +134,7 @@ typedef char s_char;
* Miscellaneous stuff
*/
#define NTP_MAXKEY 65535 /* max authentication key number */
-#define KEY_TYPE_MD5 NID_md5 /* MD5 digest NID */
+
/*
* Limits of things
*/
diff --git a/include/ntp_md5.h b/include/ntp_md5.h
index 06c90b2d2faf..8b5a7d0cbb49 100644
--- a/include/ntp_md5.h
+++ b/include/ntp_md5.h
@@ -6,6 +6,8 @@
#ifndef NTP_MD5_H
#define NTP_MD5_H
+# define KEY_TYPE_MD5 NID_md5
+
#ifdef OPENSSL
# include
# include "libssl_compat.h"
@@ -30,6 +32,8 @@
typedef MD5_CTX EVP_MD_CTX;
+# define NID_md5 4 /* from openssl/objects.h */
+# define EVP_MAX_MD_SIZE 64 /* from openssl/evp.h */
# define EVP_MD_CTX_free(c) free(c)
# define EVP_MD_CTX_new() calloc(1, sizeof(MD5_CTX))
# define EVP_get_digestbynid(t) NULL
diff --git a/include/ntp_stdlib.h b/include/ntp_stdlib.h
index 2d7c640565d5..446837e3adcb 100644
--- a/include/ntp_stdlib.h
+++ b/include/ntp_stdlib.h
@@ -11,6 +11,7 @@
#include "declcond.h" /* ntpd uses ntpd/declcond.h, others include/ */
#include "l_stdlib.h"
+#include "ntp_md5.h"
#include "ntp_net.h"
#include "ntp_debug.h"
#include "ntp_malloc.h"
@@ -18,6 +19,10 @@
#include "ntp_syslog.h"
#include "ntp_keyacc.h"
+#ifndef PATH_MAX
+# define PATH_MAX MAX_PATH
+#endif
+
#ifdef __GNUC__
#define NTP_PRINTF(fmt, args) __attribute__((__format__(__printf__, fmt, args)))
#else
@@ -36,24 +41,16 @@ extern void mvsyslog(int, const char *, va_list) NTP_PRINTF(2, 0);
extern void init_logging (const char *, u_int32, int);
extern int change_logfile (const char *, int);
extern void setup_logfile (const char *);
-#ifndef errno_to_str
+#ifndef errno_to_str /* Windows port defines this */
extern void errno_to_str(int, char *, size_t);
#endif
-extern char * ntp_realpath(const char * fsname);
+extern char * ntp_realpath(const char *fsname);
-extern int xvsbprintf(char**, char* const, char const*, va_list) NTP_PRINTF(3, 0);
-extern int xsbprintf(char**, char* const, char const*, ...) NTP_PRINTF(3, 4);
-
-/*
- * When building without OpenSSL, use a few macros of theirs to
- * minimize source differences in NTP.
- */
-#ifndef OPENSSL
-#define NID_md5 4 /* from openssl/objects.h */
-/* from openssl/evp.h */
-#define EVP_MAX_MD_SIZE 64 /* longest known is SHA512 */
-#endif
+extern int xvsbprintf(char **, char * const, char const *, va_list)
+ NTP_PRINTF(3, 0);
+extern int xsbprintf(char **, char * const, char const *, ...)
+ NTP_PRINTF(3, 4);
#define SAVE_ERRNO(stmt) \
{ \
@@ -111,10 +108,16 @@ extern void auth_prealloc_symkeys(int);
extern int ymd2yd (int, int, int);
/* a_md5encrypt.c */
-extern int MD5authdecrypt (int, const u_char *, size_t, u_int32 *, size_t, size_t, keyid_t);
-extern size_t MD5authencrypt (int, const u_char *, size_t, u_int32 *, size_t);
-extern void MD5auth_setkey (keyid_t, int, const u_char *, size_t, KeyAccT *c);
-extern u_int32 addr2refid (sockaddr_u *);
+extern size_t MD5authencrypt (int type, const u_char *key, size_t klen,
+ u_int32 *pkt, size_t length);
+extern int MD5authdecrypt (int type, const u_char *key, size_t klen,
+ u_int32 *pkt, size_t length, size_t size,
+ keyid_t keyno);
+extern u_int32 addr2refid(sockaddr_u *);
+
+/* authkeys.c */
+extern void MD5auth_setkey (keyid_t, int, const u_char *, size_t,
+ KeyAccT *c);
/* emalloc.c */
#ifndef EREALLOC_CALLSITE /* ntp_malloc.h defines */
diff --git a/libntp/a_md5encrypt.c b/libntp/a_md5encrypt.c
index 6011af52af6d..7a372969123f 100644
--- a/libntp/a_md5encrypt.c
+++ b/libntp/a_md5encrypt.c
@@ -9,7 +9,6 @@
#include "ntp_string.h"
#include "ntp_stdlib.h"
#include "ntp.h"
-#include "ntp_md5.h" /* provides OpenSSL digest API */
#include "isc/string.h"
typedef struct {
@@ -22,10 +21,12 @@ typedef struct {
size_t len;
} rwbuffT;
+
#if defined(OPENSSL) && defined(ENABLE_CMAC)
static size_t
cmac_ctx_size(
- CMAC_CTX * ctx)
+ CMAC_CTX * ctx
+ )
{
size_t mlen = 0;
@@ -36,14 +37,16 @@ cmac_ctx_size(
}
return mlen;
}
-#endif /*OPENSSL && ENABLE_CMAC*/
+#endif /* OPENSSL && ENABLE_CMAC */
+
static size_t
make_mac(
const rwbuffT * digest,
int ktype,
const robuffT * key,
- const robuffT * msg)
+ const robuffT * msg
+ )
{
/*
* Compute digest of key concatenated with packet. Note: the
@@ -66,8 +69,8 @@ make_mac(
/* adjust key size (zero padded buffer) if necessary */
if (AES_128_KEY_SIZE > key->len) {
memcpy(keybuf, keyptr, key->len);
- memset((keybuf + key->len), 0,
- (AES_128_KEY_SIZE - key->len));
+ zero_mem((keybuf + key->len),
+ (AES_128_KEY_SIZE - key->len));
keyptr = keybuf;
}
@@ -107,10 +110,10 @@ make_mac(
goto mac_fail;
}
- #ifdef EVP_MD_CTX_FLAG_NON_FIPS_ALLOW
+ #ifdef EVP_MD_CTX_FLAG_NON_FIPS_ALLOW
/* make sure MD5 is allowd */
EVP_MD_CTX_set_flags(ctx, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
- #endif
+ #endif
/* [Bug 3457] DON'T use plain EVP_DigestInit! It would
* kill the flags! */
if (!EVP_DigestInit_ex(ctx, EVP_get_digestbynid(ktype), NULL)) {
@@ -239,8 +242,8 @@ MD5authdecrypt(
dlen = MAX_MDG_LEN;
if (size != (size_t)dlen + KEY_MAC_LEN) {
msyslog(LOG_ERR,
- "MAC decrypt: MAC length error: len=%zu key=%d",
- size, keyno);
+ "MAC decrypt: MAC length error: len=%u key=%d",
+ (u_int)size, keyno);
return (0);
}
return !isc_tsmemcmp(digest,
diff --git a/libntp/authkeys.c b/libntp/authkeys.c
index 4448dadd2b6a..d28b4b932b84 100644
--- a/libntp/authkeys.c
+++ b/libntp/authkeys.c
@@ -284,8 +284,7 @@ init_auth(void)
*/
newalloc = authhashbuckets * sizeof(key_hash[0]);
- key_hash = erealloc(key_hash, newalloc);
- memset(key_hash, '\0', newalloc);
+ key_hash = emalloc_zero(newalloc);
INIT_DLIST(key_listhead, llink);
@@ -458,7 +457,7 @@ auth_resize_hashtable(void)
newalloc = authhashbuckets * sizeof(key_hash[0]);
key_hash = erealloc(key_hash, newalloc);
- memset(key_hash, '\0', newalloc);
+ zero_mem(key_hash, newalloc);
ITER_DLIST_BEGIN(key_listhead, sk, llink, symkey)
hash = KEYHASH(sk->keyid);
@@ -528,14 +527,14 @@ freesymkey(
bucket = &key_hash[KEYHASH(sk->keyid)];
if (sk->secret != NULL) {
- memset(sk->secret, '\0', sk->secretsize);
+ zero_mem(sk->secret, sk->secretsize);
free(sk->secret);
}
UNLINK_SLIST(unlinked, *bucket, sk, hlink, symkey);
DEBUG_ENSURE(sk == unlinked);
UNLINK_DLIST(sk, llink);
- memset((char *)sk + offsetof(symkey, symkey_payload), '\0',
- sizeof(*sk) - offsetof(symkey, symkey_payload));
+ zero_mem((char *)sk + offsetof(symkey, symkey_payload),
+ sizeof(*sk) - offsetof(symkey, symkey_payload));
LINK_SLIST(authfreekeys, sk, llink.f);
authnumkeys--;
authnumfreekeys++;
@@ -719,13 +718,13 @@ authistrusted(
if (keyno == cache_keyid) {
return (KEY_TRUSTED & cache_flags) &&
- keyacc_contains(cache_keyacclist, sau, TRUE);
+ keyacc_contains(cache_keyacclist, sau, TRUE);
}
if (NULL != (sk = auth_findkey(keyno))) {
authkeyuncached++;
return (KEY_TRUSTED & sk->flags) &&
- keyacc_contains(sk->keyacclist, sau, TRUE);
+ keyacc_contains(sk->keyacclist, sau, TRUE);
}
authkeynotfound++;
@@ -800,7 +799,7 @@ MD5auth_setkey(
allocsymkey(keyno, 0, (u_short)keytype, 0,
secretsize, secret, ka);
#ifdef DEBUG
- if (debug >= 4) {
+ if (debug >= 1) {
size_t j;
printf("auth_setkey: key %d type %d len %d ", (int)keyno,
@@ -816,7 +815,7 @@ MD5auth_setkey(
/*
* auth_delkeys - delete non-autokey untrusted keys, and clear all info
- * except the trusted bit of non-autokey trusted keys, in
+ * except the trusted bit of non-autokey trusted keys, in
* preparation for rereading the keys file.
*/
void
@@ -835,7 +834,7 @@ auth_delkeys(void)
*/
if (KEY_TRUSTED & sk->flags) {
if (sk->secret != NULL) {
- memset(sk->secret, 0, sk->secretsize);
+ zero_mem(sk->secret, sk->secretsize);
free(sk->secret);
sk->secret = NULL; /* TALOS-CAN-0054 */
}
@@ -886,9 +885,9 @@ authencrypt(
* consists of a single word with value zero.
*/
authencryptions++;
- pkt[length / 4] = htonl(keyno);
+ pkt[length / KEY_MAC_LEN] = htonl(keyno);
if (0 == keyno) {
- return 4;
+ return KEY_MAC_LEN;
}
if (!authhavekey(keyno)) {
return 0;
@@ -972,7 +971,7 @@ pwdecode_hex(
reslen = (size_t)-1;
break;
}
- tmp = (u_char)((ptr - hex) > 1);
+ tmp = (u_char)((ptr - hex) >> 1);
if (j & 1)
dst[j >> 1] |= tmp;
else
diff --git a/libntp/authreadkeys.c b/libntp/authreadkeys.c
index da91bd0d3443..fa2f5b540de4 100644
--- a/libntp/authreadkeys.c
+++ b/libntp/authreadkeys.c
@@ -234,7 +234,7 @@ authreadkeys(
* The key type is unused, but is required to be 'M' or
* 'm' for compatibility.
*/
- if (!(*token == 'M' || *token == 'm')) {
+ if (! (toupper(*token) == 'M')) {
log_maybe(NULL,
"authreadkeys: invalid type for key %d",
keyno);
@@ -357,13 +357,21 @@ authreadkeys(
continue;
}
- INSIST(NULL != next);
+ DEBUG_INSIST(NULL != next);
+#if defined(OPENSSL) && defined(ENABLE_CMAC)
+ if (NID_cmac == keytype && len < 16) {
+ msyslog(LOG_WARNING, CMAC " keys are 128 bits, "
+ "zero-extending key %u by %u bits",
+ (u_int)keyno, 8 * (16 - (u_int)len));
+ }
+#endif /* OPENSSL && ENABLE_CMAC */
next->next = list;
list = next;
}
fclose(fp);
if (nerr > 0) {
const char * why = "";
+
if (nerr > nerr_maxlimit)
why = " (emergency break)";
msyslog(LOG_ERR,
diff --git a/libntp/msyslog.c b/libntp/msyslog.c
index ae950171f468..a1ba72792595 100644
--- a/libntp/msyslog.c
+++ b/libntp/msyslog.c
@@ -583,8 +583,9 @@ setup_logfile(
syslog_fname);
}
-/* Helper for unit tests, where stdout + stderr are piped to the same
- * stream. This works moderately reliable only if both streams are
+/*
+ * Helper for unit tests, where stdout + stderr are piped to the same
+ * stream. This works moderately reliably only if both streams are
* unbuffered or line buffered. Unfortunately stdout can be fully
* buffered on pipes or files...
*/
diff --git a/libparse/clk_hopf6021.c b/libparse/clk_hopf6021.c
index c5980ef13f2b..b0b0c1ff2a73 100644
--- a/libparse/clk_hopf6021.c
+++ b/libparse/clk_hopf6021.c
@@ -25,7 +25,6 @@
#include "ntp_fp.h"
#include "ntp_unixtime.h"
#include "ntp_calendar.h"
-#include "ascii.h"
#include "parse.h"
@@ -37,6 +36,8 @@
extern int printf (const char *, ...);
#endif
+#include "ascii.h"
+
/*
* hopf Funkuhr 6021
* used with 9600,8N1,
@@ -263,7 +264,7 @@ hexval(
}
#else /* not (REFCLOCK && CLOCK_PARSE && CLOCK_HOPF6021) */
-int clk_hopf6021_bs;
+NONEMPTY_TRANSLATION_UNIT
#endif /* not (REFCLOCK && CLOCK_PARSE && CLOCK_HOPF6021) */
/*
diff --git a/libparse/clk_wharton.c b/libparse/clk_wharton.c
index 371137dc6fe8..fbe9cc95f5f7 100644
--- a/libparse/clk_wharton.c
+++ b/libparse/clk_wharton.c
@@ -15,7 +15,6 @@
*/
#include "ntp_fp.h"
-#include "ascii.h"
#include "parse.h"
#ifndef PARSESTREAM
@@ -26,6 +25,8 @@
extern void printf (const char *, ...);
#endif
+#include "ascii.h"
+
/*
* In private e-mail alastair@wharton.co.uk said :
* "If you are going to use the 400A and 404.2 system [for ntp] I recommend
@@ -166,7 +167,7 @@ clockformat_t clock_wharton_400a =
};
#else /* not (REFCLOCK && CLOCK_PARSE && CLOCK_WHARTON_400A) */
-int clk_wharton_400a_bs;
+NONEMPTY_TRANSLATION_UNIT
#endif /* not (REFCLOCK && CLOCK_PARSE && CLOCK_WHARTON_400A) */
/*
diff --git a/ntpd/invoke-ntp.conf.texi b/ntpd/invoke-ntp.conf.texi
index ff708155cd4e..86a039ea6f49 100644
--- a/ntpd/invoke-ntp.conf.texi
+++ b/ntpd/invoke-ntp.conf.texi
@@ -6,7 +6,7 @@
#
# EDIT THIS FILE WITH CAUTION (invoke-ntp.conf.texi)
#
-# It has been AutoGen-ed May 31, 2023 at 02:49:31 PM by AutoGen 5.18.16
+# It has been AutoGen-ed June 6, 2023 at 04:37:38 AM by AutoGen 5.18.16
# From the definitions ntp.conf.def
# and the template file agtexi-file.tpl
@end ignore
diff --git a/ntpd/invoke-ntp.keys.texi b/ntpd/invoke-ntp.keys.texi
index 52dee572b434..3926518de3a2 100644
--- a/ntpd/invoke-ntp.keys.texi
+++ b/ntpd/invoke-ntp.keys.texi
@@ -6,7 +6,7 @@
#
# EDIT THIS FILE WITH CAUTION (invoke-ntp.keys.texi)
#
-# It has been AutoGen-ed May 31, 2023 at 02:49:34 PM by AutoGen 5.18.16
+# It has been AutoGen-ed June 6, 2023 at 04:37:41 AM by AutoGen 5.18.16
# From the definitions ntp.keys.def
# and the template file agtexi-file.tpl
@end ignore
diff --git a/ntpd/invoke-ntpd.texi b/ntpd/invoke-ntpd.texi
index fbce35dd8d26..471bca5b86c8 100644
--- a/ntpd/invoke-ntpd.texi
+++ b/ntpd/invoke-ntpd.texi
@@ -6,7 +6,7 @@
#
# EDIT THIS FILE WITH CAUTION (invoke-ntpd.texi)
#
-# It has been AutoGen-ed May 31, 2023 at 02:49:36 PM by AutoGen 5.18.16
+# It has been AutoGen-ed June 6, 2023 at 04:37:42 AM by AutoGen 5.18.16
# From the definitions ntpd-opts.def
# and the template file agtexi-cmd.tpl
@end ignore
@@ -142,7 +142,7 @@ with a status code of 0.
@exampleindent 0
@example
-ntpd - NTP daemon program - Ver. 4.2.8p16
+ntpd - NTP daemon program - Ver. 4.2.8p17
Usage: ntpd [ - [] | --[@{=| @}] ]... \
[ ... ]
Flg Arg Option-Name Description
diff --git a/ntpd/ntp.conf.5man b/ntpd/ntp.conf.5man
index 80b742f7d624..4e7a47ab83ef 100644
--- a/ntpd/ntp.conf.5man
+++ b/ntpd/ntp.conf.5man
@@ -10,11 +10,11 @@
.ds B-Font B
.ds I-Font I
.ds R-Font R
-.TH ntp.conf 5man "31 May 2023" "4.2.8p16" "File Formats"
+.TH ntp.conf 5man "06 Jun 2023" "4.2.8p17" "File Formats"
.\"
.\" EDIT THIS FILE WITH CAUTION (in-mem file)
.\"
-.\" It has been AutoGen-ed May 31, 2023 at 02:49:38 PM by AutoGen 5.18.16
+.\" It has been AutoGen-ed June 6, 2023 at 04:37:45 AM by AutoGen 5.18.16
.\" From the definitions ntp.conf.def
.\" and the template file agman-cmd.tpl
.SH NAME
diff --git a/ntpd/ntp.conf.5mdoc b/ntpd/ntp.conf.5mdoc
index bc6f31c73c24..951f33da4faa 100644
--- a/ntpd/ntp.conf.5mdoc
+++ b/ntpd/ntp.conf.5mdoc
@@ -1,9 +1,9 @@
-.Dd May 31 2023
+.Dd June 6 2023
.Dt NTP_CONF 5mdoc File Formats
.Os
.\" EDIT THIS FILE WITH CAUTION (ntp.mdoc)
.\"
-.\" It has been AutoGen-ed May 31, 2023 at 02:49:25 PM by AutoGen 5.18.16
+.\" It has been AutoGen-ed June 6, 2023 at 04:37:32 AM by AutoGen 5.18.16
.\" From the definitions ntp.conf.def
.\" and the template file agmdoc-cmd.tpl
.Sh NAME
diff --git a/ntpd/ntp.conf.html b/ntpd/ntp.conf.html
index bda4b750d4f5..f7f0b4bef931 100644
--- a/ntpd/ntp.conf.html
+++ b/ntpd/ntp.conf.html
@@ -50,7 +50,7 @@ Next: ntp.conf Desc
This document describes the configuration file for the NTP Project’s
ntpd
program.
-This document applies to version 4.2.8p16 of ntp.conf
.
+
This document applies to version 4.2.8p17 of ntp.conf
.
Short Table of Contents
diff --git a/ntpd/ntp.conf.man.in b/ntpd/ntp.conf.man.in
index 10544a131eaa..0c56ee503df6 100644
--- a/ntpd/ntp.conf.man.in
+++ b/ntpd/ntp.conf.man.in
@@ -10,11 +10,11 @@
.ds B-Font B
.ds I-Font I
.ds R-Font R
-.TH ntp.conf 5 "31 May 2023" "4.2.8p16" "File Formats"
+.TH ntp.conf 5 "06 Jun 2023" "4.2.8p17" "File Formats"
.\"
.\" EDIT THIS FILE WITH CAUTION (in-mem file)
.\"
-.\" It has been AutoGen-ed May 31, 2023 at 02:49:38 PM by AutoGen 5.18.16
+.\" It has been AutoGen-ed June 6, 2023 at 04:37:45 AM by AutoGen 5.18.16
.\" From the definitions ntp.conf.def
.\" and the template file agman-cmd.tpl
.SH NAME
diff --git a/ntpd/ntp.conf.mdoc.in b/ntpd/ntp.conf.mdoc.in
index 338fb4b30977..22348ee727d0 100644
--- a/ntpd/ntp.conf.mdoc.in
+++ b/ntpd/ntp.conf.mdoc.in
@@ -1,9 +1,9 @@
-.Dd May 31 2023
+.Dd June 6 2023
.Dt NTP_CONF 5 File Formats
.Os
.\" EDIT THIS FILE WITH CAUTION (ntp.mdoc)
.\"
-.\" It has been AutoGen-ed May 31, 2023 at 02:49:25 PM by AutoGen 5.18.16
+.\" It has been AutoGen-ed June 6, 2023 at 04:37:32 AM by AutoGen 5.18.16
.\" From the definitions ntp.conf.def
.\" and the template file agmdoc-cmd.tpl
.Sh NAME
diff --git a/ntpd/ntp.keys.5man b/ntpd/ntp.keys.5man
index 57086242537c..24dbfcf034a9 100644
--- a/ntpd/ntp.keys.5man
+++ b/ntpd/ntp.keys.5man
@@ -1,8 +1,8 @@
-.TH ntp.keys 5man "31 May 2023" "4.2.8p16" "File Formats"
+.TH ntp.keys 5man "06 Jun 2023" "4.2.8p17" "File Formats"
.\"
.\" EDIT THIS FILE WITH CAUTION (ntp.man)
.\"
-.\" It has been AutoGen-ed May 31, 2023 at 02:49:41 PM by AutoGen 5.18.16
+.\" It has been AutoGen-ed June 6, 2023 at 04:37:47 AM by AutoGen 5.18.16
.\" From the definitions ntp.keys.def
.\" and the template file agman-file.tpl
.Sh NAME
diff --git a/ntpd/ntp.keys.5mdoc b/ntpd/ntp.keys.5mdoc
index 3d8fe0d54070..100320fd2330 100644
--- a/ntpd/ntp.keys.5mdoc
+++ b/ntpd/ntp.keys.5mdoc
@@ -1,9 +1,9 @@
-.Dd May 31 2023
+.Dd June 6 2023
.Dt NTP_KEYS 5mdoc File Formats
.Os FreeBSD 12.1-RELEASE_SI
.\" EDIT THIS FILE WITH CAUTION (ntp.mdoc)
.\"
-.\" It has been AutoGen-ed May 31, 2023 at 02:49:28 PM by AutoGen 5.18.16
+.\" It has been AutoGen-ed June 6, 2023 at 04:37:34 AM by AutoGen 5.18.16
.\" From the definitions ntp.keys.def
.\" and the template file agmdoc-file.tpl
.Sh NAME
diff --git a/ntpd/ntp.keys.html b/ntpd/ntp.keys.html
index 43e3c2565200..2d53d91f4d40 100644
--- a/ntpd/ntp.keys.html
+++ b/ntpd/ntp.keys.html
@@ -50,7 +50,7 @@ Next: ntp.keys Desc
This document describes the symmetric key file for the NTP Project’s
ntpd
program.
-This document applies to version 4.2.8p16 of ntp.keys
.
+
This document applies to version 4.2.8p17 of ntp.keys
.
Short Table of Contents
diff --git a/ntpd/ntp.keys.man.in b/ntpd/ntp.keys.man.in
index 1655a4bacbcd..c646bb11e776 100644
--- a/ntpd/ntp.keys.man.in
+++ b/ntpd/ntp.keys.man.in
@@ -1,8 +1,8 @@
-.TH ntp.keys 5 "31 May 2023" "4.2.8p16" "File Formats"
+.TH ntp.keys 5 "06 Jun 2023" "4.2.8p17" "File Formats"
.\"
.\" EDIT THIS FILE WITH CAUTION (ntp.man)
.\"
-.\" It has been AutoGen-ed May 31, 2023 at 02:49:41 PM by AutoGen 5.18.16
+.\" It has been AutoGen-ed June 6, 2023 at 04:37:47 AM by AutoGen 5.18.16
.\" From the definitions ntp.keys.def
.\" and the template file agman-file.tpl
.Sh NAME
diff --git a/ntpd/ntp.keys.mdoc.in b/ntpd/ntp.keys.mdoc.in
index 0a85da0b020e..fdeaeba4c938 100644
--- a/ntpd/ntp.keys.mdoc.in
+++ b/ntpd/ntp.keys.mdoc.in
@@ -1,9 +1,9 @@
-.Dd May 31 2023
+.Dd June 6 2023
.Dt NTP_KEYS 5 File Formats
.Os FreeBSD 12.1-RELEASE_SI
.\" EDIT THIS FILE WITH CAUTION (ntp.mdoc)
.\"
-.\" It has been AutoGen-ed May 31, 2023 at 02:49:28 PM by AutoGen 5.18.16
+.\" It has been AutoGen-ed June 6, 2023 at 04:37:34 AM by AutoGen 5.18.16
.\" From the definitions ntp.keys.def
.\" and the template file agmdoc-file.tpl
.Sh NAME
diff --git a/ntpd/ntp_config.c b/ntpd/ntp_config.c
index f7219b8ee560..d9a753ee3a1e 100644
--- a/ntpd/ntp_config.c
+++ b/ntpd/ntp_config.c
@@ -131,6 +131,7 @@ typedef struct peer_resolved_ctx_tag {
u_char maxpoll;
u_int32 ttl;
const char * group;
+ int was_initializing;
} peer_resolved_ctx;
/* Limits */
@@ -4420,6 +4421,7 @@ config_peers(
ctx->hmode = MODE_CLIENT;
ctx->version = NTP_VERSION;
ctx->flags = FLAG_IBURST;
+ ctx->was_initializing = initializing;
ZERO(hints);
hints.ai_family = (u_short)ctx->family;
@@ -4500,6 +4502,7 @@ config_peers(
ctx->ttl = curr_peer->ttl;
ctx->keyid = curr_peer->peerkey;
ctx->group = curr_peer->group;
+ ctx->was_initializing = initializing;
ZERO(hints);
hints.ai_family = ctx->family;
@@ -4574,6 +4577,16 @@ peer_name_resolved(
name, fam_spec,
stoa(&peeraddr));
}
+
+ /*
+ * peer_clear needs to know if this association was specified
+ * in the startup configuration file to set the next poll time.
+ */
+ if (ctx->was_initializing) {
+ INSIST(!initializing);
+ initializing = TRUE;
+ }
+
peer_config(
&peeraddr,
NULL,
@@ -4587,6 +4600,11 @@ peer_name_resolved(
ctx->ttl,
ctx->keyid,
ctx->group);
+
+ if (ctx->was_initializing) {
+ initializing = FALSE;
+ }
+
break;
}
}
diff --git a/ntpd/ntp_control.c b/ntpd/ntp_control.c
index d1108c9d1456..0cc7fcb47ecd 100644
--- a/ntpd/ntp_control.c
+++ b/ntpd/ntp_control.c
@@ -26,7 +26,6 @@
#include "ntp_crypto.h"
#include "ntp_assert.h"
#include "ntp_leapsec.h"
-#include "ntp_md5.h" /* provides OpenSSL digest API */
#include "lib_strbuf.h"
#include "timexsup.h"
diff --git a/ntpd/ntp_loopfilter.c b/ntpd/ntp_loopfilter.c
index 0499c363393d..e76e4dce0711 100644
--- a/ntpd/ntp_loopfilter.c
+++ b/ntpd/ntp_loopfilter.c
@@ -129,9 +129,6 @@ static int loop_started; /* TRUE after LOOP_DRIFTINIT */
static void rstclock (int, double); /* transition function */
static double direct_freq(double); /* direct set frequency */
static void set_freq(double); /* set frequency */
-#ifndef PATH_MAX
-# define PATH_MAX MAX_PATH
-#endif
static char relative_path[PATH_MAX + 1]; /* relative path per recursive make */
static char *this_file = NULL;
diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c
index ea72dd3d37ae..f2c59238432a 100644
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -2987,8 +2987,9 @@ clock_update(
*/
#ifdef HAVE_WORKING_FORK
if (daemon_pipe[1] != -1) {
- if (2 != write(daemon_pipe[1], "S\n", 2))
- msyslog(LOG_ERR, "ntpd: daemon failed to notify parent!");
+ if (2 != write(daemon_pipe[1], "S\n", 2)) {
+ msyslog(LOG_ERR, "daemon failed to notify parent ntpd (--wait-sync)");
+ }
close(daemon_pipe[1]);
daemon_pipe[1] = -1;
DPRINTF(1, ("notified parent --wait-sync is done\n"));
diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c
index 646a304a8521..14774d684f2d 100644
--- a/ntpd/ntpd-opts.c
+++ b/ntpd/ntpd-opts.c
@@ -1,7 +1,7 @@
/*
* EDIT THIS FILE WITH CAUTION (ntpd-opts.c)
*
- * It has been AutoGen-ed May 31, 2023 at 02:48:46 PM by AutoGen 5.18.16
+ * It has been AutoGen-ed June 6, 2023 at 04:36:50 AM by AutoGen 5.18.16
* From the definitions ntpd-opts.def
* and the template file options
*
@@ -80,7 +80,7 @@ extern FILE * option_usage_fp;
* static const strings for ntpd options
*/
static char const ntpd_opt_strs[3133] =
-/* 0 */ "ntpd 4.2.8p16\n"
+/* 0 */ "ntpd 4.2.8p17\n"
"Copyright (C) 1992-2023 The University of Delaware and Network Time Foundation, all rights reserved.\n"
"This is free software. It is licensed for use, modification and\n"
"redistribution under the terms of the NTP License, copies of which\n"
@@ -210,12 +210,12 @@ static char const ntpd_opt_strs[3133] =
/* 2901 */ "output version information and exit\0"
/* 2937 */ "version\0"
/* 2945 */ "NTPD\0"
-/* 2950 */ "ntpd - NTP daemon program - Ver. 4.2.8p16\n"
+/* 2950 */ "ntpd - NTP daemon program - Ver. 4.2.8p17\n"
"Usage: %s [ - [] | --[{=| }] ]... \\\n"
"\t\t[ ... ]\n\0"
/* 3082 */ "https://bugs.ntp.org, bugs@ntp.org\0"
/* 3117 */ "\n\0"
-/* 3119 */ "ntpd 4.2.8p16";
+/* 3119 */ "ntpd 4.2.8p17";
/**
* ipv4 option description with
@@ -1534,7 +1534,7 @@ static void bogus_function(void) {
translate option names.
*/
/* referenced via ntpdOptions.pzCopyright */
- puts(_("ntpd 4.2.8p16\n\
+ puts(_("ntpd 4.2.8p17\n\
Copyright (C) 1992-2023 The University of Delaware and Network Time Foundation, all rights reserved.\n\
This is free software. It is licensed for use, modification and\n\
redistribution under the terms of the NTP License, copies of which\n\
@@ -1675,7 +1675,7 @@ implied warranty.\n"));
puts(_("output version information and exit"));
/* referenced via ntpdOptions.pzUsageTitle */
- puts(_("ntpd - NTP daemon program - Ver. 4.2.8p16\n\
+ puts(_("ntpd - NTP daemon program - Ver. 4.2.8p17\n\
Usage: %s [ - [] | --[{=| }] ]... \\\n\
\t\t[ ... ]\n"));
@@ -1683,7 +1683,7 @@ Usage: %s [ - [] | --[{=| }] ]... \\\n\
puts(_("\n"));
/* referenced via ntpdOptions.pzFullVersion */
- puts(_("ntpd 4.2.8p16"));
+ puts(_("ntpd 4.2.8p17"));
/* referenced via ntpdOptions.pzFullUsage */
puts(_("<<>>"));
diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h
index dc9ac899e8ee..3541255bb6fb 100644
--- a/ntpd/ntpd-opts.h
+++ b/ntpd/ntpd-opts.h
@@ -1,7 +1,7 @@
/*
* EDIT THIS FILE WITH CAUTION (ntpd-opts.h)
*
- * It has been AutoGen-ed May 31, 2023 at 02:48:45 PM by AutoGen 5.18.16
+ * It has been AutoGen-ed June 6, 2023 at 04:36:50 AM by AutoGen 5.18.16
* From the definitions ntpd-opts.def
* and the template file options
*
@@ -114,9 +114,9 @@ typedef enum {
/** count of all options for ntpd */
#define OPTION_CT 38
/** ntpd version */
-#define NTPD_VERSION "4.2.8p16"
+#define NTPD_VERSION "4.2.8p17"
/** Full ntpd version text */
-#define NTPD_FULL_VERSION "ntpd 4.2.8p16"
+#define NTPD_FULL_VERSION "ntpd 4.2.8p17"
/**
* Interface defines for all options. Replace "n" with the UPPER_CASED
diff --git a/ntpd/ntpd.1ntpdman b/ntpd/ntpd.1ntpdman
index 1554bc89b840..237a9179f62e 100644
--- a/ntpd/ntpd.1ntpdman
+++ b/ntpd/ntpd.1ntpdman
@@ -10,11 +10,11 @@
.ds B-Font B
.ds I-Font I
.ds R-Font R
-.TH ntpd 1ntpdman "31 May 2023" "4.2.8p16" "User Commands"
+.TH ntpd 1ntpdman "06 Jun 2023" "4.2.8p17" "User Commands"
.\"
.\" EDIT THIS FILE WITH CAUTION (in-mem file)
.\"
-.\" It has been AutoGen-ed May 31, 2023 at 02:49:42 PM by AutoGen 5.18.16
+.\" It has been AutoGen-ed June 6, 2023 at 04:37:49 AM by AutoGen 5.18.16
.\" From the definitions ntpd-opts.def
.\" and the template file agman-cmd.tpl
.SH NAME
diff --git a/ntpd/ntpd.1ntpdmdoc b/ntpd/ntpd.1ntpdmdoc
index f28af3193e0b..536e7f672840 100644
--- a/ntpd/ntpd.1ntpdmdoc
+++ b/ntpd/ntpd.1ntpdmdoc
@@ -1,9 +1,9 @@
-.Dd May 31 2023
+.Dd June 6 2023
.Dt NTPD 1ntpdmdoc User Commands
.Os
.\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc)
.\"
-.\" It has been AutoGen-ed May 31, 2023 at 02:49:29 PM by AutoGen 5.18.16
+.\" It has been AutoGen-ed June 6, 2023 at 04:37:36 AM by AutoGen 5.18.16
.\" From the definitions ntpd-opts.def
.\" and the template file agmdoc-cmd.tpl
.Sh NAME
diff --git a/ntpd/ntpd.c b/ntpd/ntpd.c
index f05924de7842..868f7a9c8068 100644
--- a/ntpd/ntpd.c
+++ b/ntpd/ntpd.c
@@ -1450,8 +1450,10 @@ int scmp_sc[] = {
#if defined(SYS_WINNT)
ntservice_isup();
#elif defined(HAVE_WORKING_FORK)
- if ((daemon_pipe[1] != -1) && (2 != write(daemon_pipe[1], "R\n", 2))) {
- msyslog(LOG_ERR, "ntpd: daemon failed to notify parent!");
+ if (daemon_pipe[1] != -1) {
+ if (2 != write(daemon_pipe[1], "R\n", 2)) {
+ msyslog(LOG_ERR, "daemon failed to notify parent ntpd after init");
+ }
close(daemon_pipe[1]);
daemon_pipe[1] = -1;
}
diff --git a/ntpd/ntpd.html b/ntpd/ntpd.html
index 9eff3bc81569..3947f57f1a9b 100644
--- a/ntpd/ntpd.html
+++ b/ntpd/ntpd.html
@@ -56,7 +56,7 @@ The program can operate in any of several modes, including client/server,
symmetric and broadcast modes, and with both symmetric-key and public-key
cryptography.
-This document applies to version 4.2.8p16 of ntpd
.
+
This document applies to version 4.2.8p17 of ntpd
.
Short Table of Contents
@@ -292,7 +292,7 @@ used to select the program, defaulting to more. Both will exit
with a status code of 0.
-
ntpd - NTP daemon program - Ver. 4.2.8p16
+ntpd - NTP daemon program - Ver. 4.2.8p17
Usage: ntpd [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \
[ <server1> ... <serverN> ]
Flg Arg Option-Name Description
diff --git a/ntpd/ntpd.man.in b/ntpd/ntpd.man.in
index 02b7737fbfed..addee5d56e77 100644
--- a/ntpd/ntpd.man.in
+++ b/ntpd/ntpd.man.in
@@ -10,11 +10,11 @@
.ds B-Font B
.ds I-Font I
.ds R-Font R
-.TH ntpd @NTPD_MS@ "31 May 2023" "4.2.8p16" "User Commands"
+.TH ntpd @NTPD_MS@ "06 Jun 2023" "4.2.8p17" "User Commands"
.\"
.\" EDIT THIS FILE WITH CAUTION (in-mem file)
.\"
-.\" It has been AutoGen-ed May 31, 2023 at 02:49:42 PM by AutoGen 5.18.16
+.\" It has been AutoGen-ed June 6, 2023 at 04:37:49 AM by AutoGen 5.18.16
.\" From the definitions ntpd-opts.def
.\" and the template file agman-cmd.tpl
.SH NAME
diff --git a/ntpd/ntpd.mdoc.in b/ntpd/ntpd.mdoc.in
index 2f97219ced96..6d99fbcf5e7a 100644
--- a/ntpd/ntpd.mdoc.in
+++ b/ntpd/ntpd.mdoc.in
@@ -1,9 +1,9 @@
-.Dd May 31 2023
+.Dd June 6 2023
.Dt NTPD @NTPD_MS@ User Commands
.Os
.\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc)
.\"
-.\" It has been AutoGen-ed May 31, 2023 at 02:49:29 PM by AutoGen 5.18.16
+.\" It has been AutoGen-ed June 6, 2023 at 04:37:36 AM by AutoGen 5.18.16
.\" From the definitions ntpd-opts.def
.\" and the template file agmdoc-cmd.tpl
.Sh NAME
diff --git a/ntpdc/invoke-ntpdc.texi b/ntpdc/invoke-ntpdc.texi
index 62bc28ab1bf9..30b4a66d6a87 100644
--- a/ntpdc/invoke-ntpdc.texi
+++ b/ntpdc/invoke-ntpdc.texi
@@ -6,7 +6,7 @@
#
# EDIT THIS FILE WITH CAUTION (invoke-ntpdc.texi)
#
-# It has been AutoGen-ed May 31, 2023 at 02:49:52 PM by AutoGen 5.18.16
+# It has been AutoGen-ed June 6, 2023 at 04:37:59 AM by AutoGen 5.18.16
# From the definitions ntpdc-opts.def
# and the template file agtexi-cmd.tpl
@end ignore
@@ -77,7 +77,7 @@ with a status code of 0.
@exampleindent 0
@example
-ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p16
+ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p17
Usage: ntpdc [ - [] | --[@{=| @}] ]... [ host ...]
Flg Arg Option-Name Description
-4 no ipv4 Force IPv4 DNS name resolution
diff --git a/ntpdc/ntpdc-opts.c b/ntpdc/ntpdc-opts.c
index f2fde352b5a6..536d1b970f98 100644
--- a/ntpdc/ntpdc-opts.c
+++ b/ntpdc/ntpdc-opts.c
@@ -1,7 +1,7 @@
/*
* EDIT THIS FILE WITH CAUTION (ntpdc-opts.c)
*
- * It has been AutoGen-ed May 31, 2023 at 02:49:46 PM by AutoGen 5.18.16
+ * It has been AutoGen-ed June 6, 2023 at 04:37:53 AM by AutoGen 5.18.16
* From the definitions ntpdc-opts.def
* and the template file options
*
@@ -74,7 +74,7 @@ extern FILE * option_usage_fp;
* static const strings for ntpdc options
*/
static char const ntpdc_opt_strs[2005] =
-/* 0 */ "ntpdc 4.2.8p16\n"
+/* 0 */ "ntpdc 4.2.8p17\n"
"Copyright (C) 1992-2023 The University of Delaware and Network Time Foundation, all rights reserved.\n"
"This is free software. It is licensed for use, modification and\n"
"redistribution under the terms of the NTP License, copies of which\n"
@@ -136,14 +136,14 @@ static char const ntpdc_opt_strs[2005] =
/* 1785 */ "no-load-opts\0"
/* 1798 */ "no\0"
/* 1801 */ "NTPDC\0"
-/* 1807 */ "ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p16\n"
+/* 1807 */ "ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p17\n"
"Usage: %s [ - [] | --[{=| }] ]... [ host ...]\n\0"
/* 1938 */ "$HOME\0"
/* 1944 */ ".\0"
/* 1946 */ ".ntprc\0"
/* 1953 */ "https://bugs.ntp.org, bugs@ntp.org\0"
/* 1988 */ "\n\0"
-/* 1990 */ "ntpdc 4.2.8p16";
+/* 1990 */ "ntpdc 4.2.8p17";
/**
* ipv4 option description with
@@ -828,7 +828,7 @@ static void bogus_function(void) {
translate option names.
*/
/* referenced via ntpdcOptions.pzCopyright */
- puts(_("ntpdc 4.2.8p16\n\
+ puts(_("ntpdc 4.2.8p17\n\
Copyright (C) 1992-2023 The University of Delaware and Network Time Foundation, all rights reserved.\n\
This is free software. It is licensed for use, modification and\n\
redistribution under the terms of the NTP License, copies of which\n\
@@ -897,14 +897,14 @@ implied warranty.\n"));
puts(_("load options from a config file"));
/* referenced via ntpdcOptions.pzUsageTitle */
- puts(_("ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p16\n\
+ puts(_("ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p17\n\
Usage: %s [ - [] | --[{=| }] ]... [ host ...]\n"));
/* referenced via ntpdcOptions.pzExplain */
puts(_("\n"));
/* referenced via ntpdcOptions.pzFullVersion */
- puts(_("ntpdc 4.2.8p16"));
+ puts(_("ntpdc 4.2.8p17"));
/* referenced via ntpdcOptions.pzFullUsage */
puts(_("<<>>"));
diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h
index 524b081703d4..47d3f481a54e 100644
--- a/ntpdc/ntpdc-opts.h
+++ b/ntpdc/ntpdc-opts.h
@@ -1,7 +1,7 @@
/*
* EDIT THIS FILE WITH CAUTION (ntpdc-opts.h)
*
- * It has been AutoGen-ed May 31, 2023 at 02:49:46 PM by AutoGen 5.18.16
+ * It has been AutoGen-ed June 6, 2023 at 04:37:52 AM by AutoGen 5.18.16
* From the definitions ntpdc-opts.def
* and the template file options
*
@@ -92,9 +92,9 @@ typedef enum {
/** count of all options for ntpdc */
#define OPTION_CT 16
/** ntpdc version */
-#define NTPDC_VERSION "4.2.8p16"
+#define NTPDC_VERSION "4.2.8p17"
/** Full ntpdc version text */
-#define NTPDC_FULL_VERSION "ntpdc 4.2.8p16"
+#define NTPDC_FULL_VERSION "ntpdc 4.2.8p17"
/**
* Interface defines for all options. Replace "n" with the UPPER_CASED
diff --git a/ntpdc/ntpdc.1ntpdcman b/ntpdc/ntpdc.1ntpdcman
index 446acb5fb53b..f101aadac589 100644
--- a/ntpdc/ntpdc.1ntpdcman
+++ b/ntpdc/ntpdc.1ntpdcman
@@ -10,11 +10,11 @@
.ds B-Font B
.ds I-Font I
.ds R-Font R
-.TH ntpdc 1ntpdcman "31 May 2023" "4.2.8p16" "User Commands"
+.TH ntpdc 1ntpdcman "06 Jun 2023" "4.2.8p17" "User Commands"
.\"
.\" EDIT THIS FILE WITH CAUTION (in-mem file)
.\"
-.\" It has been AutoGen-ed May 31, 2023 at 02:49:54 PM by AutoGen 5.18.16
+.\" It has been AutoGen-ed June 6, 2023 at 04:38:01 AM by AutoGen 5.18.16
.\" From the definitions ntpdc-opts.def
.\" and the template file agman-cmd.tpl
.SH NAME
diff --git a/ntpdc/ntpdc.1ntpdcmdoc b/ntpdc/ntpdc.1ntpdcmdoc
index c750f834d99f..376443dae434 100644
--- a/ntpdc/ntpdc.1ntpdcmdoc
+++ b/ntpdc/ntpdc.1ntpdcmdoc
@@ -1,9 +1,9 @@
-.Dd May 31 2023
+.Dd June 6 2023
.Dt NTPDC 1ntpdcmdoc User Commands
.Os
.\" EDIT THIS FILE WITH CAUTION (ntpdc-opts.mdoc)
.\"
-.\" It has been AutoGen-ed May 31, 2023 at 02:49:50 PM by AutoGen 5.18.16
+.\" It has been AutoGen-ed June 6, 2023 at 04:37:57 AM by AutoGen 5.18.16
.\" From the definitions ntpdc-opts.def
.\" and the template file agmdoc-cmd.tpl
.Sh NAME
diff --git a/ntpdc/ntpdc.html b/ntpdc/ntpdc.html
index f036858d9c20..1a566baca91b 100644
--- a/ntpdc/ntpdc.html
+++ b/ntpdc/ntpdc.html
@@ -53,7 +53,7 @@ display the time offset of the system clock relative to the server
clock. Run as root, it can correct the system clock to this offset as
well. It can be run as an interactive command or from a cron job.
-This document applies to version 4.2.8p16 of ntpdc
.
+
This document applies to version 4.2.8p17 of ntpdc
.
The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
IETF specification.
@@ -199,7 +199,7 @@ used to select the program, defaulting to more. Both will exit
with a status code of 0.
-
ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p16
+ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p17
Usage: ntpdc [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]
Flg Arg Option-Name Description
-4 no ipv4 Force IPv4 DNS name resolution
diff --git a/ntpdc/ntpdc.man.in b/ntpdc/ntpdc.man.in
index cd518f7b1e8a..151c23b0c5c1 100644
--- a/ntpdc/ntpdc.man.in
+++ b/ntpdc/ntpdc.man.in
@@ -10,11 +10,11 @@
.ds B-Font B
.ds I-Font I
.ds R-Font R
-.TH ntpdc @NTPDC_MS@ "31 May 2023" "4.2.8p16" "User Commands"
+.TH ntpdc @NTPDC_MS@ "06 Jun 2023" "4.2.8p17" "User Commands"
.\"
.\" EDIT THIS FILE WITH CAUTION (in-mem file)
.\"
-.\" It has been AutoGen-ed May 31, 2023 at 02:49:54 PM by AutoGen 5.18.16
+.\" It has been AutoGen-ed June 6, 2023 at 04:38:01 AM by AutoGen 5.18.16
.\" From the definitions ntpdc-opts.def
.\" and the template file agman-cmd.tpl
.SH NAME
diff --git a/ntpdc/ntpdc.mdoc.in b/ntpdc/ntpdc.mdoc.in
index 87b5dba2bdf8..1a7859c448e6 100644
--- a/ntpdc/ntpdc.mdoc.in
+++ b/ntpdc/ntpdc.mdoc.in
@@ -1,9 +1,9 @@
-.Dd May 31 2023
+.Dd June 6 2023
.Dt NTPDC @NTPDC_MS@ User Commands
.Os
.\" EDIT THIS FILE WITH CAUTION (ntpdc-opts.mdoc)
.\"
-.\" It has been AutoGen-ed May 31, 2023 at 02:49:50 PM by AutoGen 5.18.16
+.\" It has been AutoGen-ed June 6, 2023 at 04:37:57 AM by AutoGen 5.18.16
.\" From the definitions ntpdc-opts.def
.\" and the template file agmdoc-cmd.tpl
.Sh NAME
diff --git a/ntpq/invoke-ntpq.texi b/ntpq/invoke-ntpq.texi
index dd2a0038912b..715dbcba764e 100644
--- a/ntpq/invoke-ntpq.texi
+++ b/ntpq/invoke-ntpq.texi
@@ -6,7 +6,7 @@
#
# EDIT THIS FILE WITH CAUTION (invoke-ntpq.texi)
#
-# It has been AutoGen-ed May 31, 2023 at 02:50:06 PM by AutoGen 5.18.16
+# It has been AutoGen-ed June 6, 2023 at 04:38:12 AM by AutoGen 5.18.16
# From the definitions ntpq-opts.def
# and the template file agtexi-cmd.tpl
@end ignore
@@ -945,7 +945,7 @@ with a status code of 0.
@exampleindent 0
@example
-ntpq - standard NTP query program - Ver. 4.2.8p16
+ntpq - standard NTP query program - Ver. 4.2.8p17
Usage: ntpq [ - [] | --[@{=| @}] ]... [ host ...]
Flg Arg Option-Name Description
-4 no ipv4 Force IPv4 name resolution
diff --git a/ntpq/ntpq-opts.c b/ntpq/ntpq-opts.c
index e6398fd724b4..3e176c057652 100644
--- a/ntpq/ntpq-opts.c
+++ b/ntpq/ntpq-opts.c
@@ -1,7 +1,7 @@
/*
* EDIT THIS FILE WITH CAUTION (ntpq-opts.c)
*
- * It has been AutoGen-ed May 31, 2023 at 02:49:56 PM by AutoGen 5.18.16
+ * It has been AutoGen-ed June 6, 2023 at 04:38:03 AM by AutoGen 5.18.16
* From the definitions ntpq-opts.def
* and the template file options
*
@@ -74,7 +74,7 @@ extern FILE * option_usage_fp;
* static const strings for ntpq options
*/
static char const ntpq_opt_strs[2068] =
-/* 0 */ "ntpq 4.2.8p16\n"
+/* 0 */ "ntpq 4.2.8p17\n"
"Copyright (C) 1992-2023 The University of Delaware and Network Time Foundation, all rights reserved.\n"
"This is free software. It is licensed for use, modification and\n"
"redistribution under the terms of the NTP License, copies of which\n"
@@ -140,13 +140,13 @@ static char const ntpq_opt_strs[2068] =
/* 1858 */ "no-load-opts\0"
/* 1871 */ "no\0"
/* 1874 */ "NTPQ\0"
-/* 1879 */ "ntpq - standard NTP query program - Ver. 4.2.8p16\n"
+/* 1879 */ "ntpq - standard NTP query program - Ver. 4.2.8p17\n"
"Usage: %s [ - [] | --[{=| }] ]... [ host ...]\n\0"
/* 1999 */ "$HOME\0"
/* 2005 */ ".\0"
/* 2007 */ ".ntprc\0"
/* 2014 */ "https://bugs.ntp.org, bugs@ntp.org\0"
-/* 2049 */ "ntpq 4.2.8p16\0"
+/* 2049 */ "ntpq 4.2.8p17\0"
/* 2063 */ "hash";
/**
@@ -873,7 +873,7 @@ static void bogus_function(void) {
translate option names.
*/
/* referenced via ntpqOptions.pzCopyright */
- puts(_("ntpq 4.2.8p16\n\
+ puts(_("ntpq 4.2.8p17\n\
Copyright (C) 1992-2023 The University of Delaware and Network Time Foundation, all rights reserved.\n\
This is free software. It is licensed for use, modification and\n\
redistribution under the terms of the NTP License, copies of which\n\
@@ -945,11 +945,11 @@ implied warranty.\n"));
puts(_("load options from a config file"));
/* referenced via ntpqOptions.pzUsageTitle */
- puts(_("ntpq - standard NTP query program - Ver. 4.2.8p16\n\
+ puts(_("ntpq - standard NTP query program - Ver. 4.2.8p17\n\
Usage: %s [ - [] | --[{=| }] ]... [ host ...]\n"));
/* referenced via ntpqOptions.pzFullVersion */
- puts(_("ntpq 4.2.8p16"));
+ puts(_("ntpq 4.2.8p17"));
/* referenced via ntpqOptions.pzFullUsage */
puts(_("<<>>"));
diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h
index 43637fd268cf..60d2ba1278c6 100644
--- a/ntpq/ntpq-opts.h
+++ b/ntpq/ntpq-opts.h
@@ -1,7 +1,7 @@
/*
* EDIT THIS FILE WITH CAUTION (ntpq-opts.h)
*
- * It has been AutoGen-ed May 31, 2023 at 02:49:56 PM by AutoGen 5.18.16
+ * It has been AutoGen-ed June 6, 2023 at 04:38:02 AM by AutoGen 5.18.16
* From the definitions ntpq-opts.def
* and the template file options
*
@@ -93,9 +93,9 @@ typedef enum {
/** count of all options for ntpq */
#define OPTION_CT 17
/** ntpq version */
-#define NTPQ_VERSION "4.2.8p16"
+#define NTPQ_VERSION "4.2.8p17"
/** Full ntpq version text */
-#define NTPQ_FULL_VERSION "ntpq 4.2.8p16"
+#define NTPQ_FULL_VERSION "ntpq 4.2.8p17"
/**
* Interface defines for all options. Replace "n" with the UPPER_CASED
diff --git a/ntpq/ntpq.1ntpqman b/ntpq/ntpq.1ntpqman
index 79f7f4cbc06c..e4f93b336110 100644
--- a/ntpq/ntpq.1ntpqman
+++ b/ntpq/ntpq.1ntpqman
@@ -10,11 +10,11 @@
.ds B-Font B
.ds I-Font I
.ds R-Font R
-.TH ntpq 1ntpqman "31 May 2023" "4.2.8p16" "User Commands"
+.TH ntpq 1ntpqman "06 Jun 2023" "4.2.8p17" "User Commands"
.\"
.\" EDIT THIS FILE WITH CAUTION (in-mem file)
.\"
-.\" It has been AutoGen-ed May 31, 2023 at 02:50:08 PM by AutoGen 5.18.16
+.\" It has been AutoGen-ed June 6, 2023 at 04:38:15 AM by AutoGen 5.18.16
.\" From the definitions ntpq-opts.def
.\" and the template file agman-cmd.tpl
.SH NAME
diff --git a/ntpq/ntpq.1ntpqmdoc b/ntpq/ntpq.1ntpqmdoc
index 9515506c71b5..9ce7db9484d3 100644
--- a/ntpq/ntpq.1ntpqmdoc
+++ b/ntpq/ntpq.1ntpqmdoc
@@ -1,9 +1,9 @@
-.Dd May 31 2023
+.Dd June 6 2023
.Dt NTPQ 1ntpqmdoc User Commands
.Os
.\" EDIT THIS FILE WITH CAUTION (ntpq-opts.mdoc)
.\"
-.\" It has been AutoGen-ed May 31, 2023 at 02:50:04 PM by AutoGen 5.18.16
+.\" It has been AutoGen-ed June 6, 2023 at 04:38:10 AM by AutoGen 5.18.16
.\" From the definitions ntpq-opts.def
.\" and the template file agmdoc-cmd.tpl
.Sh NAME
diff --git a/ntpq/ntpq.html b/ntpq/ntpq.html
index 38a674378f89..1ca91e4f3cd4 100644
--- a/ntpq/ntpq.html
+++ b/ntpq/ntpq.html
@@ -62,7 +62,7 @@ monitor the operational status
and determine the performance of
ntpd
, the NTP daemon.
-This document applies to version 4.2.8p16 of ntpq
.
+
This document applies to version 4.2.8p17 of ntpq
.