aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGleb Smirnoff <glebius@FreeBSD.org>2015-10-21 19:16:13 +0000
committerGleb Smirnoff <glebius@FreeBSD.org>2015-10-21 19:16:13 +0000
commit0b0c40a74f7959b8d7d71f883715ac667a6f119a (patch)
tree9317fbf022414d34dee917358139b99c3a2b9184
parent2cf53bda1c28f47d72aa80971e6c5d400c46a960 (diff)
downloadsrc-0b0c40a74f7959b8d7d71f883715ac667a6f119a.tar.gz
src-0b0c40a74f7959b8d7d71f883715ac667a6f119a.zip
Merge NTP 4.2.8p4 into dist.
Notes
Notes: svn path=/vendor/ntp/dist/; revision=289715
-rw-r--r--ChangeLog155
-rw-r--r--CommitLog4981
-rw-r--r--Makefile.am2
-rw-r--r--Makefile.in6
-rw-r--r--NEWS495
-rw-r--r--aclocal.m41
-rw-r--r--adjtimed/Makefile.in4
-rw-r--r--adjtimed/adjtimed.c2
-rw-r--r--clockstuff/Makefile.in4
-rw-r--r--clockstuff/chutest.c2
-rw-r--r--clockstuff/propdelay.c2
-rwxr-xr-xconfigure243
-rw-r--r--configure.ac58
-rw-r--r--html/decode.html4
-rw-r--r--html/miscopt.html4
-rw-r--r--html/stats.html48
-rw-r--r--include/Makefile.am1
-rw-r--r--include/Makefile.in5
-rw-r--r--include/isc/Makefile.in4
-rw-r--r--include/ntp_assert.h4
-rw-r--r--include/ntp_calendar.h13
-rw-r--r--include/ntp_config.h4
-rw-r--r--include/ntp_control.h2
-rw-r--r--include/ntp_lists.h6
-rw-r--r--include/ntp_stdlib.h1
-rw-r--r--include/ntp_syslog.h1
-rw-r--r--include/ntp_types.h3
-rw-r--r--include/rc_cmdlength.h2
-rw-r--r--kernel/Makefile.in4
-rw-r--r--kernel/sys/Makefile.in4
-rw-r--r--libntp/Makefile.in4
-rw-r--r--libntp/atolfp.c2
-rw-r--r--libntp/audio.c13
-rw-r--r--libntp/authkeys.c12
-rw-r--r--libntp/authreadkeys.c89
-rw-r--r--libntp/caljulian.c2
-rw-r--r--libntp/caltontp.c14
-rw-r--r--libntp/decodenetnum.c9
-rw-r--r--libntp/emalloc.c2
-rw-r--r--libntp/icom.c28
-rw-r--r--libntp/machines.c6
-rw-r--r--libntp/msyslog.c24
-rw-r--r--libntp/ntp_calendar.c786
-rw-r--r--libntp/ntp_intres.c24
-rw-r--r--libntp/ntp_lineedit.c2
-rw-r--r--libntp/ntp_rfc2553.c2
-rw-r--r--libntp/ntp_worker.c2
-rw-r--r--libntp/prettydate.c2
-rw-r--r--libntp/recvbuff.c2
-rw-r--r--libntp/socket.c4
-rw-r--r--libntp/socktohost.c2
-rw-r--r--libntp/statestr.c2
-rw-r--r--libparse/Makefile.in4
-rw-r--r--ntpd/Makefile.am3
-rw-r--r--ntpd/Makefile.in7
-rw-r--r--ntpd/invoke-ntp.conf.texi15
-rw-r--r--ntpd/invoke-ntp.keys.texi2
-rw-r--r--ntpd/invoke-ntpd.texi4
-rw-r--r--ntpd/ntp.conf.5man19
-rw-r--r--ntpd/ntp.conf.5mdoc17
-rw-r--r--ntpd/ntp.conf.def13
-rw-r--r--ntpd/ntp.conf.html15
-rw-r--r--ntpd/ntp.conf.man.in19
-rw-r--r--ntpd/ntp.conf.mdoc.in17
-rw-r--r--ntpd/ntp.keys.5man4
-rw-r--r--ntpd/ntp.keys.5mdoc4
-rw-r--r--ntpd/ntp.keys.html2
-rw-r--r--ntpd/ntp.keys.man.in4
-rw-r--r--ntpd/ntp.keys.mdoc.in4
-rw-r--r--ntpd/ntp_config.c59
-rw-r--r--ntpd/ntp_control.c80
-rw-r--r--ntpd/ntp_crypto.c134
-rw-r--r--ntpd/ntp_io.c84
-rw-r--r--ntpd/ntp_loopfilter.c8
-rw-r--r--ntpd/ntp_monitor.c6
-rw-r--r--ntpd/ntp_parser.c2399
-rw-r--r--ntpd/ntp_parser.h442
-rw-r--r--ntpd/ntp_parser.y41
-rw-r--r--ntpd/ntp_peer.c13
-rw-r--r--ntpd/ntp_proto.c297
-rw-r--r--ntpd/ntp_refclock.c2
-rw-r--r--ntpd/ntp_request.c10
-rw-r--r--ntpd/ntp_restrict.c28
-rw-r--r--ntpd/ntp_timer.c6
-rw-r--r--ntpd/ntpd-opts.c14
-rw-r--r--ntpd/ntpd-opts.def6
-rw-r--r--ntpd/ntpd-opts.h6
-rw-r--r--ntpd/ntpd.1ntpdman12
-rw-r--r--ntpd/ntpd.1ntpdmdoc10
-rw-r--r--ntpd/ntpd.c104
-rw-r--r--ntpd/ntpd.html4
-rw-r--r--ntpd/ntpd.man.in12
-rw-r--r--ntpd/ntpd.mdoc.in10
-rw-r--r--ntpd/rc_cmdlength.c1
-rw-r--r--ntpd/refclock_arc.c2
-rw-r--r--ntpd/refclock_chu.c2
-rw-r--r--ntpd/refclock_gpsdjson.c18
-rw-r--r--ntpd/refclock_local.c18
-rw-r--r--ntpd/refclock_nmea.c7
-rw-r--r--ntpd/refclock_palisade.c4
-rw-r--r--ntpd/refclock_parse.c3
-rw-r--r--ntpd/refclock_wwv.c6
-rw-r--r--ntpdate/Makefile.in4
-rw-r--r--ntpdate/ntpdate.c2
-rw-r--r--ntpdc/Makefile.in4
-rw-r--r--ntpdc/invoke-ntpdc.texi4
-rw-r--r--ntpdc/ntpdc-opts.c14
-rw-r--r--ntpdc/ntpdc-opts.h6
-rw-r--r--ntpdc/ntpdc.1ntpdcman6
-rw-r--r--ntpdc/ntpdc.1ntpdcmdoc4
-rw-r--r--ntpdc/ntpdc.c4
-rw-r--r--ntpdc/ntpdc.html4
-rw-r--r--ntpdc/ntpdc.man.in6
-rw-r--r--ntpdc/ntpdc.mdoc.in4
-rw-r--r--ntpq/Makefile.in4
-rw-r--r--ntpq/invoke-ntpq.texi4
-rw-r--r--ntpq/libntpq.h2
-rw-r--r--ntpq/ntpq-opts.c14
-rw-r--r--ntpq/ntpq-opts.h6
-rw-r--r--ntpq/ntpq-subs.c16
-rw-r--r--ntpq/ntpq.1ntpqman6
-rw-r--r--ntpq/ntpq.1ntpqmdoc4
-rw-r--r--ntpq/ntpq.c24
-rw-r--r--ntpq/ntpq.html4
-rw-r--r--ntpq/ntpq.man.in6
-rw-r--r--ntpq/ntpq.mdoc.in4
-rw-r--r--ntpsnmpd/Makefile.in4
-rw-r--r--ntpsnmpd/invoke-ntpsnmpd.texi4
-rw-r--r--ntpsnmpd/ntpsnmpd-opts.c14
-rw-r--r--ntpsnmpd/ntpsnmpd-opts.h6
-rw-r--r--ntpsnmpd/ntpsnmpd.1ntpsnmpdman6
-rw-r--r--ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc4
-rw-r--r--ntpsnmpd/ntpsnmpd.html2
-rw-r--r--ntpsnmpd/ntpsnmpd.man.in6
-rw-r--r--ntpsnmpd/ntpsnmpd.mdoc.in4
-rw-r--r--packageinfo.sh2
-rw-r--r--parseutil/Makefile.in4
-rw-r--r--ports/winnt/libntp/termios.c2
-rw-r--r--ports/winnt/ntpd/nt_clockstuff.c2
-rw-r--r--ports/winnt/ntpd/ntp_iocompletionport.c15
-rw-r--r--ports/winnt/vs2005/ntpd.vcproj22
-rw-r--r--ports/winnt/vs2008/ntpd/ntpd.vcproj4
-rw-r--r--ports/winnt/vs2013/ntpd/ntpd.vcxproj1
-rw-r--r--ports/winnt/vs2013/ntpd/ntpd.vcxproj.filters3
-rw-r--r--scripts/Makefile.in4
-rw-r--r--scripts/build/Makefile.in4
-rw-r--r--scripts/calc_tickadj/Makefile.in4
-rw-r--r--scripts/calc_tickadj/calc_tickadj.1calc_tickadjman6
-rw-r--r--scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc4
-rw-r--r--scripts/calc_tickadj/calc_tickadj.html2
-rw-r--r--scripts/calc_tickadj/calc_tickadj.man.in6
-rw-r--r--scripts/calc_tickadj/calc_tickadj.mdoc.in4
-rw-r--r--scripts/calc_tickadj/invoke-calc_tickadj.texi2
-rw-r--r--scripts/invoke-plot_summary.texi4
-rw-r--r--scripts/invoke-summary.texi4
-rw-r--r--scripts/lib/Makefile.in4
-rw-r--r--scripts/lib/NTP/Util.pm9
-rw-r--r--scripts/ntp-wait/Makefile.in4
-rw-r--r--scripts/ntp-wait/invoke-ntp-wait.texi4
-rw-r--r--scripts/ntp-wait/ntp-wait-opts4
-rw-r--r--scripts/ntp-wait/ntp-wait.1ntp-waitman6
-rw-r--r--scripts/ntp-wait/ntp-wait.1ntp-waitmdoc4
-rw-r--r--scripts/ntp-wait/ntp-wait.html4
-rw-r--r--scripts/ntp-wait/ntp-wait.man.in6
-rw-r--r--scripts/ntp-wait/ntp-wait.mdoc.in4
-rw-r--r--scripts/ntpsweep/Makefile.in4
-rw-r--r--scripts/ntpsweep/invoke-ntpsweep.texi4
-rw-r--r--scripts/ntpsweep/ntpsweep-opts4
-rw-r--r--scripts/ntpsweep/ntpsweep.1ntpsweepman6
-rw-r--r--scripts/ntpsweep/ntpsweep.1ntpsweepmdoc4
-rw-r--r--scripts/ntpsweep/ntpsweep.html4
-rw-r--r--scripts/ntpsweep/ntpsweep.in3
-rw-r--r--scripts/ntpsweep/ntpsweep.man.in6
-rw-r--r--scripts/ntpsweep/ntpsweep.mdoc.in4
-rw-r--r--scripts/ntptrace/Makefile.in4
-rw-r--r--scripts/ntptrace/invoke-ntptrace.texi4
-rw-r--r--scripts/ntptrace/ntptrace-opts4
-rw-r--r--scripts/ntptrace/ntptrace.1ntptraceman6
-rw-r--r--scripts/ntptrace/ntptrace.1ntptracemdoc4
-rw-r--r--scripts/ntptrace/ntptrace.html4
-rw-r--r--scripts/ntptrace/ntptrace.man.in6
-rw-r--r--scripts/ntptrace/ntptrace.mdoc.in4
-rw-r--r--scripts/plot_summary-opts4
-rw-r--r--scripts/plot_summary.1plot_summaryman6
-rw-r--r--scripts/plot_summary.1plot_summarymdoc4
-rw-r--r--scripts/plot_summary.html4
-rw-r--r--scripts/plot_summary.man.in6
-rw-r--r--scripts/plot_summary.mdoc.in4
-rw-r--r--scripts/summary-opts4
-rw-r--r--scripts/summary.1summaryman6
-rw-r--r--scripts/summary.1summarymdoc4
-rw-r--r--scripts/summary.html4
-rw-r--r--scripts/summary.man.in6
-rw-r--r--scripts/summary.mdoc.in4
-rw-r--r--scripts/update-leap/Makefile.in4
-rw-r--r--scripts/update-leap/invoke-update-leap.texi2
-rw-r--r--scripts/update-leap/update-leap-opts4
-rw-r--r--scripts/update-leap/update-leap.1update-leapman6
-rw-r--r--scripts/update-leap/update-leap.1update-leapmdoc4
-rw-r--r--scripts/update-leap/update-leap.html2
-rw-r--r--scripts/update-leap/update-leap.man.in6
-rw-r--r--scripts/update-leap/update-leap.mdoc.in4
-rw-r--r--sntp/Makefile.am41
-rw-r--r--sntp/Makefile.in36
-rwxr-xr-xsntp/configure131
-rw-r--r--sntp/configure.ac1
-rw-r--r--sntp/include/Makefile.in3
-rw-r--r--sntp/include/version.def2
-rw-r--r--sntp/include/version.texi6
-rw-r--r--sntp/invoke-sntp.texi4
-rw-r--r--sntp/libevent/Makefile.am2
-rw-r--r--sntp/libevent/Makefile.in277
-rw-r--r--sntp/libevent/sample/dns-example.c248
-rw-r--r--sntp/libevent/sample/event-read-fifo.c162
-rw-r--r--sntp/libevent/sample/hello-world.c141
-rw-r--r--sntp/libevent/sample/hostcheck.c217
-rw-r--r--sntp/libevent/sample/hostcheck.h30
-rw-r--r--sntp/libevent/sample/http-server.c418
-rw-r--r--sntp/libevent/sample/https-client.c439
-rw-r--r--sntp/libevent/sample/include.am53
-rw-r--r--sntp/libevent/sample/le-proxy.c288
-rw-r--r--sntp/libevent/sample/openssl_hostname_validation.c172
-rw-r--r--sntp/libevent/sample/openssl_hostname_validation.h56
-rw-r--r--sntp/libevent/sample/signal-test.c75
-rw-r--r--sntp/libevent/sample/time-test.c107
-rw-r--r--sntp/libevent/test/bench_httpclient.c4
-rw-r--r--sntp/libevent/test/regress.c4
-rw-r--r--sntp/libevent/test/regress_dns.c5
-rw-r--r--sntp/libevent/test/regress_http.c4
-rw-r--r--sntp/libevent/test/regress_minheap.c1
-rw-r--r--sntp/libevent/test/test-ratelim.c4
-rw-r--r--sntp/libevent/test/test-time.c1
-rw-r--r--sntp/libopts/Makefile.in3
-rw-r--r--sntp/libopts/compat/pathfind.c13
-rw-r--r--sntp/log.c21
-rw-r--r--sntp/log.h2
-rw-r--r--sntp/m4/ntp_libevent.m421
-rw-r--r--sntp/m4/ntp_libntp.m415
-rw-r--r--sntp/m4/ntp_problemtests.m456
-rw-r--r--sntp/m4/ntp_rlimit.m461
-rw-r--r--sntp/m4/openldap-thread-check.m49
-rw-r--r--sntp/m4/os_cflags.m434
-rw-r--r--sntp/m4/version.m42
-rw-r--r--sntp/networking.c2
-rw-r--r--sntp/scripts/Makefile.in3
-rw-r--r--sntp/sntp-opts.c14
-rw-r--r--sntp/sntp-opts.h6
-rw-r--r--sntp/sntp.1sntpman6
-rw-r--r--sntp/sntp.1sntpmdoc4
-rw-r--r--sntp/sntp.html4
-rw-r--r--sntp/sntp.man.in6
-rw-r--r--sntp/sntp.mdoc.in4
-rw-r--r--sntp/tests/Makefile.am169
-rw-r--r--sntp/tests/Makefile.in698
-rw-r--r--sntp/tests/crypto.c31
-rw-r--r--sntp/tests/fileHandlingTest.c74
-rw-r--r--sntp/tests/fileHandlingTest.h100
-rw-r--r--sntp/tests/fileHandlingTest.h.in87
-rw-r--r--sntp/tests/g_fileHandlingTest.h64
-rw-r--r--sntp/tests/g_networking.cpp5
-rw-r--r--sntp/tests/g_packetHandling.cpp264
-rw-r--r--sntp/tests/g_packetProcessing.cpp334
-rw-r--r--sntp/tests/g_sntptest.h35
-rw-r--r--sntp/tests/keyFile.c63
-rw-r--r--sntp/tests/kodDatabase.c73
-rw-r--r--sntp/tests/kodFile.c74
-rw-r--r--sntp/tests/packetHandling.c92
-rw-r--r--sntp/tests/packetProcessing.c118
-rw-r--r--sntp/tests/run-crypto.c23
-rw-r--r--sntp/tests/run-keyFile.c31
-rw-r--r--sntp/tests/run-kodDatabase.c33
-rw-r--r--sntp/tests/run-kodFile.c35
-rw-r--r--sntp/tests/run-networking.c9
-rw-r--r--sntp/tests/run-packetHandling.c36
-rw-r--r--sntp/tests/run-packetProcessing.c47
-rw-r--r--sntp/tests/run-t-log.c57
-rw-r--r--sntp/tests/run-utilities.c41
-rw-r--r--sntp/tests/sntptest.c33
-rw-r--r--sntp/tests/sntptest.h26
-rw-r--r--sntp/tests/t-log.c68
-rw-r--r--sntp/tests/utilities.c70
-rw-r--r--sntp/tests_main.cpp29
-rw-r--r--sntp/tests_main.h22
-rw-r--r--sntp/unity/Makefile.am4
-rw-r--r--sntp/unity/Makefile.in7
-rw-r--r--sntp/unity/auto/generate_test_runner.rb311
-rwxr-xr-xsntp/unity/auto/parseOutput.rb191
-rwxr-xr-xsntp/unity/auto/type_sanitizer.rb8
-rwxr-xr-xsntp/unity/auto/unity_test_summary.py135
-rw-r--r--sntp/unity/auto/unity_test_summary.rb73
-rw-r--r--sntp/unity/unity.c4
-rw-r--r--sntp/unity/unity_config.h12
-rw-r--r--sntp/unity/unity_internals.h12
-rw-r--r--sntp/version.c2
-rw-r--r--tests/Makefile.am14
-rw-r--r--tests/Makefile.in12
-rw-r--r--tests/bug-2803/Makefile.am2
-rw-r--r--tests/bug-2803/Makefile.in7
-rw-r--r--tests/bug-2803/run-bug-2803.c12
-rw-r--r--tests/libntp/Makefile.am631
-rw-r--r--tests/libntp/Makefile.in2426
-rw-r--r--tests/libntp/a_md5encrypt.c54
-rw-r--r--tests/libntp/atoint.c9
-rw-r--r--tests/libntp/atouint.c18
-rw-r--r--tests/libntp/authkeys.c59
-rw-r--r--tests/libntp/buftvtots.c35
-rw-r--r--tests/libntp/calendar.c521
-rw-r--r--tests/libntp/caljulian.c86
-rw-r--r--tests/libntp/caltontp.c7
-rw-r--r--tests/libntp/calyearstart.c17
-rw-r--r--tests/libntp/clocktime.c85
-rw-r--r--tests/libntp/decodenetnum.c54
-rw-r--r--tests/libntp/g_a_md5encrypt.cpp89
-rw-r--r--tests/libntp/g_atoint.cpp48
-rw-r--r--tests/libntp/g_atouint.cpp40
-rw-r--r--tests/libntp/g_authkeys.cpp100
-rw-r--r--tests/libntp/g_buftvtots.cpp61
-rw-r--r--tests/libntp/g_calendar.cpp337
-rw-r--r--tests/libntp/g_caljulian.cpp94
-rw-r--r--tests/libntp/g_caltontp.cpp49
-rw-r--r--tests/libntp/g_calyearstart.cpp43
-rw-r--r--tests/libntp/g_clocktime.cpp187
-rw-r--r--tests/libntp/g_decodenetnum.cpp93
-rw-r--r--tests/libntp/g_hextoint.cpp42
-rw-r--r--tests/libntp/g_hextolfp.cpp58
-rw-r--r--tests/libntp/g_humandate.cpp41
-rw-r--r--tests/libntp/g_lfpfunc.cpp547
-rw-r--r--tests/libntp/g_lfptest.h32
-rw-r--r--tests/libntp/g_lfptostr.cpp103
-rw-r--r--tests/libntp/g_libntptest.cpp27
-rw-r--r--tests/libntp/g_libntptest.h15
-rw-r--r--tests/libntp/g_modetoa.cpp16
-rw-r--r--tests/libntp/g_msyslog.cpp137
-rw-r--r--tests/libntp/g_netof.cpp69
-rw-r--r--tests/libntp/g_numtoa.cpp18
-rw-r--r--tests/libntp/g_numtohost.cpp15
-rw-r--r--tests/libntp/g_octtoint.cpp57
-rw-r--r--tests/libntp/g_prettydate.cpp16
-rw-r--r--tests/libntp/g_recvbuff.cpp38
-rw-r--r--tests/libntp/g_refnumtoa.cpp52
-rw-r--r--tests/libntp/g_sfptostr.cpp71
-rw-r--r--tests/libntp/g_sockaddrtest.h59
-rw-r--r--tests/libntp/g_socktoa.cpp100
-rw-r--r--tests/libntp/g_ssl_init.cpp50
-rw-r--r--tests/libntp/g_statestr.cpp28
-rw-r--r--tests/libntp/g_strtolfp.cpp107
-rw-r--r--tests/libntp/g_timespecops.cpp475
-rw-r--r--tests/libntp/g_timestructs.cpp156
-rw-r--r--tests/libntp/g_timestructs.h185
-rw-r--r--tests/libntp/g_timevalops.cpp480
-rw-r--r--tests/libntp/g_tstotv.cpp57
-rw-r--r--tests/libntp/g_tvtots.cpp54
-rw-r--r--tests/libntp/g_uglydate.cpp18
-rw-r--r--tests/libntp/g_vi64ops.cpp64
-rw-r--r--tests/libntp/g_ymd2yd.cpp23
-rw-r--r--tests/libntp/hextoint.c6
-rw-r--r--tests/libntp/hextolfp.c44
-rw-r--r--tests/libntp/humandate.c22
-rw-r--r--tests/libntp/lfpfunc.c397
-rw-r--r--tests/libntp/lfptest.c11
-rw-r--r--tests/libntp/lfptest.h20
-rw-r--r--tests/libntp/lfptostr.c76
-rw-r--r--tests/libntp/modetoa.c13
-rw-r--r--tests/libntp/msyslog.c22
-rw-r--r--tests/libntp/netof.c8
-rw-r--r--tests/libntp/numtoa.c30
-rw-r--r--tests/libntp/numtohost.c9
-rw-r--r--tests/libntp/octtoint.c10
-rw-r--r--tests/libntp/prettydate.c5
-rw-r--r--tests/libntp/recvbuff.c4
-rw-r--r--tests/libntp/refidsmear.c9
-rw-r--r--tests/libntp/refnumtoa.c22
-rw-r--r--tests/libntp/run-a_md5encrypt.c29
-rw-r--r--tests/libntp/run-atoint.c19
-rw-r--r--tests/libntp/run-atouint.c28
-rw-r--r--tests/libntp/run-authkeys.c34
-rw-r--r--tests/libntp/run-buftvtots.c28
-rw-r--r--tests/libntp/run-calendar.c62
-rw-r--r--tests/libntp/run-caljulian.c28
-rw-r--r--tests/libntp/run-caltontp.c16
-rw-r--r--tests/libntp/run-calyearstart.c22
-rw-r--r--tests/libntp/run-clocktime.c42
-rw-r--r--tests/libntp/run-decodenetnum.c22
-rw-r--r--tests/libntp/run-hextoint.c20
-rw-r--r--tests/libntp/run-hextolfp.c23
-rw-r--r--tests/libntp/run-humandate.c11
-rw-r--r--tests/libntp/run-lfpfunc.c48
-rw-r--r--tests/libntp/run-lfptostr.c29
-rw-r--r--tests/libntp/run-modetoa.c12
-rw-r--r--tests/libntp/run-msyslog.c25
-rw-r--r--tests/libntp/run-netof.c19
-rw-r--r--tests/libntp/run-numtoa.c13
-rw-r--r--tests/libntp/run-numtohost.c11
-rw-r--r--tests/libntp/run-octtoint.c22
-rw-r--r--tests/libntp/run-prettydate.c12
-rw-r--r--tests/libntp/run-recvbuff.c14
-rw-r--r--tests/libntp/run-refidsmear.c14
-rw-r--r--tests/libntp/run-refnumtoa.c17
-rw-r--r--tests/libntp/run-sfptostr.c23
-rw-r--r--tests/libntp/run-socktoa.c24
-rw-r--r--tests/libntp/run-ssl_init.c28
-rw-r--r--tests/libntp/run-statestr.c18
-rw-r--r--tests/libntp/run-strtolfp.c22
-rw-r--r--tests/libntp/run-timespecops.c124
-rw-r--r--tests/libntp/run-timevalops.c123
-rw-r--r--tests/libntp/run-tstotv.c15
-rw-r--r--tests/libntp/run-tvtots.c14
-rw-r--r--tests/libntp/run-uglydate.c11
-rw-r--r--tests/libntp/run-vi64ops.c22
-rw-r--r--tests/libntp/run-ymd2yd.c16
-rw-r--r--tests/libntp/sfptostr.c10
-rw-r--r--tests/libntp/sockaddrtest.c51
-rw-r--r--tests/libntp/sockaddrtest.h50
-rw-r--r--tests/libntp/socktoa.c56
-rw-r--r--tests/libntp/ssl_init.c23
-rw-r--r--tests/libntp/statestr.c31
-rw-r--r--tests/libntp/strtolfp.c15
-rw-r--r--tests/libntp/test-libntp.c17
-rw-r--r--tests/libntp/test-libntp.h5
-rw-r--r--tests/libntp/timespecops.c259
-rw-r--r--tests/libntp/timevalops.c264
-rw-r--r--tests/libntp/tstotv.c11
-rw-r--r--tests/libntp/tvtots.c38
-rw-r--r--tests/libntp/uglydate.c4
-rw-r--r--tests/libntp/vi64ops.c42
-rw-r--r--tests/libntp/ymd2yd.c36
-rw-r--r--tests/ntpd/Makefile.am197
-rw-r--r--tests/ntpd/Makefile.in663
-rw-r--r--tests/ntpd/leapsec.c (renamed from tests/ntpd/leapsec.cpp)698
-rw-r--r--tests/ntpd/ntp_prio_q.c262
-rw-r--r--tests/ntpd/ntp_restrict.c198
-rw-r--r--tests/ntpd/ntpdtest.cpp27
-rw-r--r--tests/ntpd/ntpdtest.h15
-rw-r--r--tests/ntpd/rc_cmdlength.c38
-rw-r--r--tests/ntpd/run-leapsec.c122
-rw-r--r--tests/ntpd/run-ntp_prio_q.c69
-rw-r--r--tests/ntpd/run-ntp_restrict.c68
-rw-r--r--tests/ntpd/run-rc_cmdlength.c57
-rw-r--r--tests/ntpd/run-t-ntp_scanner.c72
-rw-r--r--tests/ntpd/run-t-ntp_signd.c66
-rw-r--r--tests/ntpd/t-ntp_scanner.c136
-rw-r--r--tests/ntpd/t-ntp_signd.c116
-rw-r--r--tests/ntpq/Makefile.am96
-rw-r--r--tests/ntpq/Makefile.in1286
-rw-r--r--tests/ntpq/run-t-ntpq.c54
-rw-r--r--tests/ntpq/t-ntpq.c37
-rw-r--r--tests/sandbox/Makefile.am25
-rw-r--r--tests/sandbox/Makefile.in42
-rw-r--r--tests/sandbox/run-modetoa.c11
-rw-r--r--tests/sandbox/run-uglydate.c13
-rw-r--r--tests/sandbox/run-ut-2803.c11
-rw-r--r--tests/sandbox/smeartest.c12
-rw-r--r--tests/sec-2853/Makefile.am2
-rw-r--r--tests/sec-2853/Makefile.in8
-rw-r--r--tests/sec-2853/run-sec-2853.c13
-rw-r--r--tests/sec-2853/sec-2853.c4
-rw-r--r--util/Makefile.in4
-rw-r--r--util/invoke-ntp-keygen.texi4
-rw-r--r--util/ntp-keygen-opts.c14
-rw-r--r--util/ntp-keygen-opts.h6
-rw-r--r--util/ntp-keygen.1ntp-keygenman6
-rw-r--r--util/ntp-keygen.1ntp-keygenmdoc4
-rw-r--r--util/ntp-keygen.c6
-rw-r--r--util/ntp-keygen.html4
-rw-r--r--util/ntp-keygen.man.in6
-rw-r--r--util/ntp-keygen.mdoc.in4
-rw-r--r--util/ntptime.c4
467 files changed, 17613 insertions, 16381 deletions
diff --git a/ChangeLog b/ChangeLog
index 738ae225867d..5d8346b310b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,159 @@
---
+(4.2.8p4) 2015/10/21 Released by Harlan Stenn <stenn@ntp.org>
+(4.2.8p4-RC1) 2015/10/06 Released by Harlan Stenn <stenn@ntp.org>
+
+* [Sec 2899] CVE-2014-9297 perlinger@ntp.org
+* [Sec 2901] Drop invalid packet before checking KoD. Check for all KoD's.
+ Danny Mayer. Log incoming packets that fail TEST2. Harlan Stenn.
+* [Sec 2902] configuration directives "pidfile" and "driftfile"
+ should be local-only. perlinger@ntp.org (patch by Miroslav Lichvar)
+* [Sec 2909] added missing call to 'free()' in ntp_crypto.c. perlinger@ntp.org
+* [Sec 2913] TALOS-CAN-0052: crash by loop counter underrun. perlinger@ntp.org
+* [Sec 2916] TALOS-CAN-0054: memory corruption in password store. JPerlinger
+* [Sec 2917] TALOS-CAN-0055: Infinite loop if extended logging enabled and
+ the logfile and keyfile are the same. perlinger@ntp.org
+* [Sec 1918] TALOS-CAN-0062: prevent directory traversal for VMS, too, when
+ using 'saveconfig' command. perlinger@ntp.org
+* [Bug 2919] TALOS-CAN-0063: avoid buffer overrun in ntpq. perlinger@ntp.org
+* [Sec 2020] TALOS-CAN-0064: signed/unsiged clash could lead to buffer overun
+ and memory corruption. perlinger@ntp.org
+* [Sec 2921] TALOS-CAN-0065: password length memory corruption. JPerlinger.
+* [Sec 2922] decodenetnum() will ASSERT botch instead of returning FAIL
+ on some bogus values. Harlan Stenn.
+* [Sec 2941] NAK to the Future: Symmetric association authentication
+ bypass via crypto-NAK. Patch applied. perlinger@ntp.org
+* [Bug 2332] (reopened) Exercise thread cancellation once before dropping
+ privileges and limiting resources in NTPD removes the need to link
+ forcefully against 'libgcc_s' which does not always work. J.Perlinger
+* [Bug 2595] ntpdate man page quirks. Hal Murray, Harlan Stenn.
+* [Bug 2625] Deprecate flag1 in local refclock. Hal Murray, Harlan Stenn.
+* [Bug 2817] Stop locking ntpd into memory by default under Linux. H.Stenn.
+* [Bug 2821] minor build issues: fixed refclock_gpsdjson.c. perlinger@ntp.org
+* [Bug 2823] ntpsweep with recursive peers option doesn't work. H.Stenn.
+* [Bug 2849] Systems with more than one default route may never
+ synchronize. Brian Utterback. Note that this patch might need to
+ be reverted once Bug 2043 has been fixed.
+* [Bug 2864] 4.2.8p3 fails to compile on Windows. Juergen Perlinger
+* [Bug 2866] segmentation fault at initgroups(). Harlan Stenn.
+* [Bug 2867] ntpd with autokey active crashed by 'ntpq -crv'. J.Perlinger
+* [Bug 2873] libevent should not include .deps/ in the tarball. H.Stenn
+* [Bug 2874] Don't distribute generated sntp/tests/fileHandlingTest.h. H.Stenn
+* [Bug 2875] sntp/Makefile.am: Get rid of DIST_SUBDIRS. libevent must
+ be configured for the distribution targets. Harlan Stenn.
+* [Bug 2883] ntpd crashes on exit with empty driftfile. Miroslav Lichvar.
+* [Bug 2886] Mis-spelling: "outlyer" should be "outlier". dave@horsfall.org
+* [Bug 2888] streamline calendar functions. perlinger@ntp.org
+* [Bug 2889] ntp-dev-4.3.67 does not build on Windows. perlinger@ntp.org
+* [Bug 2890] Ignore ENOBUFS on routing netlink socket. Konstantin Khlebnikov.
+* [Bug 2906] make check needs better support for pthreads. Harlan Stenn.
+* [Bug 2907] dist* build targets require our libevent/ to be enabled. HStenn.
+* [Bug 2912] no munlockall() under Windows. David Taylor, Harlan Stenn.
+* libntp/emalloc.c: Remove explicit include of stdint.h. Harlan Stenn.
+* Put Unity CPPFLAGS items in unity_config.h. Harlan Stenn.
+* tests/ntpd/g_leapsec.cpp typo fix. Harlan Stenn.
+* Phase 1 deprecation of google test in sntp/tests/. Harlan Stenn.
+* On some versions of HP-UX, inttypes.h does not include stdint.h. H.Stenn.
+* top_srcdir can change based on ntp v. sntp. Harlan Stenn.
+* sntp/tests/ function parameter list cleanup. Damir Tomić.
+* tests/libntp/ function parameter list cleanup. Damir Tomić.
+* tests/ntpd/ function parameter list cleanup. Damir Tomić.
+* sntp/unity/unity_config.h: handle stdint.h. Harlan Stenn.
+* sntp/unity/unity_internals.h: handle *INTPTR_MAX on old Solaris. H.Stenn.
+* tests/libntp/timevalops.c and timespecops.c fixed error printing. D.Tomić.
+* tests/libntp/ improvements in code and fixed error printing. Damir Tomić.
+* tests/libntp: a_md5encrypt.c, authkeys.c, buftvtots.c, calendar.c, caljulian.c,
+ caltontp.c, clocktime.c, humandate.c, hextolfp.c, decodenetnum.c - fixed
+ formatting; first declaration, then code (C90); deleted unnecessary comments;
+ changed from sprintf to snprintf; fixed order of includes. Tomasz Flendrich
+* tests/libntp/lfpfunc.c remove unnecessary include, remove old comments,
+ fix formatting, cleanup. Tomasz Flendrich
+* tests/libntp/lfptostr.c remove unnecessary include, add consts, fix formatting.
+ Tomasz Flendrich
+* tests/libntp/statestr.c remove empty functions, remove unnecessary include,
+ fix formatting. Tomasz Flendrich
+* tests/libntp/modetoa.c fixed formatting. Tomasz Flendrich
+* tests/libntp/msyslog.c fixed formatting. Tomasz Flendrich
+* tests/libntp/numtoa.c deleted unnecessary empty functions, fixed formatting.
+ Tomasz Flendrich
+* tests/libntp/numtohost.c added const, fixed formatting. Tomasz Flendrich
+* tests/libntp/refnumtoa.c fixed formatting. Tomasz Flendrich
+* tests/libntp/ssl_init.c fixed formatting. Tomasz Flendrich
+* tests/libntp/tvtots.c fixed a bug, fixed formatting. Tomasz Flendrich
+* tests/libntp/uglydate.c removed an unnecessary include. Tomasz Flendrich
+* tests/libntp/vi64ops.c removed an unnecessary comment, fixed formatting.
+* tests/libntp/ymd3yd.c removed an empty function and an unnecessary include,
+fixed formatting. Tomasz Flendrich
+* tests/libntp/timespecops.c fixed formatting, fixed the order of includes,
+ removed unnecessary comments, cleanup. Tomasz Flendrich
+* tests/libntp/timevalops.c fixed the order of includes, deleted unnecessary
+ comments, cleanup. Tomasz Flendrich
+* tests/libntp/sockaddrtest.h making it agree to NTP's conventions of formatting.
+ Tomasz Flendrich
+* tests/libntp/lfptest.h cleanup. Tomasz Flendrich
+* tests/libntp/test-libntp.c fix formatting. Tomasz Flendrich
+* sntp/tests/crypto.c is now using proper Unity's assertions, fixed formatting.
+ Tomasz Flendrich
+* sntp/tests/kodDatabase.c added consts, deleted empty function,
+ fixed formatting. Tomasz Flendrich
+* sntp/tests/kodFile.c cleanup, fixed formatting. Tomasz Flendrich
+* sntp/tests/packetHandling.c is now using proper Unity's assertions,
+ fixed formatting, deleted unused variable. Tomasz Flendrich
+* sntp/tests/keyFile.c is now using proper Unity's assertions, fixed formatting.
+ Tomasz Flendrich
+* sntp/tests/packetProcessing.c changed from sprintf to snprintf,
+ fixed formatting. Tomasz Flendrich
+* sntp/tests/utilities.c is now using proper Unity's assertions, changed
+ the order of includes, fixed formatting, removed unnecessary comments.
+ Tomasz Flendrich
+* sntp/tests/sntptest.h fixed formatting. Tomasz Flendrich
+* sntp/tests/fileHandlingTest.h.in fixed a possible buffer overflow problem,
+ made one function do its job, deleted unnecessary prints, fixed formatting.
+ Tomasz Flendrich
+* sntp/unity/Makefile.am added a missing header. Tomasz Flendrich
+* sntp/unity/unity_config.h: Distribute it. Harlan Stenn.
+* sntp/libevent/evconfig-private.h: remove generated filefrom SCM. H.Stenn.
+* sntp/unity/Makefile.am: fix some broken paths. Harlan Stenn.
+* sntp/unity/unity.c: Clean up a printf(). Harlan Stenn.
+* Phase 1 deprecation of google test in tests/libntp/. Harlan Stenn.
+* Don't build sntp/libevent/sample/. Harlan Stenn.
+* tests/libntp/test_caltontp needs -lpthread. Harlan Stenn.
+* br-flock: --enable-local-libevent. Harlan Stenn.
+* Wrote tests for ntpd/ntp_prio_q.c. Tomasz Flendrich
+* scripts/lib/NTP/Util.pm: stratum output is version-dependent. Harlan Stenn.
+* Get rid of the NTP_ prefix on our assertion macros. Harlan Stenn.
+* Code cleanup. Harlan Stenn.
+* libntp/icom.c: Typo fix. Harlan Stenn.
+* util/ntptime.c: initialization nit. Harlan Stenn.
+* ntpd/ntp_peer.c:newpeer(): added a DEBUG_REQUIRE(srcadr). Harlan Stenn.
+* Add std_unity_tests to various Makefile.am files. Harlan Stenn.
+* ntpd/ntp_restrict.c: added a few assertions, created tests for this file.
+ Tomasz Flendrich
+* Changed progname to be const in many files - now it's consistent. Tomasz
+ Flendrich
+* Typo fix for GCC warning suppression. Harlan Stenn.
+* Added tests/ntpd/ntp_scanner.c test. Damir Tomić.
+* Added declarations to all Unity tests, and did minor fixes to them.
+ Reduced the number of warnings by half. Damir Tomić.
+* Updated generate_test_runner.rb and updated the sntp/unity/auto directory
+ with the latest Unity updates from Mark. Damir Tomić.
+* Retire google test - phase I. Harlan Stenn.
+* Unity test cleanup: move declaration of 'initializing'. Harlan Stenn.
+* Update the NEWS file. Harlan Stenn.
+* Autoconf cleanup. Harlan Stenn.
+* Unit test dist cleanup. Harlan Stenn.
+* Cleanup various test Makefile.am files. Harlan Stenn.
+* Pthread autoconf macro cleanup. Harlan Stenn.
+* Fix progname definition in unity runner scripts. Harlan Stenn.
+* Clean trailing whitespace in tests/ntpd/Makefile.am. Harlan Stenn.
+* Update the patch for bug 2817. Harlan Stenn.
+* More updates for bug 2817. Harlan Stenn.
+* Fix bugs in tests/ntpd/ntp_prio_q.c. Harlan Stenn.
+* gcc on older HPUX may need +allowdups. Harlan Stenn.
+* Adding missing MCAST protection. Harlan Stenn.
+* Disable certain test programs on certain platforms. Harlan Stenn.
+* Implement --enable-problem-tests (on by default). Harlan Stenn.
+* build system tweaks. Harlan Stenn.
+---
(4.2.8p3) 2015/06/29 Released by Harlan Stenn <stenn@ntp.org>
* [Sec 2853] Crafted remote config packet can crash some versions of
diff --git a/CommitLog b/CommitLog
index b1f2a30ffe14..3366f2ff17e8 100644
--- a/CommitLog
+++ b/CommitLog
@@ -1,3 +1,4916 @@
+ChangeSet@1.3577, 2015-10-21 12:42:02-04:00, stenn@deacon.udel.edu
+ NTP_4_2_8P4
+ TAG: NTP_4_2_8P4
+
+ ChangeLog@1.1757 +1 -0
+ NTP_4_2_8P4
+
+ ntpd/invoke-ntp.conf.texi@1.193 +1 -1
+ NTP_4_2_8P4
+
+ ntpd/invoke-ntp.keys.texi@1.185 +1 -1
+ NTP_4_2_8P4
+
+ ntpd/invoke-ntpd.texi@1.502 +2 -2
+ NTP_4_2_8P4
+
+ ntpd/ntp.conf.5man@1.227 +3 -3
+ NTP_4_2_8P4
+
+ ntpd/ntp.conf.5mdoc@1.227 +2 -2
+ NTP_4_2_8P4
+
+ ntpd/ntp.conf.html@1.181 +94 -107
+ NTP_4_2_8P4
+
+ ntpd/ntp.conf.man.in@1.227 +3 -3
+ NTP_4_2_8P4
+
+ ntpd/ntp.conf.mdoc.in@1.227 +2 -2
+ NTP_4_2_8P4
+
+ ntpd/ntp.keys.5man@1.219 +2 -2
+ NTP_4_2_8P4
+
+ ntpd/ntp.keys.5mdoc@1.219 +3 -3
+ NTP_4_2_8P4
+
+ ntpd/ntp.keys.html@1.181 +21 -33
+ NTP_4_2_8P4
+
+ ntpd/ntp.keys.man.in@1.219 +2 -2
+ NTP_4_2_8P4
+
+ ntpd/ntp.keys.mdoc.in@1.219 +3 -3
+ NTP_4_2_8P4
+
+ ntpd/ntpd-opts.c@1.524 +245 -245
+ NTP_4_2_8P4
+
+ ntpd/ntpd-opts.h@1.523 +3 -3
+ NTP_4_2_8P4
+
+ ntpd/ntpd.1ntpdman@1.331 +3 -3
+ NTP_4_2_8P4
+
+ ntpd/ntpd.1ntpdmdoc@1.331 +2 -2
+ NTP_4_2_8P4
+
+ ntpd/ntpd.html@1.175 +142 -186
+ NTP_4_2_8P4
+
+ ntpd/ntpd.man.in@1.331 +3 -3
+ NTP_4_2_8P4
+
+ ntpd/ntpd.mdoc.in@1.331 +2 -2
+ NTP_4_2_8P4
+
+ ntpdc/invoke-ntpdc.texi@1.499 +2 -2
+ NTP_4_2_8P4
+
+ ntpdc/ntpdc-opts.c@1.517 +107 -107
+ NTP_4_2_8P4
+
+ ntpdc/ntpdc-opts.h@1.516 +3 -3
+ NTP_4_2_8P4
+
+ ntpdc/ntpdc.1ntpdcman@1.330 +3 -3
+ NTP_4_2_8P4
+
+ ntpdc/ntpdc.1ntpdcmdoc@1.330 +2 -2
+ NTP_4_2_8P4
+
+ ntpdc/ntpdc.html@1.343 +75 -95
+ NTP_4_2_8P4
+
+ ntpdc/ntpdc.man.in@1.330 +3 -3
+ NTP_4_2_8P4
+
+ ntpdc/ntpdc.mdoc.in@1.330 +2 -2
+ NTP_4_2_8P4
+
+ ntpq/invoke-ntpq.texi@1.506 +2 -2
+ NTP_4_2_8P4
+
+ ntpq/ntpq-opts.c@1.523 +106 -106
+ NTP_4_2_8P4
+
+ ntpq/ntpq-opts.h@1.521 +3 -3
+ NTP_4_2_8P4
+
+ ntpq/ntpq.1ntpqman@1.334 +3 -3
+ NTP_4_2_8P4
+
+ ntpq/ntpq.1ntpqmdoc@1.334 +2 -2
+ NTP_4_2_8P4
+
+ ntpq/ntpq.html@1.172 +132 -155
+ NTP_4_2_8P4
+
+ ntpq/ntpq.man.in@1.334 +3 -3
+ NTP_4_2_8P4
+
+ ntpq/ntpq.mdoc.in@1.334 +2 -2
+ NTP_4_2_8P4
+
+ ntpsnmpd/invoke-ntpsnmpd.texi@1.501 +2 -2
+ NTP_4_2_8P4
+
+ ntpsnmpd/ntpsnmpd-opts.c@1.519 +68 -68
+ NTP_4_2_8P4
+
+ ntpsnmpd/ntpsnmpd-opts.h@1.518 +3 -3
+ NTP_4_2_8P4
+
+ ntpsnmpd/ntpsnmpd.1ntpsnmpdman@1.330 +3 -3
+ NTP_4_2_8P4
+
+ ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc@1.330 +2 -2
+ NTP_4_2_8P4
+
+ ntpsnmpd/ntpsnmpd.html@1.170 +10 -14
+ NTP_4_2_8P4
+
+ ntpsnmpd/ntpsnmpd.man.in@1.330 +3 -3
+ NTP_4_2_8P4
+
+ ntpsnmpd/ntpsnmpd.mdoc.in@1.330 +2 -2
+ NTP_4_2_8P4
+
+ packageinfo.sh@1.520 +3 -3
+ NTP_4_2_8P4
+
+ scripts/calc_tickadj/calc_tickadj.1calc_tickadjman@1.91 +3 -3
+ NTP_4_2_8P4
+
+ scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc@1.92 +2 -2
+ NTP_4_2_8P4
+
+ scripts/calc_tickadj/calc_tickadj.html@1.93 +30 -42
+ NTP_4_2_8P4
+
+ scripts/calc_tickadj/calc_tickadj.man.in@1.90 +3 -3
+ NTP_4_2_8P4
+
+ scripts/calc_tickadj/calc_tickadj.mdoc.in@1.92 +2 -2
+ NTP_4_2_8P4
+
+ scripts/calc_tickadj/invoke-calc_tickadj.texi@1.95 +1 -1
+ NTP_4_2_8P4
+
+ scripts/invoke-plot_summary.texi@1.112 +2 -2
+ NTP_4_2_8P4
+
+ scripts/invoke-summary.texi@1.112 +2 -2
+ NTP_4_2_8P4
+
+ scripts/ntp-wait/invoke-ntp-wait.texi@1.322 +2 -2
+ NTP_4_2_8P4
+
+ scripts/ntp-wait/ntp-wait-opts@1.58 +2 -2
+ NTP_4_2_8P4
+
+ scripts/ntp-wait/ntp-wait.1ntp-waitman@1.319 +3 -3
+ NTP_4_2_8P4
+
+ scripts/ntp-wait/ntp-wait.1ntp-waitmdoc@1.320 +2 -2
+ NTP_4_2_8P4
+
+ scripts/ntp-wait/ntp-wait.html@1.339 +41 -59
+ NTP_4_2_8P4
+
+ scripts/ntp-wait/ntp-wait.man.in@1.319 +3 -3
+ NTP_4_2_8P4
+
+ scripts/ntp-wait/ntp-wait.mdoc.in@1.320 +2 -2
+ NTP_4_2_8P4
+
+ scripts/ntpsweep/invoke-ntpsweep.texi@1.110 +2 -2
+ NTP_4_2_8P4
+
+ scripts/ntpsweep/ntpsweep-opts@1.60 +2 -2
+ NTP_4_2_8P4
+
+ scripts/ntpsweep/ntpsweep.1ntpsweepman@1.98 +3 -3
+ NTP_4_2_8P4
+
+ scripts/ntpsweep/ntpsweep.1ntpsweepmdoc@1.98 +2 -2
+ NTP_4_2_8P4
+
+ scripts/ntpsweep/ntpsweep.html@1.111 +46 -57
+ NTP_4_2_8P4
+
+ scripts/ntpsweep/ntpsweep.man.in@1.98 +3 -3
+ NTP_4_2_8P4
+
+ scripts/ntpsweep/ntpsweep.mdoc.in@1.99 +2 -2
+ NTP_4_2_8P4
+
+ scripts/ntptrace/invoke-ntptrace.texi@1.111 +2 -2
+ NTP_4_2_8P4
+
+ scripts/ntptrace/ntptrace-opts@1.60 +2 -2
+ NTP_4_2_8P4
+
+ scripts/ntptrace/ntptrace.1ntptraceman@1.98 +3 -3
+ NTP_4_2_8P4
+
+ scripts/ntptrace/ntptrace.1ntptracemdoc@1.99 +2 -2
+ NTP_4_2_8P4
+
+ scripts/ntptrace/ntptrace.html@1.112 +38 -47
+ NTP_4_2_8P4
+
+ scripts/ntptrace/ntptrace.man.in@1.98 +3 -3
+ NTP_4_2_8P4
+
+ scripts/ntptrace/ntptrace.mdoc.in@1.100 +2 -2
+ NTP_4_2_8P4
+
+ scripts/plot_summary-opts@1.60 +2 -2
+ NTP_4_2_8P4
+
+ scripts/plot_summary.1plot_summaryman@1.110 +3 -3
+ NTP_4_2_8P4
+
+ scripts/plot_summary.1plot_summarymdoc@1.110 +2 -2
+ NTP_4_2_8P4
+
+ scripts/plot_summary.html@1.113 +40 -58
+ NTP_4_2_8P4
+
+ scripts/plot_summary.man.in@1.110 +3 -3
+ NTP_4_2_8P4
+
+ scripts/plot_summary.mdoc.in@1.110 +2 -2
+ NTP_4_2_8P4
+
+ scripts/summary-opts@1.60 +2 -2
+ NTP_4_2_8P4
+
+ scripts/summary.1summaryman@1.110 +3 -3
+ NTP_4_2_8P4
+
+ scripts/summary.1summarymdoc@1.110 +2 -2
+ NTP_4_2_8P4
+
+ scripts/summary.html@1.113 +37 -49
+ NTP_4_2_8P4
+
+ scripts/summary.man.in@1.110 +3 -3
+ NTP_4_2_8P4
+
+ scripts/summary.mdoc.in@1.110 +2 -2
+ NTP_4_2_8P4
+
+ scripts/update-leap/invoke-update-leap.texi@1.11 +1 -1
+ NTP_4_2_8P4
+
+ scripts/update-leap/update-leap-opts@1.11 +2 -2
+ NTP_4_2_8P4
+
+ scripts/update-leap/update-leap.1update-leapman@1.11 +3 -3
+ NTP_4_2_8P4
+
+ scripts/update-leap/update-leap.1update-leapmdoc@1.11 +2 -2
+ NTP_4_2_8P4
+
+ scripts/update-leap/update-leap.html@1.11 +48 -72
+ NTP_4_2_8P4
+
+ scripts/update-leap/update-leap.man.in@1.11 +3 -3
+ NTP_4_2_8P4
+
+ scripts/update-leap/update-leap.mdoc.in@1.11 +2 -2
+ NTP_4_2_8P4
+
+ sntp/invoke-sntp.texi@1.499 +2 -2
+ NTP_4_2_8P4
+
+ sntp/sntp-opts.c@1.518 +159 -159
+ NTP_4_2_8P4
+
+ sntp/sntp-opts.h@1.516 +3 -3
+ NTP_4_2_8P4
+
+ sntp/sntp.1sntpman@1.334 +3 -3
+ NTP_4_2_8P4
+
+ sntp/sntp.1sntpmdoc@1.334 +2 -2
+ NTP_4_2_8P4
+
+ sntp/sntp.html@1.514 +111 -135
+ NTP_4_2_8P4
+
+ sntp/sntp.man.in@1.334 +3 -3
+ NTP_4_2_8P4
+
+ sntp/sntp.mdoc.in@1.334 +2 -2
+ NTP_4_2_8P4
+
+ util/invoke-ntp-keygen.texi@1.502 +2 -2
+ NTP_4_2_8P4
+
+ util/ntp-keygen-opts.c@1.520 +173 -173
+ NTP_4_2_8P4
+
+ util/ntp-keygen-opts.h@1.518 +3 -3
+ NTP_4_2_8P4
+
+ util/ntp-keygen.1ntp-keygenman@1.330 +3 -3
+ NTP_4_2_8P4
+
+ util/ntp-keygen.1ntp-keygenmdoc@1.330 +2 -2
+ NTP_4_2_8P4
+
+ util/ntp-keygen.html@1.176 +157 -216
+ NTP_4_2_8P4
+
+ util/ntp-keygen.man.in@1.330 +3 -3
+ NTP_4_2_8P4
+
+ util/ntp-keygen.mdoc.in@1.330 +2 -2
+ NTP_4_2_8P4
+
+ChangeSet@1.3576, 2015-10-21 11:58:26-04:00, stenn@deacon.udel.edu
+ 4.2.8p4
+
+ packageinfo.sh@1.519 +1 -1
+ 4.2.8p4
+
+ChangeSet@1.3575, 2015-10-21 15:35:31+00:00, stenn@psp-deb1.ntp.org
+ Update severity information
+
+ NEWS@1.150 +2 -2
+ Update severity information
+
+ChangeSet@1.3574, 2015-10-20 08:00:43+00:00, stenn@psp-deb1.ntp.org
+ Update CVEs
+
+ NEWS@1.149 +16 -16
+ Update CVEs
+
+ChangeSet@1.3573, 2015-10-17 06:28:49+00:00, stenn@psp-deb1.ntp.org
+ ntp-4.2.8p4-sec-RC2
+
+ NEWS@1.148 +336 -4
+ ntp-4.2.8p4-sec-RC2
+
+ ntpd/invoke-ntp.conf.texi@1.192 +1 -1
+ ntp-4.2.8p4-sec-RC2
+
+ ntpd/invoke-ntp.keys.texi@1.184 +1 -1
+ ntp-4.2.8p4-sec-RC2
+
+ ntpd/invoke-ntpd.texi@1.501 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ ntpd/ntp.conf.5man@1.226 +3 -3
+ ntp-4.2.8p4-sec-RC2
+
+ ntpd/ntp.conf.5mdoc@1.226 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ ntpd/ntp.conf.html@1.180 +107 -94
+ ntp-4.2.8p4-sec-RC2
+
+ ntpd/ntp.conf.man.in@1.226 +3 -3
+ ntp-4.2.8p4-sec-RC2
+
+ ntpd/ntp.conf.mdoc.in@1.226 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ ntpd/ntp.keys.5man@1.218 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ ntpd/ntp.keys.5mdoc@1.218 +3 -3
+ ntp-4.2.8p4-sec-RC2
+
+ ntpd/ntp.keys.html@1.180 +33 -21
+ ntp-4.2.8p4-sec-RC2
+
+ ntpd/ntp.keys.man.in@1.218 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ ntpd/ntp.keys.mdoc.in@1.218 +3 -3
+ ntp-4.2.8p4-sec-RC2
+
+ ntpd/ntpd-opts.c@1.523 +245 -245
+ ntp-4.2.8p4-sec-RC2
+
+ ntpd/ntpd-opts.h@1.522 +3 -3
+ ntp-4.2.8p4-sec-RC2
+
+ ntpd/ntpd.1ntpdman@1.330 +3 -3
+ ntp-4.2.8p4-sec-RC2
+
+ ntpd/ntpd.1ntpdmdoc@1.330 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ ntpd/ntpd.html@1.174 +186 -142
+ ntp-4.2.8p4-sec-RC2
+
+ ntpd/ntpd.man.in@1.330 +3 -3
+ ntp-4.2.8p4-sec-RC2
+
+ ntpd/ntpd.mdoc.in@1.330 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ ntpdc/invoke-ntpdc.texi@1.498 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ ntpdc/ntpdc-opts.c@1.516 +107 -107
+ ntp-4.2.8p4-sec-RC2
+
+ ntpdc/ntpdc-opts.h@1.515 +3 -3
+ ntp-4.2.8p4-sec-RC2
+
+ ntpdc/ntpdc.1ntpdcman@1.329 +3 -3
+ ntp-4.2.8p4-sec-RC2
+
+ ntpdc/ntpdc.1ntpdcmdoc@1.329 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ ntpdc/ntpdc.html@1.342 +95 -75
+ ntp-4.2.8p4-sec-RC2
+
+ ntpdc/ntpdc.man.in@1.329 +3 -3
+ ntp-4.2.8p4-sec-RC2
+
+ ntpdc/ntpdc.mdoc.in@1.329 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ ntpq/invoke-ntpq.texi@1.505 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ ntpq/ntpq-opts.c@1.522 +106 -106
+ ntp-4.2.8p4-sec-RC2
+
+ ntpq/ntpq-opts.h@1.520 +3 -3
+ ntp-4.2.8p4-sec-RC2
+
+ ntpq/ntpq.1ntpqman@1.333 +3 -3
+ ntp-4.2.8p4-sec-RC2
+
+ ntpq/ntpq.1ntpqmdoc@1.333 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ ntpq/ntpq.html@1.171 +155 -132
+ ntp-4.2.8p4-sec-RC2
+
+ ntpq/ntpq.man.in@1.333 +3 -3
+ ntp-4.2.8p4-sec-RC2
+
+ ntpq/ntpq.mdoc.in@1.333 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ ntpsnmpd/invoke-ntpsnmpd.texi@1.500 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ ntpsnmpd/ntpsnmpd-opts.c@1.518 +68 -68
+ ntp-4.2.8p4-sec-RC2
+
+ ntpsnmpd/ntpsnmpd-opts.h@1.517 +3 -3
+ ntp-4.2.8p4-sec-RC2
+
+ ntpsnmpd/ntpsnmpd.1ntpsnmpdman@1.329 +3 -3
+ ntp-4.2.8p4-sec-RC2
+
+ ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc@1.329 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ ntpsnmpd/ntpsnmpd.html@1.169 +14 -10
+ ntp-4.2.8p4-sec-RC2
+
+ ntpsnmpd/ntpsnmpd.man.in@1.329 +3 -3
+ ntp-4.2.8p4-sec-RC2
+
+ ntpsnmpd/ntpsnmpd.mdoc.in@1.329 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ packageinfo.sh@1.518 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/calc_tickadj/calc_tickadj.1calc_tickadjman@1.90 +3 -3
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc@1.91 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/calc_tickadj/calc_tickadj.html@1.92 +42 -30
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/calc_tickadj/calc_tickadj.man.in@1.89 +3 -3
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/calc_tickadj/calc_tickadj.mdoc.in@1.91 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/calc_tickadj/invoke-calc_tickadj.texi@1.94 +1 -1
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/invoke-plot_summary.texi@1.111 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/invoke-summary.texi@1.111 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/ntp-wait/invoke-ntp-wait.texi@1.321 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/ntp-wait/ntp-wait-opts@1.57 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/ntp-wait/ntp-wait.1ntp-waitman@1.318 +3 -3
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/ntp-wait/ntp-wait.1ntp-waitmdoc@1.319 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/ntp-wait/ntp-wait.html@1.338 +59 -41
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/ntp-wait/ntp-wait.man.in@1.318 +3 -3
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/ntp-wait/ntp-wait.mdoc.in@1.319 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/ntpsweep/invoke-ntpsweep.texi@1.109 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/ntpsweep/ntpsweep-opts@1.59 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/ntpsweep/ntpsweep.1ntpsweepman@1.97 +3 -3
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/ntpsweep/ntpsweep.1ntpsweepmdoc@1.97 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/ntpsweep/ntpsweep.html@1.110 +57 -46
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/ntpsweep/ntpsweep.man.in@1.97 +3 -3
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/ntpsweep/ntpsweep.mdoc.in@1.98 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/ntptrace/invoke-ntptrace.texi@1.110 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/ntptrace/ntptrace-opts@1.59 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/ntptrace/ntptrace.1ntptraceman@1.97 +3 -3
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/ntptrace/ntptrace.1ntptracemdoc@1.98 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/ntptrace/ntptrace.html@1.111 +47 -38
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/ntptrace/ntptrace.man.in@1.97 +3 -3
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/ntptrace/ntptrace.mdoc.in@1.99 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/plot_summary-opts@1.59 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/plot_summary.1plot_summaryman@1.109 +3 -3
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/plot_summary.1plot_summarymdoc@1.109 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/plot_summary.html@1.112 +58 -40
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/plot_summary.man.in@1.109 +3 -3
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/plot_summary.mdoc.in@1.109 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/summary-opts@1.59 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/summary.1summaryman@1.109 +3 -3
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/summary.1summarymdoc@1.109 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/summary.html@1.112 +49 -37
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/summary.man.in@1.109 +3 -3
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/summary.mdoc.in@1.109 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/update-leap/invoke-update-leap.texi@1.10 +1 -1
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/update-leap/update-leap-opts@1.10 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/update-leap/update-leap.1update-leapman@1.10 +3 -3
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/update-leap/update-leap.1update-leapmdoc@1.10 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/update-leap/update-leap.html@1.10 +72 -48
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/update-leap/update-leap.man.in@1.10 +3 -3
+ ntp-4.2.8p4-sec-RC2
+
+ scripts/update-leap/update-leap.mdoc.in@1.10 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ sntp/invoke-sntp.texi@1.498 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ sntp/sntp-opts.c@1.517 +159 -159
+ ntp-4.2.8p4-sec-RC2
+
+ sntp/sntp-opts.h@1.515 +3 -3
+ ntp-4.2.8p4-sec-RC2
+
+ sntp/sntp.1sntpman@1.333 +3 -3
+ ntp-4.2.8p4-sec-RC2
+
+ sntp/sntp.1sntpmdoc@1.333 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ sntp/sntp.html@1.513 +135 -111
+ ntp-4.2.8p4-sec-RC2
+
+ sntp/sntp.man.in@1.333 +3 -3
+ ntp-4.2.8p4-sec-RC2
+
+ sntp/sntp.mdoc.in@1.333 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ util/invoke-ntp-keygen.texi@1.501 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ util/ntp-keygen-opts.c@1.519 +173 -173
+ ntp-4.2.8p4-sec-RC2
+
+ util/ntp-keygen-opts.h@1.517 +3 -3
+ ntp-4.2.8p4-sec-RC2
+
+ util/ntp-keygen.1ntp-keygenman@1.329 +3 -3
+ ntp-4.2.8p4-sec-RC2
+
+ util/ntp-keygen.1ntp-keygenmdoc@1.329 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ util/ntp-keygen.html@1.175 +216 -157
+ ntp-4.2.8p4-sec-RC2
+
+ util/ntp-keygen.man.in@1.329 +3 -3
+ ntp-4.2.8p4-sec-RC2
+
+ util/ntp-keygen.mdoc.in@1.329 +2 -2
+ ntp-4.2.8p4-sec-RC2
+
+ChangeSet@1.3572, 2015-10-17 03:10:01+00:00, stenn@psp-deb1.ntp.org
+ cleanup
+
+ ChangeLog@1.1756 +1 -5
+ cleanup
+
+ChangeSet@1.3571, 2015-10-17 01:39:22+00:00, stenn@psp-deb1.ntp.org
+ [Sec 2941] NAK to the Future: Symmetric association authentication bypass via crypto-NAK
+
+ ChangeLog@1.1755 +4 -1
+ [Sec 2941] NAK to the Future: Symmetric association authentication bypass via crypto-NAK
+
+ChangeSet@1.3558.3.3, 2015-10-11 08:10:20+02:00, jnperlin@hydra.localnet
+ [Bug 2941] NAK to the Future: Symmetric association authentication bypass via crypto-NAK
+
+ ChangeLog@1.1743.3.3 +3 -0
+ [Bug 2941] NAK to the Future: Symmetric association authentication bypass via crypto-NAK
+
+ ntpd/ntp_proto.c@1.364.1.1 +18 -0
+ [Bug 2941] NAK to the Future: Symmetric association authentication bypass via crypto-NAK
+
+ChangeSet@1.3558.3.2, 2015-10-06 06:25:48-04:00, stenn@deacon.udel.edu
+ NTP_4_2_8P4_RC1
+ TAG: NTP_4_2_8P4_RC1
+
+ ChangeLog@1.1743.3.2 +1 -0
+ NTP_4_2_8P4_RC1
+
+ ntpd/invoke-ntp.conf.texi@1.191 +1 -1
+ NTP_4_2_8P4_RC1
+
+ ntpd/invoke-ntp.keys.texi@1.183 +1 -1
+ NTP_4_2_8P4_RC1
+
+ ntpd/invoke-ntpd.texi@1.500 +2 -2
+ NTP_4_2_8P4_RC1
+
+ ntpd/ntp.conf.5man@1.225 +3 -3
+ NTP_4_2_8P4_RC1
+
+ ntpd/ntp.conf.5mdoc@1.225 +2 -2
+ NTP_4_2_8P4_RC1
+
+ ntpd/ntp.conf.html@1.179 +1196 -1524
+ NTP_4_2_8P4_RC1
+
+ ntpd/ntp.conf.man.in@1.225 +3 -3
+ NTP_4_2_8P4_RC1
+
+ ntpd/ntp.conf.mdoc.in@1.225 +2 -2
+ NTP_4_2_8P4_RC1
+
+ ntpd/ntp.keys.5man@1.217 +2 -2
+ NTP_4_2_8P4_RC1
+
+ ntpd/ntp.keys.5mdoc@1.217 +2 -2
+ NTP_4_2_8P4_RC1
+
+ ntpd/ntp.keys.html@1.179 +1 -1
+ NTP_4_2_8P4_RC1
+
+ ntpd/ntp.keys.man.in@1.217 +2 -2
+ NTP_4_2_8P4_RC1
+
+ ntpd/ntp.keys.mdoc.in@1.217 +2 -2
+ NTP_4_2_8P4_RC1
+
+ ntpd/ntpd-opts.c@1.522 +245 -245
+ NTP_4_2_8P4_RC1
+
+ ntpd/ntpd-opts.h@1.521 +3 -3
+ NTP_4_2_8P4_RC1
+
+ ntpd/ntpd.1ntpdman@1.329 +8 -4
+ NTP_4_2_8P4_RC1
+
+ ntpd/ntpd.1ntpdmdoc@1.329 +7 -3
+ NTP_4_2_8P4_RC1
+
+ ntpd/ntpd.html@1.173 +2 -2
+ NTP_4_2_8P4_RC1
+
+ ntpd/ntpd.man.in@1.329 +8 -4
+ NTP_4_2_8P4_RC1
+
+ ntpd/ntpd.mdoc.in@1.329 +7 -3
+ NTP_4_2_8P4_RC1
+
+ ntpdc/invoke-ntpdc.texi@1.497 +2 -2
+ NTP_4_2_8P4_RC1
+
+ ntpdc/ntpdc-opts.c@1.515 +107 -107
+ NTP_4_2_8P4_RC1
+
+ ntpdc/ntpdc-opts.h@1.514 +3 -3
+ NTP_4_2_8P4_RC1
+
+ ntpdc/ntpdc.1ntpdcman@1.328 +3 -3
+ NTP_4_2_8P4_RC1
+
+ ntpdc/ntpdc.1ntpdcmdoc@1.328 +2 -2
+ NTP_4_2_8P4_RC1
+
+ ntpdc/ntpdc.html@1.341 +2 -2
+ NTP_4_2_8P4_RC1
+
+ ntpdc/ntpdc.man.in@1.328 +3 -3
+ NTP_4_2_8P4_RC1
+
+ ntpdc/ntpdc.mdoc.in@1.328 +2 -2
+ NTP_4_2_8P4_RC1
+
+ ntpq/invoke-ntpq.texi@1.504 +2 -2
+ NTP_4_2_8P4_RC1
+
+ ntpq/ntpq-opts.c@1.521 +106 -106
+ NTP_4_2_8P4_RC1
+
+ ntpq/ntpq-opts.h@1.519 +3 -3
+ NTP_4_2_8P4_RC1
+
+ ntpq/ntpq.1ntpqman@1.332 +3 -3
+ NTP_4_2_8P4_RC1
+
+ ntpq/ntpq.1ntpqmdoc@1.332 +2 -2
+ NTP_4_2_8P4_RC1
+
+ ntpq/ntpq.html@1.170 +2 -2
+ NTP_4_2_8P4_RC1
+
+ ntpq/ntpq.man.in@1.332 +3 -3
+ NTP_4_2_8P4_RC1
+
+ ntpq/ntpq.mdoc.in@1.332 +2 -2
+ NTP_4_2_8P4_RC1
+
+ ntpsnmpd/invoke-ntpsnmpd.texi@1.499 +2 -2
+ NTP_4_2_8P4_RC1
+
+ ntpsnmpd/ntpsnmpd-opts.c@1.517 +68 -68
+ NTP_4_2_8P4_RC1
+
+ ntpsnmpd/ntpsnmpd-opts.h@1.516 +3 -3
+ NTP_4_2_8P4_RC1
+
+ ntpsnmpd/ntpsnmpd.1ntpsnmpdman@1.328 +3 -3
+ NTP_4_2_8P4_RC1
+
+ ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc@1.328 +2 -2
+ NTP_4_2_8P4_RC1
+
+ ntpsnmpd/ntpsnmpd.html@1.168 +1 -1
+ NTP_4_2_8P4_RC1
+
+ ntpsnmpd/ntpsnmpd.man.in@1.328 +3 -3
+ NTP_4_2_8P4_RC1
+
+ ntpsnmpd/ntpsnmpd.mdoc.in@1.328 +2 -2
+ NTP_4_2_8P4_RC1
+
+ packageinfo.sh@1.517 +2 -2
+ NTP_4_2_8P4_RC1
+
+ scripts/calc_tickadj/calc_tickadj.1calc_tickadjman@1.89 +3 -3
+ NTP_4_2_8P4_RC1
+
+ scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc@1.90 +2 -2
+ NTP_4_2_8P4_RC1
+
+ scripts/calc_tickadj/calc_tickadj.html@1.91 +1 -1
+ NTP_4_2_8P4_RC1
+
+ scripts/calc_tickadj/calc_tickadj.man.in@1.88 +3 -3
+ NTP_4_2_8P4_RC1
+
+ scripts/calc_tickadj/calc_tickadj.mdoc.in@1.90 +2 -2
+ NTP_4_2_8P4_RC1
+
+ scripts/calc_tickadj/invoke-calc_tickadj.texi@1.93 +1 -1
+ NTP_4_2_8P4_RC1
+
+ scripts/invoke-plot_summary.texi@1.110 +2 -2
+ NTP_4_2_8P4_RC1
+
+ scripts/invoke-summary.texi@1.110 +2 -2
+ NTP_4_2_8P4_RC1
+
+ scripts/ntp-wait/invoke-ntp-wait.texi@1.320 +2 -2
+ NTP_4_2_8P4_RC1
+
+ scripts/ntp-wait/ntp-wait-opts@1.56 +2 -2
+ NTP_4_2_8P4_RC1
+
+ scripts/ntp-wait/ntp-wait.1ntp-waitman@1.317 +3 -3
+ NTP_4_2_8P4_RC1
+
+ scripts/ntp-wait/ntp-wait.1ntp-waitmdoc@1.318 +2 -2
+ NTP_4_2_8P4_RC1
+
+ scripts/ntp-wait/ntp-wait.html@1.337 +2 -2
+ NTP_4_2_8P4_RC1
+
+ scripts/ntp-wait/ntp-wait.man.in@1.317 +3 -3
+ NTP_4_2_8P4_RC1
+
+ scripts/ntp-wait/ntp-wait.mdoc.in@1.318 +2 -2
+ NTP_4_2_8P4_RC1
+
+ scripts/ntpsweep/invoke-ntpsweep.texi@1.108 +2 -2
+ NTP_4_2_8P4_RC1
+
+ scripts/ntpsweep/ntpsweep-opts@1.58 +2 -2
+ NTP_4_2_8P4_RC1
+
+ scripts/ntpsweep/ntpsweep.1ntpsweepman@1.96 +3 -3
+ NTP_4_2_8P4_RC1
+
+ scripts/ntpsweep/ntpsweep.1ntpsweepmdoc@1.96 +2 -2
+ NTP_4_2_8P4_RC1
+
+ scripts/ntpsweep/ntpsweep.html@1.109 +2 -2
+ NTP_4_2_8P4_RC1
+
+ scripts/ntpsweep/ntpsweep.man.in@1.96 +3 -3
+ NTP_4_2_8P4_RC1
+
+ scripts/ntpsweep/ntpsweep.mdoc.in@1.97 +2 -2
+ NTP_4_2_8P4_RC1
+
+ scripts/ntptrace/invoke-ntptrace.texi@1.109 +2 -2
+ NTP_4_2_8P4_RC1
+
+ scripts/ntptrace/ntptrace-opts@1.58 +2 -2
+ NTP_4_2_8P4_RC1
+
+ scripts/ntptrace/ntptrace.1ntptraceman@1.96 +3 -3
+ NTP_4_2_8P4_RC1
+
+ scripts/ntptrace/ntptrace.1ntptracemdoc@1.97 +2 -2
+ NTP_4_2_8P4_RC1
+
+ scripts/ntptrace/ntptrace.html@1.110 +2 -2
+ NTP_4_2_8P4_RC1
+
+ scripts/ntptrace/ntptrace.man.in@1.96 +3 -3
+ NTP_4_2_8P4_RC1
+
+ scripts/ntptrace/ntptrace.mdoc.in@1.98 +2 -2
+ NTP_4_2_8P4_RC1
+
+ scripts/plot_summary-opts@1.58 +2 -2
+ NTP_4_2_8P4_RC1
+
+ scripts/plot_summary.1plot_summaryman@1.108 +3 -3
+ NTP_4_2_8P4_RC1
+
+ scripts/plot_summary.1plot_summarymdoc@1.108 +2 -2
+ NTP_4_2_8P4_RC1
+
+ scripts/plot_summary.html@1.111 +2 -2
+ NTP_4_2_8P4_RC1
+
+ scripts/plot_summary.man.in@1.108 +3 -3
+ NTP_4_2_8P4_RC1
+
+ scripts/plot_summary.mdoc.in@1.108 +2 -2
+ NTP_4_2_8P4_RC1
+
+ scripts/summary-opts@1.58 +2 -2
+ NTP_4_2_8P4_RC1
+
+ scripts/summary.1summaryman@1.108 +3 -3
+ NTP_4_2_8P4_RC1
+
+ scripts/summary.1summarymdoc@1.108 +2 -2
+ NTP_4_2_8P4_RC1
+
+ scripts/summary.html@1.111 +2 -2
+ NTP_4_2_8P4_RC1
+
+ scripts/summary.man.in@1.108 +3 -3
+ NTP_4_2_8P4_RC1
+
+ scripts/summary.mdoc.in@1.108 +2 -2
+ NTP_4_2_8P4_RC1
+
+ scripts/update-leap/invoke-update-leap.texi@1.9 +1 -1
+ NTP_4_2_8P4_RC1
+
+ scripts/update-leap/update-leap-opts@1.9 +2 -2
+ NTP_4_2_8P4_RC1
+
+ scripts/update-leap/update-leap.1update-leapman@1.9 +3 -3
+ NTP_4_2_8P4_RC1
+
+ scripts/update-leap/update-leap.1update-leapmdoc@1.9 +2 -2
+ NTP_4_2_8P4_RC1
+
+ scripts/update-leap/update-leap.html@1.9 +1 -1
+ NTP_4_2_8P4_RC1
+
+ scripts/update-leap/update-leap.man.in@1.9 +3 -3
+ NTP_4_2_8P4_RC1
+
+ scripts/update-leap/update-leap.mdoc.in@1.9 +2 -2
+ NTP_4_2_8P4_RC1
+
+ sntp/invoke-sntp.texi@1.497 +2 -2
+ NTP_4_2_8P4_RC1
+
+ sntp/sntp-opts.c@1.516 +159 -159
+ NTP_4_2_8P4_RC1
+
+ sntp/sntp-opts.h@1.514 +3 -3
+ NTP_4_2_8P4_RC1
+
+ sntp/sntp.1sntpman@1.332 +3 -3
+ NTP_4_2_8P4_RC1
+
+ sntp/sntp.1sntpmdoc@1.332 +2 -2
+ NTP_4_2_8P4_RC1
+
+ sntp/sntp.html@1.512 +2 -2
+ NTP_4_2_8P4_RC1
+
+ sntp/sntp.man.in@1.332 +3 -3
+ NTP_4_2_8P4_RC1
+
+ sntp/sntp.mdoc.in@1.332 +2 -2
+ NTP_4_2_8P4_RC1
+
+ util/invoke-ntp-keygen.texi@1.500 +2 -2
+ NTP_4_2_8P4_RC1
+
+ util/ntp-keygen-opts.c@1.518 +173 -173
+ NTP_4_2_8P4_RC1
+
+ util/ntp-keygen-opts.h@1.516 +3 -3
+ NTP_4_2_8P4_RC1
+
+ util/ntp-keygen.1ntp-keygenman@1.328 +3 -3
+ NTP_4_2_8P4_RC1
+
+ util/ntp-keygen.1ntp-keygenmdoc@1.328 +2 -2
+ NTP_4_2_8P4_RC1
+
+ util/ntp-keygen.html@1.174 +2 -2
+ NTP_4_2_8P4_RC1
+
+ util/ntp-keygen.man.in@1.328 +3 -3
+ NTP_4_2_8P4_RC1
+
+ util/ntp-keygen.mdoc.in@1.328 +2 -2
+ NTP_4_2_8P4_RC1
+
+ChangeSet@1.3558.3.1, 2015-10-06 05:40:23-04:00, stenn@deacon.udel.edu
+ Prepare for 4.2.8p4-RC1
+
+ ChangeLog@1.1743.3.1 +1 -0
+ Prepare for 4.2.8p4-RC1
+
+ NEWS@1.147 +143 -4
+ Prepare for 4.2.8p4-RC1
+
+ packageinfo.sh@1.516 +1 -1
+ Prepare for 4.2.8p4-RC1
+
+ChangeSet@1.3568, 2015-10-06 08:51:27+00:00, stenn@psp-deb1.ntp.org
+ [Sec 2922] decodenetnum() will ASSERT botch instead of returning FAIL on some bogus values. Harlan Stenn.
+
+ ChangeLog@1.1752 +2 -0
+ [Sec 2922] decodenetnum() will ASSERT botch instead of returning FAIL on some [Sec 2922] decodenetnum() will ASSERT botch instead of returning FAIL on some bogus values. Harlan Stenn.
+
+ libntp/decodenetnum.c@1.18 +4 -1
+ [Sec 2922] decodenetnum() will ASSERT botch instead of returning FAIL on some [Sec 2922] decodenetnum() will ASSERT botch instead of returning FAIL on some bogus values. Harlan Stenn.
+
+ChangeSet@1.3567, 2015-10-06 08:02:23+00:00, stenn@psp-deb1.ntp.org
+ Log incoming packets that fail TEST2. Harlan Stenn.
+
+ ChangeLog@1.1751 +1 -1
+ Log incoming packets that fail TEST2. Harlan Stenn.
+
+ ntpd/ntp_proto.c@1.367 +7 -1
+ Log incoming packets that fail TEST2. Harlan Stenn.
+
+ChangeSet@1.3566, 2015-10-06 07:47:24+00:00, stenn@psp-deb1.ntp.org
+ cleanup
+
+ ChangeLog@1.1750 +2 -1
+ cleanup
+
+ ntpd/ntp_proto.c@1.366 +113 -95
+ cleanup
+
+ChangeSet@1.3564, 2015-10-06 03:56:29+00:00, stenn@psp-deb1.ntp.org
+ [Sec 2921] TALOS-CAN-0065: password length memory corruption. JPerlinger.
+
+ ChangeLog@1.1748 +1 -0
+ [Sec 2921] TALOS-CAN-0065: password length memory corruption. JPerlinger.
+ Fixed as part of [Sec 2916] TALOS-CAN-0054: memory corruption in password store. JPerlinger.
+
+ChangeSet@1.3562, 2015-10-05 21:11:21+00:00, stenn@psp-deb1.ntp.org
+ typo
+
+ libntp/authreadkeys.c@1.22 +1 -1
+ typo
+
+ChangeSet@1.3552.9.2, 2015-10-05 11:11:54+00:00, stenn@psp-deb1.ntp.org
+ 2909 is a security bug
+
+ ChangeLog@1.1739.5.2 +1 -1
+ 2909 is a security bug
+
+ChangeSet@1.3558.2.2, 2015-10-05 11:03:39+00:00, stenn@psp-deb1.ntp.org
+ 2902 is a security bug
+
+ ChangeLog@1.1743.2.2 +2 -2
+ 2902 is a security bug
+
+ChangeSet@1.3558.1.4, 2015-10-05 10:49:30+00:00, stenn@psp-deb1.ntp.org
+ Update the ChangeLog for 2899
+
+ ChangeLog@1.1743.1.4 +1 -1
+ Update the ChangeLog for 2899
+
+ChangeSet@1.3552.4.2, 2015-10-05 10:32:02+00:00, stenn@psp-deb1.ntp.org
+ typos
+
+ ntpd/ntp_crypto.c@1.183 +4 -4
+ typos
+
+ChangeSet@1.3558.1.2, 2015-10-05 06:26:46+00:00, stenn@psp-deb1.ntp.org
+ [Bug 2912] no munlockall() under Windows. David Taylor, Harlan Stenn.
+
+ ChangeLog@1.1743.1.2 +1 -0
+ [Bug 2912] no munlockall() under Windows. David Taylor, Harlan Stenn.
+
+ ntpd/ntp_config.c@1.335 +4 -0
+ [Bug 2912] no munlockall() under Windows. David Taylor, Harlan Stenn.
+
+ChangeSet@1.3561, 2015-10-03 09:08:20+02:00, jnperlin@hydra.localnet
+ [TALOS-CAN-0055] Infinite loop if extended logging enabled and the logfile and keyfile are the same
+
+ ChangeLog@1.1746 +2 -0
+ [TALOS-CAN-0055] Infinite loop if extended logging enabled and the logfile and keyfile are the same
+
+ include/ntp_stdlib.h@1.79 +1 -0
+ [TALOS-CAN-0055] Infinite loop if extended logging enabled and the logfile and keyfile are the same
+ - add 'mvsyslog()' function to make wrapping calls to syslog easier
+
+ include/ntp_syslog.h@1.9 +1 -0
+ [TALOS-CAN-0055] Infinite loop if extended logging enabled and the logfile and keyfile are the same
+ - add 'mvsyslog()' function to make wrapping calls to syslog easier
+
+ libntp/authreadkeys.c@1.21 +71 -18
+ [TALOS-CAN-0055] Infinite loop if extended logging enabled and the logfile and keyfile are the same
+ - Avoid endless loop by logging only the first 5 errors explicitely, counting the next 10 silently, and aborting
+ the parsing of the file with proper diagnostic when more than 15 errors where encountered.
+
+ libntp/msyslog.c@1.53 +12 -0
+ [TALOS-CAN-0055] Infinite loop if extended logging enabled and the logfile and keyfile are the same
+ - add 'mvsyslog()' function to make wrapping calls to syslog easier
+
+ChangeSet@1.3558.1.1, 2015-10-01 03:27:35-04:00, stenn@deacon.udel.edu
+ build system tweaks. Harlan Stenn.
+
+ ChangeLog@1.1743.1.1 +2 -1
+ build system tweaks. Harlan Stenn.
+
+ Makefile.am@1.134 +1 -1
+ build system tweaks. Harlan Stenn.
+
+ sntp/m4/ntp_problemtests.m4@1.3 +14 -14
+ build system tweaks. Harlan Stenn.
+
+ChangeSet@1.3560, 2015-09-30 22:47:45+02:00, jnperlin@hydra.localnet
+ [TALOS-CAN-0062] prevent directory traversal for VMS, too, when using 'saveconfig' command.
+
+ ChangeLog@1.1745 +2 -0
+ [TALOS-CAN-0062] prevent directory traversal for VMS, too, when using 'saveconfig' command.
+
+ ntpd/ntp_control.c@1.204 +25 -9
+ [TALOS-CAN-0062] prevent directory traversal for VMS, too, when using 'saveconfig' command.
+
+ChangeSet@1.3559, 2015-09-30 21:55:09+02:00, jnperlin@hydra.localnet
+ [TALOS-CAN-0064] signed/unsiged clash could lead to buffer overun
+
+ BitKeeper/etc/ignore@1.89 +4 -0
+ keep cscope files away from repo
+
+ ChangeLog@1.1744 +2 -0
+ [TALOS-CAN-0064] signed/unsiged clash could lead to buffer overun
+
+ ntpd/ntp_io.c@1.408 +9 -6
+ [TALOS-CAN-0064] signed/unsiged clash could lead to buffer overun
+
+ChangeSet@1.3552.11.4, 2015-09-30 20:15:13+02:00, jnperlin@hydra.localnet
+ [TALOS-CAN-0063] avoid buffer overrun in ntpq
+
+ ChangeLog@1.1739.7.3 +1 -0
+ [TALOS-CAN-0063] avoid buffer overrun in ntpq
+
+ ntpq/ntpq.c@1.162 +6 -1
+ [TALOS-CAN-0063] avoid buffer overrun in ntpq
+
+ChangeSet@1.3552.11.3, 2015-09-30 18:44:18+02:00, jnperlin@hydra.localnet
+ [TALOS-CAN-0054] memory corruption
+ - make sure there's *always* a new buffer for storing the key again
+
+ libntp/authkeys.c@1.27 +9 -5
+ [TALOS-CAN-0054] memory corruption
+ - make sure there's *always* a new buffer for storing the key again
+
+ChangeSet@1.3552.1.32, 2015-09-30 07:40:52+00:00, stenn@psp-deb1.ntp.org
+ formatting cleanup
+
+ ChangeLog@1.1739.1.18 +1 -1
+ formatting cleanup
+
+ChangeSet@1.3552.12.2, 2015-09-30 06:45:59+00:00, stenn@psp-deb1.ntp.org
+ Implement --disable-problem-tests (off by default). Harlan Stenn.
+
+ ChangeLog@1.1739.8.1 +1 -0
+ Implement --disable-problem-tests (off by default). Harlan Stenn.
+
+ sntp/m4/ntp_problemtests.m4@1.2 +20 -6
+ Implement --disable-problem-tests (off by default). Harlan Stenn.
+
+ChangeSet@1.3552.12.1, 2015-09-30 06:11:05+00:00, stenn@psp-deb1.ntp.org
+ whitespace cleanup
+
+ ntpd/ntp_io.c@1.407 +13 -13
+ whitespace cleanup
+
+ChangeSet@1.3552.11.2, 2015-09-29 23:13:13+02:00, jnperlin@hydra.localnet
+ [TALOS-CAN-0054] memory corruption in password store
+
+ ChangeLog@1.1739.7.2 +1 -0
+ [TALOS-CAN-0054] memory corruption in password store
+
+ libntp/authkeys.c@1.26 +4 -0
+ [TALOS-CAN-0054] memory corruption in password store
+ - make sure deallocated pointers are NULLed and new storage is allocated on demand
+
+ChangeSet@1.3552.11.1, 2015-09-29 22:00:10+02:00, jnperlin@hydra.localnet
+ [TALOS-CAN-0052] crash by loop counter underrun.
+
+ ChangeLog@1.1739.7.1 +1 -0
+ [TALOS-CAN-0052] crash by loop counter underrun.
+
+ ntpd/ntp_request.c@1.114 +7 -3
+ [TALOS-CAN-0052] crash by loop counter underrun.
+ - add missing reload of loop counter
+
+ChangeSet@1.3552.10.2, 2015-09-29 20:34:05+02:00, jnperlin@hydra.localnet
+ [Bug 2902] configuration directives "pidfile" and "driftfile" should be local-only.
+
+ ChangeLog@1.1739.6.2 +2 -0
+ [Bug 2902] configuration directives "pidfile" and "driftfile" should be local-only.
+
+ ntpd/ntp_parser.c@1.99 +235 -226
+ [Bug 2902] configuration directives "pidfile" and "driftfile" should be local-only.
+ - update bison-generated files
+
+ ntpd/ntp_parser.h@1.64 +3 -5
+ [Bug 2902] configuration directives "pidfile" and "driftfile" should be local-only.
+ - update bison-generated files
+
+ ntpd/ntp_parser.y@1.89 +26 -15
+ [Bug 2902] configuration directives "pidfile" and "driftfile" should be local-only.
+ - applied patch from Miroslav Lichvar, plus minor cosmetic changes
+
+ChangeSet@1.3552.10.1, 2015-09-29 06:10:38-04:00, stenn@pogo.udel.edu
+ Disable certain test programs on certain platforms. Harlan Stenn.
+
+ ChangeLog@1.1739.6.1 +1 -0
+ Disable certain test programs on certain platforms. Harlan Stenn.
+
+ configure.ac@1.602 +2 -0
+ Disable certain test programs on certain platforms. Harlan Stenn.
+
+ sntp/m4/ntp_problemtests.m4@1.1 +42 -0
+ BitKeeper file /pogo/users/stenn/ntp-stable/sntp/m4/ntp_problemtests.m4
+
+ sntp/m4/ntp_problemtests.m4@1.0 +0 -0
+
+ tests/ntpd/Makefile.am@1.28 +14 -3
+ Disable certain test programs on certain platforms. Harlan Stenn.
+
+ChangeSet@1.3552.9.1, 2015-09-28 18:22:06+02:00, jnperlin@hydra.localnet
+ [Bug 2909] - Slow memory leak in CRYPTO_ASSOC
+ - added missing call to 'free()' in ntp_crypto.c.
+
+ ChangeLog@1.1739.5.1 +1 -0
+ [Bug 2909] - Slow memory leak in CRYPTO_ASSOC
+ - added missing call to 'free()' in ntp_crypto.c.
+
+ ntpd/ntp_crypto.c@1.181.1.1 +1 -0
+ [Bug 2909] - Slow memory leak in CRYPTO_ASSOC
+ - added missing call to 'free()' in ntp_crypto.c.
+
+ChangeSet@1.3556, 2015-09-27 12:52:27+02:00, jnperlin@hydra.localnet
+ [Bug2888] Fixed compiler warnings, converted C++ comments to C comments
+
+ tests/libntp/buftvtots.c@1.5 +7 -7
+ [Bug2888] Fixed compiler warnings, converted C++ comments to C comments
+
+ tests/libntp/calendar.c@1.9 +45 -35
+ [Bug2888] Fixed compiler warnings, converted C++ comments to C comments
+
+ tests/libntp/clocktime.c@1.8 +16 -16
+ [Bug2888] Fixed compiler warnings, converted C++ comments to C comments
+
+ tests/libntp/hextolfp.c@1.9 +9 -9
+ [Bug2888] Fixed compiler warnings, converted C++ comments to C comments
+
+ tests/libntp/lfptostr.c@1.7 +14 -14
+ [Bug2888] Fixed compiler warnings, converted C++ comments to C comments
+
+ tests/libntp/prettydate.c@1.4 +1 -1
+ [Bug2888] Fixed compiler warnings, converted C++ comments to C comments
+
+ tests/libntp/strtolfp.c@1.6 +3 -3
+ [Bug2888] Fixed compiler warnings, converted C++ comments to C comments
+
+ tests/libntp/tstotv.c@1.4 +3 -3
+ [Bug2888] Fixed compiler warnings, converted C++ comments to C comments
+
+ tests/libntp/tvtots.c@1.6 +10 -10
+ [Bug2888] Fixed compiler warnings, converted C++ comments to C comments
+
+ tests/libntp/uglydate.c@1.8 +1 -1
+ [Bug2888] Fixed compiler warnings, converted C++ comments to C comments
+
+ChangeSet@1.3552.8.1, 2015-09-27 02:30:13+00:00, mayer@psp-deb1.ntp.org
+ Drop invalid packet before checking KoD. Check for all KoD's
+
+ ChangeLog@1.1739.4.1 +1 -0
+ Drop invalid packet before checking KoD. Check for all KoD's
+
+ ntpd/ntp_proto.c@1.365 +66 -9
+ Drop invalid packet before checking KoD. Check for all KoD's
+
+ChangeSet@1.3552.1.29, 2015-09-26 13:17:13+00:00, perlinger@psp-deb1.ntp.org
+ [bug2332] Create & cancel a dummy thread to warm-up the pthread runtime
+ instead of linking against libgcc_s on Linux targets
+
+ ChangeLog@1.1739.1.15 +3 -0
+ [Bug2332](reopened) fixed
+
+ ntpd/ntpd.c@1.165 +74 -0
+ [bug2332] Create & cancel a dummy thread to warm-up the pthread runtime
+
+ sntp/m4/ntp_libntp.m4@1.32 +0 -14
+ [bug2332] Remove the forced link against 'libgcc_s' since it breaks other targets
+
+ChangeSet@1.3552.7.6, 2015-09-25 06:51:35+00:00, stenn@psp-deb1.ntp.org
+ gcc on older HPUX may need +allowdups. Harlan Stenn.
+
+ sntp/m4/os_cflags.m4@1.12 +1 -1
+ gcc on older HPUX may need +allowdups. Harlan Stenn.
+
+ChangeSet@1.3552.7.5, 2015-09-25 04:21:37+00:00, stenn@psp-deb1.ntp.org
+ Adding missing MCAST protection. Harlan Stenn.
+
+ ChangeLog@1.1739.1.14 +1 -0
+ Adding missing MCAST protection. Harlan Stenn.
+
+ ntpd/ntp_io.c@1.406 +2 -0
+ Adding missing MCAST protection. Harlan Stenn.
+
+ChangeSet@1.3552.7.4, 2015-09-25 04:13:23+00:00, stenn@psp-deb1.ntp.org
+ gcc on older HPUX may need +allowdups. Harlan Stenn.
+
+ ChangeLog@1.1739.1.13 +1 -0
+ gcc on older HPUX may need +allowdups. Harlan Stenn.
+
+ sntp/m4/os_cflags.m4@1.11 +32 -2
+ gcc on older HPUX may need +allowdups. Harlan Stenn.
+
+ChangeSet@1.3552.7.3, 2015-09-24 11:27:07+00:00, stenn@psp-deb1.ntp.org
+ More updates for bug 2817. Harlan Stenn.
+
+ ntpd/ntpd.c@1.164 +1 -1
+ More updates for bug 2817. Harlan Stenn.
+
+ChangeSet@1.3552.7.2, 2015-09-24 10:27:51+00:00, stenn@psp-deb1.ntp.org
+ More updates for bug 2817. Harlan Stenn.
+
+ ntpd/ntpd.c@1.163 +6 -3
+ More updates for bug 2817. Harlan Stenn.
+
+ChangeSet@1.3552.7.1, 2015-09-24 05:44:53+00:00, stenn@psp-deb1.ntp.org
+ Fix bugs in tests/ntpd/ntp_prio_q.c. Harlan Stenn.
+
+ ChangeLog@1.1739.1.12 +1 -0
+ Fix bugs in tests/ntpd/ntp_prio_q.c. Harlan Stenn.
+
+ tests/ntpd/ntp_prio_q.c@1.2 +8 -7
+ Fix bugs in tests/ntpd/ntp_prio_q.c. Harlan Stenn.
+
+ChangeSet@1.3552.1.23, 2015-09-23 07:49:24-04:00, stenn@deacon.udel.edu
+ More updates for bug 2817. Harlan Stenn.
+
+ sntp/m4/ntp_rlimit.m4@1.5 +5 -5
+ More updates for bug 2817. Harlan Stenn.
+
+ChangeSet@1.3552.1.22, 2015-09-23 10:29:51+00:00, stenn@psp-deb1.ntp.org
+ More updates for bug 2817. Harlan Stenn.
+
+ ChangeLog@1.1739.1.11 +1 -0
+ More updates for bug 2817. Harlan Stenn.
+
+ html/miscopt.html@1.83 +2 -2
+ More updates for bug 2817. Harlan Stenn.
+
+ include/ntp_config.h@1.83 +2 -2
+ More updates for bug 2817. Harlan Stenn.
+
+ ntpd/invoke-ntp.conf.texi@1.190 +8 -5
+ More updates for bug 2817. Harlan Stenn.
+
+ ntpd/ntp.conf.5man@1.224 +9 -6
+ More updates for bug 2817. Harlan Stenn.
+
+ ntpd/ntp.conf.5mdoc@1.224 +9 -6
+ More updates for bug 2817. Harlan Stenn.
+
+ ntpd/ntp.conf.def@1.20 +6 -3
+ More updates for bug 2817. Harlan Stenn.
+
+ ntpd/ntp.conf.man.in@1.224 +9 -6
+ More updates for bug 2817. Harlan Stenn.
+
+ ntpd/ntp.conf.mdoc.in@1.224 +9 -6
+ More updates for bug 2817. Harlan Stenn.
+
+ ntpd/ntp_config.c@1.334 +26 -4
+ More updates for bug 2817. Harlan Stenn.
+
+ ntpd/ntpd.c@1.162 +1 -1
+ More updates for bug 2817. Harlan Stenn.
+
+ sntp/m4/ntp_rlimit.m4@1.4 +2 -2
+ More updates for bug 2817. Harlan Stenn.
+
+ChangeSet@1.3552.1.21, 2015-09-21 10:53:44+00:00, stenn@psp-deb1.ntp.org
+ Update the patch for bug 2817. Harlan Stenn.
+
+ ChangeLog@1.1739.1.10 +1 -0
+ Update the patch for bug 2817. Harlan Stenn.
+
+ configure.ac@1.601 +0 -54
+ Update the patch for bug 2817. Harlan Stenn.
+
+ sntp/m4/ntp_rlimit.m4@1.3 +57 -2
+ Update the patch for bug 2817. Harlan Stenn.
+
+ChangeSet@1.3552.1.20, 2015-09-21 10:30:35+00:00, stenn@psp-deb1.ntp.org
+ Clean trailing whitespace in tests/ntpd/Makefile.am. Harlan Stenn.
+
+ ChangeLog@1.1739.1.9 +1 -0
+ Clean trailing whitespace in tests/ntpd/Makefile.am. Harlan Stenn.
+
+ tests/ntpd/Makefile.am@1.27 +5 -5
+ Clean trailing whitespace in tests/ntpd/Makefile.am. Harlan Stenn.
+
+ChangeSet@1.3552.1.19, 2015-09-21 08:09:33+00:00, stenn@psp-deb1.ntp.org
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ ChangeLog@1.1739.1.8 +1 -0
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ sntp/tests/run-packetProcessing.c@1.9 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ sntp/tests/run-t-log.c@1.3 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ sntp/unity/auto/generate_test_runner.rb@1.10 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/libntp/run-a_md5encrypt.c@1.14 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/libntp/run-atoint.c@1.8 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/libntp/run-atouint.c@1.9 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/libntp/run-authkeys.c@1.11 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/libntp/run-buftvtots.c@1.6 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/libntp/run-calendar.c@1.8.1.1 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/libntp/run-caljulian.c@1.13 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/libntp/run-caltontp.c@1.5 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/libntp/run-calyearstart.c@1.7 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/libntp/run-clocktime.c@1.10 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/libntp/run-decodenetnum.c@1.9 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/libntp/run-hextoint.c@1.9 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/libntp/run-hextolfp.c@1.8 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/libntp/run-humandate.c@1.6 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/libntp/run-lfpfunc.c@1.17 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/libntp/run-lfptostr.c@1.7 +12 -12
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/libntp/run-modetoa.c@1.11 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/libntp/run-msyslog.c@1.8 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/libntp/run-netof.c@1.7 +2 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/libntp/run-numtoa.c@1.10 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/libntp/run-numtohost.c@1.10 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/libntp/run-octtoint.c@1.7 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/libntp/run-prettydate.c@1.5 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/libntp/run-recvbuff.c@1.5 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/libntp/run-refidsmear.c@1.6 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/libntp/run-refnumtoa.c@1.8 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/libntp/run-sfptostr.c@1.5 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/libntp/run-socktoa.c@1.12 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/libntp/run-ssl_init.c@1.9 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/libntp/run-statestr.c@1.10 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/libntp/run-strtolfp.c@1.5 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/libntp/run-timespecops.c@1.10 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/libntp/run-timevalops.c@1.12 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/libntp/run-tstotv.c@1.5 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/libntp/run-tvtots.c@1.6 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/libntp/run-uglydate.c@1.10 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/libntp/run-vi64ops.c@1.8 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/libntp/run-ymd2yd.c@1.11 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/ntpd/run-leapsec.c@1.5 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/ntpd/run-ntp_prio_q.c@1.4 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/ntpd/run-rc_cmdlength.c@1.3 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/ntpd/run-t-ntp_scanner.c@1.5 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/ntpd/run-t-ntp_signd.c@1.8 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ tests/ntpq/run-t-ntpq.c@1.3 +1 -1
+ Fix progname definition in unity runner scripts. Harlan Stenn.
+
+ChangeSet@1.3552.1.18, 2015-09-21 08:06:14+00:00, stenn@psp-deb1.ntp.org
+ Pthread autoconf macro cleanup. Harlan Stenn.
+
+ ChangeLog@1.1739.1.7 +1 -0
+ Pthread autoconf macro cleanup. Harlan Stenn.
+
+ sntp/m4/ntp_libevent.m4@1.15 +15 -19
+ Pthread autoconf macro cleanup. Harlan Stenn.
+
+ sntp/m4/ntp_libntp.m4@1.31 +5 -2
+ Pthread autoconf macro cleanup. Harlan Stenn.
+
+ sntp/m4/openldap-thread-check.m4@1.7 +6 -0
+ Pthread autoconf macro cleanup. Harlan Stenn.
+
+ChangeSet@1.3552.1.16, 2015-09-17 11:09:07+00:00, stenn@psp-deb1.ntp.org
+ Avoid spurious SCCS get
+
+ ntpd/Makefile.am@1.134 +3 -0
+ Avoid spurious SCCS get
+
+ChangeSet@1.3552.6.3, 2015-09-16 11:10:41+00:00, stenn@psp-deb1.ntp.org
+ Cleanup various test Makefile.am files. Harlan Stenn.
+
+ ChangeLog@1.1739.1.6 +1 -0
+ Cleanup various test Makefile.am files. Harlan Stenn.
+
+ sntp/tests/Makefile.am@1.64.1.3 +5 -5
+ Cleanup various test Makefile.am files. Harlan Stenn.
+
+ tests/libntp/Makefile.am@1.93 +23 -23
+ Cleanup various test Makefile.am files. Harlan Stenn.
+
+ tests/ntpd/Makefile.am@1.22.1.3 +7 -12
+ Cleanup various test Makefile.am files. Harlan Stenn.
+
+ tests/ntpq/Makefile.am@1.5.1.1 +3 -10
+ Cleanup various test Makefile.am files. Harlan Stenn.
+
+ChangeSet@1.3552.6.2, 2015-09-15 10:44:48+00:00, stenn@psp-deb1.ntp.org
+ Unit test dist cleanup. Harlan Stenn
+
+ ChangeLog@1.1739.1.5 +1 -0
+ Unit test dist cleanup. Harlan Stenn
+
+ sntp/configure.ac@1.82 +1 -0
+ Unit test dist cleanup. Harlan Stenn
+
+ sntp/tests/Makefile.am@1.64.1.2 +2 -0
+ Unit test dist cleanup. Harlan Stenn
+
+ tests/Makefile.am@1.17.1.1 +1 -0
+ Unit test dist cleanup. Harlan Stenn
+
+ tests/ntpd/Makefile.am@1.22.1.2 +0 -9
+ Unit test dist cleanup. Harlan Stenn
+
+ChangeSet@1.3552.5.6, 2015-09-15 07:45:39+00:00, stenn@psp-deb1.ntp.org
+ [Bug 2906] make check needs better support for pthreads. Harlan Stenn.
+
+ sntp/m4/ntp_libevent.m4@1.14 +23 -0
+ [Bug 2906] make check needs better support for pthreads. Harlan Stenn.
+
+ChangeSet@1.3552.5.5, 2015-09-15 07:12:08+00:00, stenn@psp-deb1.ntp.org
+ documentation notes
+
+ sntp/m4/openldap-thread-check.m4@1.6 +3 -0
+ documentation notes
+
+ChangeSet@1.3552.5.4, 2015-09-14 06:36:37+00:00, stenn@psp-deb1.ntp.org
+ [Bug 2906] "make check" needs better support for pthreads
+
+ ChangeLog@1.1739.3.4 +1 -0
+ [Bug 2906] "make check" needs better support for pthreads
+
+ sntp/m4/ntp_libevent.m4@1.13 +2 -0
+ [Bug 2906] "make check" needs better support for pthreads
+
+ sntp/tests/Makefile.am@1.62.2.1 +5 -0
+ [Bug 2906] "make check" needs better support for pthreads
+
+ tests/libntp/Makefile.am@1.90.1.1 +12 -12
+ [Bug 2906] "make check" needs better support for pthreads
+
+ tests/ntpd/Makefile.am@1.12.3.1 +4 -2
+ [Bug 2906] "make check" needs better support for pthreads
+
+ChangeSet@1.3552.5.3, 2015-09-14 05:50:02+00:00, stenn@psp-deb1.ntp.org
+ [Bug 2907] dist* build targets require our libevent/ to be enabled. HStenn.
+
+ ChangeLog@1.1739.3.3 +1 -0
+ [Bug 2907] dist* build targets require our libevent/ to be enabled. HStenn.
+
+ sntp/Makefile.am@1.86.1.1 +7 -4
+ [Bug 2907] dist* build targets require our libevent/ to be enabled. HStenn.
+
+ChangeSet@1.3552.5.2, 2015-09-13 22:11:31+00:00, stenn@psp-deb1.ntp.org
+ Autoconf cleanup
+
+ ChangeLog@1.1739.3.2 +1 -0
+ Autoconf cleanup
+
+ configure.ac@1.598.1.1 +1 -0
+ Autoconf cleanup
+
+ChangeSet@1.3552.5.1, 2015-09-13 22:10:03+00:00, stenn@psp-deb1.ntp.org
+ Update the NEWS file
+
+ ChangeLog@1.1739.3.1 +1 -0
+ Update the NEWS file
+
+ NEWS@1.146 +14 -0
+ Update the NEWS file
+
+ChangeSet@1.3552.1.15, 2015-08-20 17:13:37+02:00, viperus@ubuntu.(none)
+ t-ntp_scanner.c:
+ Rename: tests/ntpd/ntp_scanner.c -> tests/ntpd/t-ntp_scanner.c
+ new static functions tested
+ run-t-ntp_scanner.c:
+ Rename: tests/ntpd/run-ntp_scanner.c -> tests/ntpd/run-t-ntp_scanner.c
+ Makefile.am:
+ updates required for include *.c to work
+ run-t-ntp_scanner.c:
+ update
+
+ tests/ntpd/Makefile.am@1.25 +6 -5
+ updates required for include *.c to work
+
+ tests/ntpd/run-t-ntp_scanner.c@1.4 +18 -7
+ update
+
+ tests/ntpd/run-t-ntp_scanner.c@1.3 +0 -0
+ Rename: tests/ntpd/run-ntp_scanner.c -> tests/ntpd/run-t-ntp_scanner.c
+
+ tests/ntpd/t-ntp_scanner.c@1.5 +73 -2
+ new static functions tested
+
+ tests/ntpd/t-ntp_scanner.c@1.4 +0 -0
+ Rename: tests/ntpd/ntp_scanner.c -> tests/ntpd/t-ntp_scanner.c
+
+ChangeSet@1.3552.1.14, 2015-08-20 16:35:29+02:00, viperus@ubuntu.(none)
+ t-ntpq.c:
+ disabled for now, very trick to test static functions.
+ run-t-ntpq.c:
+ update
+ ntp_scanner.c:
+ added new test
+ Makefile.am:
+ added more include dirs
+
+ tests/ntpd/ntp_scanner.c@1.3 +11 -3
+ added new test
+
+ tests/ntpq/Makefile.am@1.7 +2 -3
+ added more include dirs
+
+ tests/ntpq/run-t-ntpq.c@1.2 +1 -2
+ update
+
+ tests/ntpq/t-ntpq.c@1.3 +25 -2
+ disabled for now, very trick to test static functions.
+
+ChangeSet@1.3552.1.13, 2015-08-20 10:15:12+02:00, viperus@ubuntu.(none)
+ http-server.c:
+ reverted emalloc (and similar) to malloc + added checks if malloc is NULL, because emalloc is not linked here.
+ Many files:
+ reverted emalloc (and similar) to malloc + added checks if malloc is NULL, because emalloc is not linked here.
+
+
+ sntp/libevent/sample/http-server.c@1.12 +6 -2
+ reverted emalloc (and similar) to malloc + added checks if malloc is NULL, because emalloc is not linked here.
+
+ sntp/libevent/test/bench_httpclient.c@1.8 +5 -1
+ reverted emalloc (and similar) to malloc + added checks if malloc is NULL, because emalloc is not linked here.
+
+
+ sntp/libevent/test/regress.c@1.8 +6 -2
+ reverted emalloc (and similar) to malloc + added checks if malloc is NULL, because emalloc is not linked here.
+
+
+ sntp/libevent/test/regress_dns.c@1.10 +6 -5
+ reverted emalloc (and similar) to malloc + added checks if malloc is NULL, because emalloc is not linked here.
+
+
+ sntp/libevent/test/regress_http.c@1.10 +8 -4
+ reverted emalloc (and similar) to malloc + added checks if malloc is NULL, because emalloc is not linked here.
+
+
+ sntp/libevent/test/regress_minheap.c@1.5 +2 -1
+ reverted emalloc (and similar) to malloc + added checks if malloc is NULL, because emalloc is not linked here.
+
+
+ sntp/libevent/test/test-ratelim.c@1.11 +6 -2
+ reverted emalloc (and similar) to malloc + added checks if malloc is NULL, because emalloc is not linked here.
+
+
+ sntp/libevent/test/test-time.c@1.7 +2 -1
+ reverted emalloc (and similar) to malloc + added checks if malloc is NULL, because emalloc is not linked here.
+
+
+ChangeSet@1.3552.1.12, 2015-08-20 01:10:57+02:00, viperus@ubuntu.(none)
+ Makefile.am:
+ added 2 more temp files to CLEANFILES and DISTCLEAN, because it prevented make distcheck from finishing properly
+ pathfind.c:
+ reverted emalloc to malloc with if(result == NULL)... because sntp/ doesn't link libntp...probably for a reason unknown to me.
+
+ sntp/libopts/compat/pathfind.c@1.13 +17 -6
+ reverted emalloc to malloc with if(result == NULL)... because sntp/ doesn't link libntp...probably for a reason unknown to me.
+
+ sntp/tests/Makefile.am@1.65 +4 -0
+ added 2 more temp files to CLEANFILES and DISTCLEAN, because it prevented make distcheck from finishing properly
+
+ChangeSet@1.3552.1.11, 2015-08-20 01:04:40+02:00, viperus@ubuntu.(none)
+ run-packetProcessing.c:
+ manually updated due to char / const char progname issues when autogenerating
+ Makefile.am:
+ re-enabled ntpq dir
+
+ sntp/tests/run-packetProcessing.c@1.8 +1 -1
+ manually updated due to char / const char progname issues when autogenerating
+
+ tests/Makefile.am@1.18 +1 -0
+ re-enabled ntpq dir
+
+ChangeSet@1.3552.1.10, 2015-08-20 00:23:42+02:00, viperus@ubuntu.(none)
+ machines.c:
+ Fixing bug 2898, replacing malloc with emalloc, calloc with emalloc_zero, strdup with estrup etc.
+ Many files:
+ Fixing bug 2898, replacing malloc with emalloc, calloc with emalloc_zero, strdup with estrup etc.
+
+
+ libntp/machines.c@1.26 +3 -3
+ Fixing bug 2898, replacing malloc with emalloc, calloc with emalloc_zero, strdup with estrup etc.
+
+ ntpd/refclock_palisade.c@1.43 +2 -2
+ Fixing bug 2898, replacing malloc with emalloc, calloc with emalloc_zero, strdup with estrup etc.
+
+
+ ntpq/ntpq.c@1.161 +7 -7
+ Fixing bug 2898, replacing malloc with emalloc, calloc with emalloc_zero, strdup with estrup etc.
+
+
+ sntp/libevent/sample/http-server.c@1.11 +2 -2
+ Fixing bug 2898, replacing malloc with emalloc, calloc with emalloc_zero, strdup with estrup etc.
+
+
+ sntp/libevent/test/bench_httpclient.c@1.7 +1 -1
+ Fixing bug 2898, replacing malloc with emalloc, calloc with emalloc_zero, strdup with estrup etc.
+
+
+ sntp/libevent/test/regress.c@1.7 +2 -2
+ Fixing bug 2898, replacing malloc with emalloc, calloc with emalloc_zero, strdup with estrup etc.
+
+
+ sntp/libevent/test/regress_dns.c@1.9 +4 -4
+ Fixing bug 2898, replacing malloc with emalloc, calloc with emalloc_zero, strdup with estrup etc.
+
+
+ sntp/libevent/test/regress_http.c@1.9 +3 -3
+ Fixing bug 2898, replacing malloc with emalloc, calloc with emalloc_zero, strdup with estrup etc.
+
+
+ sntp/libevent/test/regress_minheap.c@1.4 +1 -1
+ Fixing bug 2898, replacing malloc with emalloc, calloc with emalloc_zero, strdup with estrup etc.
+
+
+ sntp/libevent/test/test-ratelim.c@1.10 +2 -2
+ Fixing bug 2898, replacing malloc with emalloc, calloc with emalloc_zero, strdup with estrup etc.
+
+
+ sntp/libevent/test/test-time.c@1.6 +1 -1
+ Fixing bug 2898, replacing malloc with emalloc, calloc with emalloc_zero, strdup with estrup etc.
+
+
+ sntp/libopts/compat/pathfind.c@1.12 +5 -5
+ Fixing bug 2898, replacing malloc with emalloc, calloc with emalloc_zero, strdup with estrup etc.
+
+
+ sntp/tests/fileHandlingTest.c@1.3 +1 -1
+ Fixing bug 2898, replacing malloc with emalloc, calloc with emalloc_zero, strdup with estrup etc.
+
+
+ sntp/tests/packetProcessing.c@1.8 +1 -1
+ Fixing bug 2898, replacing malloc with emalloc, calloc with emalloc_zero, strdup with estrup etc.
+
+
+ tests/libntp/a_md5encrypt.c@1.12 +1 -1
+ Fixing bug 2898, replacing malloc with emalloc, calloc with emalloc_zero, strdup with estrup etc.
+
+
+ tests/libntp/calendar.c@1.6.1.1 +4 -4
+ Fixing bug 2898, replacing malloc with emalloc, calloc with emalloc_zero, strdup with estrup etc.
+
+
+ tests/libntp/caljulian.c@1.10 +1 -1
+ Fixing bug 2898, replacing malloc with emalloc, calloc with emalloc_zero, strdup with estrup etc.
+
+
+ChangeSet@1.3552.1.9, 2015-08-17 13:56:23+02:00, viperus@ubuntu.(none)
+ Makefile.am:
+ fixed minor typo which caused me a lot of headache
+ t-ntp_signd.c:
+ added a new test
+ run-t-ntp_signd.c:
+ autogen update
+ Makefile.am:
+ removed unnecessary CFLAG
+ t-ntp_signd.c:
+ minor update
+
+ tests/ntpd/Makefile.am@1.24 +2 -1
+ fixed minor typo which caused me a lot of headache
+
+ tests/ntpd/Makefile.am@1.23 +0 -3
+ removed unnecessary CFLAG
+
+ tests/ntpd/run-t-ntp_signd.c@1.7 +10 -5
+ autogen update
+
+ tests/ntpd/t-ntp_signd.c@1.10 +23 -14
+ added a new test
+
+ tests/ntpd/t-ntp_signd.c@1.9 +10 -3
+ minor update
+
+ChangeSet@1.3552.1.8, 2015-08-17 12:21:45+02:00, viperus@ubuntu.(none)
+ run-t-ntp_signd.c:
+ added more tests manually
+
+ tests/ntpd/run-t-ntp_signd.c@1.6 +2 -1
+ added more tests manually
+
+ tests/ntpd/t-ntp_signd.c@1.8 +0 -1
+
+ChangeSet@1.3552.1.7, 2015-08-17 12:15:56+02:00, viperus@ubuntu.(none)
+ t-ntp_signd.c:
+ adding more tests , added mocked functinos section
+
+ tests/ntpd/t-ntp_signd.c@1.7 +34 -0
+ adding more tests , added mocked functinos section
+
+ChangeSet@1.3552.1.6, 2015-08-17 11:28:21+02:00, viperus@ubuntu.(none)
+ t-ntp_signd.c:
+ new tests added
+ run-t-ntp_signd.c:
+ I had some issues with bk and this file
+ t-ntp_signd.c:
+ basic mocking concept added. connect() is mocked, and always returns 1
+
+ tests/ntpd/run-t-ntp_signd.c@1.5 +4 -2
+ I had some issues with bk and this file
+
+ tests/ntpd/t-ntp_signd.c@1.6 +13 -9
+ basic mocking concept added. connect() is mocked, and always returns 1
+
+ tests/ntpd/t-ntp_signd.c@1.5 +22 -2
+ new tests added
+
+ChangeSet@1.3552.4.1, 2015-08-17 07:54:01+02:00, jnperlin@hydra.(none)
+ CVE-2014-9297
+
+ ChangeLog@1.1739.2.1 +1 -0
+ CVE-2014-9297
+
+ ntpd/ntp_crypto.c@1.182 +78 -27
+ CVE-2014-9297: buffer overrun checks
+
+ChangeSet@1.3552.3.1, 2015-08-14 12:05:44+02:00, viperus@ubuntu.(none)
+ Makefile.am:
+ removed unnecessary CFLAGS
+
+ tests/ntpq/Makefile.am@1.6 +0 -5
+ removed unnecessary CFLAGS
+
+ChangeSet@1.3552.1.4, 2015-08-14 08:24:21+00:00, stenn@psp-at1.ntp.org
+ Unity test cleanup: move declaration of 'initializing'. Harlan Stenn.
+
+ ChangeLog@1.1739.1.3 +1 -0
+ Unity test cleanup: move declaration of 'initializing'. Harlan Stenn.
+
+ ntpd/ntp_timer.c@1.92 +6 -0
+ Unity test cleanup: move declaration of 'initializing'. Harlan Stenn.
+
+ ntpd/ntpd.c@1.161 +0 -6
+ Unity test cleanup: move declaration of 'initializing'. Harlan Stenn.
+
+ChangeSet@1.3552.1.3, 2015-08-10 13:15:13+02:00, viperus@ubuntu.(none)
+ run-ntp_util.c:
+ new file, I guess?
+ Makefile.am:
+ changes to harlan's makefile after merge
+ run-ntp_prio_q.c:
+ hopefully, fixes stuff. Why is this here? Did harlan pull something from tfendrich?
+
+ tests/ntpd/Makefile.am@1.22 +13 -13
+ changes to harlan's makefile after merge
+
+ tests/ntpd/run-ntp_prio_q.c@1.3 +1 -1
+ hopefully, fixes stuff. Why is this here? Did harlan pull something from tfendrich?
+
+ tests/ntpd/run-ntp_util.c@1.1 +60 -0
+ new file, I guess?
+
+ tests/ntpd/run-ntp_util.c@1.0 +0 -0
+
+ChangeSet@1.3552.2.1, 2015-08-10 09:50:16+00:00, stenn@psp-at1.ntp.org
+ Retire google test - phase I. Harlan Stenn.
+
+ BitKeeper/deleted/07/g_packetHandling.cpp~2e07085e82bde6c@1.2 +0 -0
+ Delete: sntp/tests/g_packetHandling.cpp
+
+ BitKeeper/deleted/09/tvtots.cpp~c58754a7b62dde1c@1.9 +0 -0
+ Delete: tests/libntp/g_tvtots.cpp
+
+ BitKeeper/deleted/0a/sntptest.h~c408c7764b75cd4f@1.7 +0 -0
+ Delete: sntp/tests/g_sntptest.h
+
+ BitKeeper/deleted/0a/utilities.cpp~2657edd0f94e49eb@1.12 +0 -0
+ Delete: sntp/tests/g_utilities.cpp
+
+ BitKeeper/deleted/0c/buftvtots.cpp~eababa3e59583108@1.6 +0 -0
+ Delete: tests/libntp/g_buftvtots.cpp
+
+ BitKeeper/deleted/0f/uglydate.cpp~a0fdfbbfdc636411@1.5 +0 -0
+ Delete: tests/libntp/g_uglydate.cpp
+
+ BitKeeper/deleted/10/sfptostr.cpp~cef5595e4f89eac8@1.4 +0 -0
+ Delete: tests/libntp/g_sfptostr.cpp
+
+ BitKeeper/deleted/13/g_lfptostr.cpp~386d730e91bb76de@1.3 +0 -0
+ Delete: tests/libntp/g_lfptostr.cpp
+
+ BitKeeper/deleted/14/humandate.cpp~c3b455ca717b631a@1.5 +0 -0
+ Delete: tests/libntp/g_humandate.cpp
+
+ BitKeeper/deleted/15/g_nameresolution.cpp~23956912aa26e0b9@1.2 +0 -0
+ Delete: sntp/tests/g_nameresolution.cpp
+
+ BitKeeper/deleted/17/a_md5encrypt.cpp~1013ff09a55a7336@1.8 +0 -0
+ Delete: tests/libntp/g_a_md5encrypt.cpp
+
+ BitKeeper/deleted/1c/crypto.cpp~77bbd0102246a5@1.7 +0 -0
+ Delete: sntp/tests/g_crypto.cpp
+
+ BitKeeper/deleted/24/atoint.cpp~533534d530ae4081@1.5 +0 -0
+ Delete: tests/libntp/g_atoint.cpp
+
+ BitKeeper/deleted/29/networking.cpp~a6f1b3f0b76192c9@1.11 +0 -0
+ Delete: sntp/tests/g_networking.cpp
+
+ BitKeeper/deleted/29/refnumtoa.cpp~ed3c5e075503bdf4@1.5 +0 -0
+ Delete: tests/libntp/g_refnumtoa.cpp
+
+ BitKeeper/deleted/2d/libntptest.h~1990ef7fb70295d6@1.6 +0 -0
+ Delete: tests/libntp/g_libntptest.h
+
+ BitKeeper/deleted/30/g_recvbuff.cpp~7b0d3114520a0616@1.3 +0 -0
+ Delete: tests/libntp/g_recvbuff.cpp
+
+ BitKeeper/deleted/30/main.cpp~62ec7f38f7d49413@1.10 +0 -0
+ Delete: sntp/tests_main.cpp
+
+ BitKeeper/deleted/37/statestr.cpp~65497a98bac68a52@1.5 +0 -0
+ Delete: tests/libntp/g_statestr.cpp
+
+ BitKeeper/deleted/3b/tvalops.cpp~fa0bb1554d1d08d4@1.11 +0 -0
+ Delete: tests/libntp/g_timevalops.cpp
+
+ BitKeeper/deleted/3c/g_octtoint.cpp~8124d76dd2b395e5@1.3 +0 -0
+ Delete: tests/libntp/g_octtoint.cpp
+
+ BitKeeper/deleted/3f/calendar.cpp~72447c9b8c0deced@1.4 +0 -0
+ Delete: tests/libntp/g_calendar.cpp
+
+ BitKeeper/deleted/4e/g_hextolfp.cpp~ba8561698c15b354@1.3 +0 -0
+ Delete: tests/libntp/g_hextolfp.cpp
+
+ BitKeeper/deleted/57/ntpdtest.h~25bdfa3eeda7b121@1.3 +0 -0
+ Delete: tests/ntpd/g_ntpdtest.h
+
+ BitKeeper/deleted/5b/sockaddrtest.h~4bf7e82961607bf0@1.6 +0 -0
+ Delete: tests/libntp/g_sockaddrtest.h
+
+ BitKeeper/deleted/5f/authkeys.cpp~24496a9d93173937@1.10 +0 -0
+ Delete: tests/libntp/g_authkeys.cpp
+
+ BitKeeper/deleted/62/g_strtolfp.cpp~5a50a9b282094e7f@1.3 +0 -0
+ Delete: tests/libntp/g_strtolfp.cpp
+
+ BitKeeper/deleted/77/lfpfunc.cpp~9ed51f8dc31368eb@1.5 +0 -0
+ Delete: tests/libntp/g_lfpfunc.cpp
+
+ BitKeeper/deleted/82/clocktime.cpp~7dd85c09c049ffd4@1.7 +0 -0
+ Delete: tests/libntp/g_clocktime.cpp
+
+ BitKeeper/deleted/8b/atouint.cpp~43abc72d64a1857a@1.4 +0 -0
+ Delete: tests/libntp/g_atouint.cpp
+
+ BitKeeper/deleted/8b/leapsec.cpp~11be64d438063292@1.17 +0 -0
+ Delete: tests/ntpd/g_leapsec.cpp
+
+ BitKeeper/deleted/93/g_vi64ops.cpp~e023cb72bff45261@1.3 +0 -0
+ Delete: tests/libntp/g_vi64ops.cpp
+
+ BitKeeper/deleted/96/numtoa.cpp~b3b85b1ebc36fc2b@1.5 +0 -0
+ Delete: tests/libntp/g_numtoa.cpp
+
+ BitKeeper/deleted/98/g_tstotv.cpp~37896736f73c48b0@1.3 +0 -0
+ Delete: tests/libntp/g_tstotv.cpp
+
+ BitKeeper/deleted/9a/packetProcessing.cpp~4822a1d49ca16be5@1.8 +0 -0
+ Delete: sntp/tests/g_packetProcessing.cpp
+
+ BitKeeper/deleted/9c/kodDatabase.cpp~f9244577ca9f0aa9@1.6 +0 -0
+ Delete: sntp/tests/g_kodDatabase.cpp
+
+ BitKeeper/deleted/a4/g_msyslog.cpp~ec51c9e8395b3e4b@1.3 +0 -0
+ Delete: tests/libntp/g_msyslog.cpp
+
+ BitKeeper/deleted/ae/lfptest.h~a452179b90fdedaa@1.8 +0 -0
+ Delete: tests/libntp/g_lfptest.h
+
+ BitKeeper/deleted/af/calyearstart.cpp~586f44f58a75b25e@1.6 +0 -0
+ Delete: tests/libntp/g_calyearstart.cpp
+
+ BitKeeper/deleted/b2/ntpdtest.cpp~d4e605db974f754d@1.4 +0 -0
+ Delete: tests/ntpd/g_ntpdtest.cpp
+
+ BitKeeper/deleted/b3/timestructs.cpp~2bc53cc52f6599d5@1.7 +0 -0
+ Delete: tests/libntp/g_timestructs.cpp
+
+ BitKeeper/deleted/c1/ssl_init.cpp~81ce47bbb0e4fbbc@1.6 +0 -0
+ Delete: tests/libntp/g_ssl_init.cpp
+
+ BitKeeper/deleted/c3/modetoa.cpp~50f2955120b0ed6f@1.4 +0 -0
+ Delete: tests/libntp/g_modetoa.cpp
+
+ BitKeeper/deleted/c6/kodFile.cpp~c593859a65c8e9e3@1.11 +0 -0
+ Delete: sntp/tests/g_kodFile.cpp
+
+ BitKeeper/deleted/c9/main.h~44cc5c4040b89c30@1.9 +0 -0
+ Delete: sntp/tests_main.h
+
+ BitKeeper/deleted/ce/timestructs.h~a7213e57006326f@1.6 +0 -0
+ Delete: tests/libntp/g_timestructs.h
+
+ BitKeeper/deleted/cf/libntptest.cpp~fb911e064fe18517@1.6 +0 -0
+ Delete: tests/libntp/g_libntptest.cpp
+
+ BitKeeper/deleted/d0/g_caltontp.cpp~ea2471ca2734873a@1.3 +0 -0
+ Delete: tests/libntp/g_caltontp.cpp
+
+ BitKeeper/deleted/d8/hextoint.cpp~78aeb35b2f896bed@1.6 +0 -0
+ Delete: tests/libntp/g_hextoint.cpp
+
+ BitKeeper/deleted/dd/keyFile.cpp~7ca67d971ffc97ae@1.9 +0 -0
+ Delete: sntp/tests/g_keyFile.cpp
+
+ BitKeeper/deleted/e0/g_socktoa.cpp~9f28a4451c7f0c1a@1.3 +0 -0
+ Delete: tests/libntp/g_socktoa.cpp
+
+ BitKeeper/deleted/eb/g_prettydate.cpp~7800800c1dbf9688@1.3 +0 -0
+ Delete: tests/libntp/g_prettydate.cpp
+
+ BitKeeper/deleted/ee/caljulian.cpp~4c368703107f888@1.8 +0 -0
+ Delete: tests/libntp/g_caljulian.cpp
+
+ BitKeeper/deleted/ef/fileHandlingTest.h~212fb01783c1dfd7@1.7 +0 -0
+ Delete: sntp/tests/g_fileHandlingTest.h
+
+ BitKeeper/deleted/f6/g_decodenetnum.cpp~5b151a58bf8417a2@1.3 +0 -0
+ Delete: tests/libntp/g_decodenetnum.cpp
+
+ BitKeeper/deleted/f8/g_netof.cpp~a772fe4f2f1b84e8@1.3 +0 -0
+ Delete: tests/libntp/g_netof.cpp
+
+ BitKeeper/deleted/fa/tspecops.cpp~fabae81f65cd8134@1.11 +0 -0
+ Delete: tests/libntp/g_timespecops.cpp
+
+ BitKeeper/deleted/fd/ymd2yd.cpp~eeb76d1d2a534b6@1.4 +0 -0
+ Delete: tests/libntp/g_ymd2yd.cpp
+
+ BitKeeper/deleted/ff/numtohost.cpp~c346ee31ae5ffefe@1.4 +0 -0
+ Delete: tests/libntp/g_numtohost.cpp
+
+ ChangeLog@1.1739.1.2 +1 -1
+ Retire google test - phase I. Harlan Stenn.
+
+ ChangeLog@1.1739.1.1 +1 -0
+ Retire google test - phase I
+
+ sntp/Makefile.am@1.87 +0 -1
+ Retire google test - phase I. Harlan Stenn.
+
+ sntp/tests/Makefile.am@1.62.1.1 +15 -28
+ Retire google test - phase I. Harlan Stenn.
+
+ tests/Makefile.am@1.12.1.1 +0 -13
+ Retire google test - phase I. Harlan Stenn.
+
+ tests/libntp/Makefile.am@1.91 +0 -63
+ Retire google test - phase I. Harlan Stenn.
+
+ tests/ntpd/Makefile.am@1.12.2.1 +32 -50
+ Retire google test - phase I. Harlan Stenn.
+
+ tests/sandbox/Makefile.am@1.7 +14 -5
+ Retire google test - phase I. Harlan Stenn.
+
+ChangeSet@1.3548.1.16, 2015-08-07 08:07:50+02:00, viperus@ubuntu.(none)
+ Makefile.am:
+ re-added ntpq, works now
+ run-t-ntpq.c:
+ added
+ Makefile.am:
+ minor cleanup
+ configure.ac:
+ added ntpq dir
+
+ configure.ac@1.599 +1 -0
+ added ntpq dir
+
+ tests/Makefile.am@1.16 +2 -0
+ re-added ntpq, works now
+
+ tests/ntpq/Makefile.am@1.5 +0 -1
+ minor cleanup
+
+ tests/ntpq/run-t-ntpq.c@1.1 +55 -0
+ added
+
+ tests/ntpq/run-t-ntpq.c@1.0 +0 -0
+
+ChangeSet@1.3548.1.15, 2015-08-06 21:42:18+02:00, viperus@ubuntu.(none)
+ Makefile.am:
+ removed ntpq becuase it doesnt work?!
+
+ tests/Makefile.am@1.15 +0 -2
+ removed ntpq becuase it doesnt work?!
+
+ChangeSet@1.3548.1.14, 2015-08-06 21:03:10+02:00, viperus@ubuntu.(none)
+ Makefile.am:
+ adding new Makefile
+ minor change
+ Makefile.am, t-ntpq.c:
+ update
+
+ tests/Makefile.am@1.14 +1 -0
+ update
+
+ tests/ntpq/Makefile.am@1.4 +3 -1
+ minor change
+
+ tests/ntpq/Makefile.am@1.3 +6 -15
+ adding new Makefile
+
+ tests/ntpq/t-ntpq.c@1.2 +1 -1
+ update
+
+ChangeSet@1.3548.1.13, 2015-08-06 20:41:02+02:00, viperus@ubuntu.(none)
+ socktoa.c:
+ fixed. Tests are skipped when you do ./build --disable-ipv6
+
+ t-ntpq.c:
+ new test file
+ decodenetnum.c:
+ fixed. Tests are skipped when you do ./build --disable-ipv6
+ Makefile.am:
+ changes
+ run-t-log.c:
+ updated
+
+ sntp/tests/run-t-log.c@1.2 +4 -3
+ updated
+
+ tests/libntp/decodenetnum.c@1.9 +3 -3
+ fixed. Tests are skipped when you do ./build --disable-ipv6
+
+ tests/libntp/socktoa.c@1.9 +2 -2
+ fixed. Tests are skipped when you do ./build --disable-ipv6
+
+
+ tests/ntpq/Makefile.am@1.2 +8 -37
+ changes
+
+ tests/ntpq/t-ntpq.c@1.1 +14 -0
+ new test file
+
+ tests/ntpq/t-ntpq.c@1.0 +0 -0
+
+ChangeSet@1.3548.1.12, 2015-08-06 20:24:05+02:00, viperus@ubuntu.(none)
+ log.c:
+ modified to allow calling of multiple atexit(cleanup_log) without causing a segfault.
+ t-log.c:
+ minor cleanup, fixes, stuff works (in combination with updated log.c)
+
+ sntp/log.c@1.24 +15 -6
+ modified to allow calling of multiple atexit(cleanup_log) without causing a segfault.
+
+ sntp/tests/t-log.c@1.2 +13 -11
+ minor cleanup, fixes, stuff works (in combination with updated log.c)
+
+ChangeSet@1.3548.1.11, 2015-08-06 10:27:35+02:00, viperus@ubuntu.(none)
+ Makefile.am:
+ small fix
+ socktoa.c, run-decodenetnum.c:
+ update
+ decodenetnum.c:
+ Minor changes due to the autogenerated ruby script
+ run-socktoa.c:
+ Minor changes due to the autogenerated ruby script
+
+
+ tests/libntp/decodenetnum.c@1.8 +22 -6
+ Minor changes due to the autogenerated ruby script
+
+ tests/libntp/run-decodenetnum.c@1.8 +4 -5
+ update
+
+ tests/libntp/run-socktoa.c@1.11 +7 -7
+ Minor changes due to the autogenerated ruby script
+
+
+ tests/libntp/socktoa.c@1.8 +22 -6
+ update
+
+ tests/ntpd/Makefile.am@1.20 +0 -1
+ small fix
+
+ChangeSet@1.3548.1.10, 2015-08-05 16:53:22+02:00, viperus@ubuntu.(none)
+ Makefile.am:
+ new file
+ added ntpq dir
+ added a new test, test-log
+ t-log.c:
+ removed the 2nd test because only one open_logfile per program can be used (segfault otherwise)
+ run-t-log.c:
+ new file, HAS ISSUES WITH CONST CHAR *progname.
+
+ sntp/tests/Makefile.am@1.63 +11 -0
+ added a new test, test-log
+
+ sntp/tests/run-t-log.c@1.1 +56 -0
+ new file, HAS ISSUES WITH CONST CHAR *progname.
+
+ sntp/tests/run-t-log.c@1.0 +0 -0
+
+ sntp/tests/t-log.c@1.1 +66 -0
+ removed the 2nd test because only one open_logfile per program can be used (segfault otherwise)
+
+ sntp/tests/t-log.c@1.0 +0 -0
+
+ tests/Makefile.am@1.13 +2 -0
+ added ntpq dir
+
+ tests/ntpq/Makefile.am@1.1 +146 -0
+ BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/ntpq/Makefile.am
+
+ tests/ntpq/Makefile.am@1.0 +0 -0
+
+ChangeSet@1.3554, 2015-08-03 20:59:21+02:00, jnperlin@nemesis.localnet
+ [Bug 2888] streamline calendar functions
+ - MSVC compilation issue
+
+ libntp/ntp_calendar.c@1.17 +3 -1
+ [Bug 2888] streamline calendar functions
+ - 'uint' not known with MSVC; use u_int instead
+
+ChangeSet@1.3529.4.1, 2015-08-03 20:34:01+02:00, jnperlin@hydra.(none)
+ [Bug 2888] streamline calendar functions.
+
+ ChangeLog@1.1725.2.1 +1 -1
+ [Bug 2888] streamline calendar functions.
+
+ include/ntp_calendar.h@1.18 +13 -0
+ [Bug 2888] streamline calendar functions.
+
+ libntp/ntp_calendar.c@1.16 +495 -321
+ [Bug 2888] streamline calendar functions.
+ - reduce number of divisions for gregorian calendar
+ - rewrite divisions to use explicit 2's complement calculation via unsigned types
+ - avoid branches in calculations where possible
+
+ tests/libntp/calendar.c@1.7 +211 -132
+ [Bug 2888] streamline calendar functions.
+ - added tests for ISO8601 week calendar
+ - streamlined string formatting
+ - converted struct-by-value to struct-by-pointer in several cases
+ - fixed prototypes
+
+ tests/libntp/run-calendar.c@1.9 +19 -11
+ [Bug 2888] streamline calendar functions.
+ - update of test runner
+
+ChangeSet@1.3548.1.9, 2015-08-03 11:43:07+02:00, viperus@ubuntu.(none)
+ Makefile.am:
+ changed signdT -> t-ntp_signd. All tests files will from now on be named t-name.c , where name.c is the name of the tested file.
+ run-ntp_signdT.c~8aba306cc0dcbfc:
+ Delete: tests/ntpd/run-ntp_signdT.c
+ run-t-ntp_signd.c:
+ Rename: tests/ntpd/run-ntp_signd.c -> tests/ntpd/run-t-ntp_signd.c
+ t-ntp_signd.c:
+ Rename: tests/ntpd/ntp_signdT.c -> tests/ntpd/t-ntp_signd.c
+
+ BitKeeper/deleted/3a/run-ntp_signdT.c~8aba306cc0dcbfc@1.3 +0 -0
+ Delete: tests/ntpd/run-ntp_signdT.c
+
+ tests/ntpd/Makefile.am@1.19 +17 -17
+ changed signdT -> t-ntp_signd. All tests files will from now on be named t-name.c , where name.c is the name of the tested file.
+
+ tests/ntpd/run-t-ntp_signd.c@1.4 +0 -0
+ Rename: tests/ntpd/run-ntp_signd.c -> tests/ntpd/run-t-ntp_signd.c
+
+ tests/ntpd/t-ntp_signd.c@1.4 +0 -0
+ Rename: tests/ntpd/ntp_signdT.c -> tests/ntpd/t-ntp_signd.c
+
+ChangeSet@1.3548.1.8, 2015-08-03 08:48:00+00:00, viperus@psp-deb1.ntp.org
+ Makefile.am:
+ minor fixes, trying to link on psp-deb1
+
+ tests/ntpd/Makefile.am@1.18 +3 -4
+ minor fixes, trying to link on psp-deb1
+
+ChangeSet@1.3548.1.7, 2015-08-03 10:36:05+02:00, viperus@ubuntu.(none)
+ ntp_signdT.c:
+ added extern, hopefully, it will work
+
+ tests/ntpd/ntp_signdT.c@1.3 +1 -1
+ added extern, hopefully, it will work
+
+ChangeSet@1.3548.1.6, 2015-08-03 10:18:52+02:00, viperus@ubuntu.(none)
+ Makefile.am:
+ added rc_cmdlength.o
+
+ tests/ntpd/Makefile.am@1.17 +1 -0
+ added rc_cmdlength.o
+
+ChangeSet@1.3548.1.5, 2015-08-03 10:14:12+02:00, viperus@ubuntu.(none)
+ Makefile.am:
+ minor fix
+
+ tests/ntpd/Makefile.am@1.16 +1 -1
+ minor fix
+
+ChangeSet@1.3547.1.1, 2015-08-03 12:30:29+05:30, loki@dadasgift.(none)
+ ntp_util.c:
+ new file
+
+ tests/libntp/decodenetnum.c@1.7 +7 -1
+
+ tests/libntp/socktoa.c@1.7 +8 -1
+
+ tests/ntpd/Makefile.am@1.12.1.1 +23 -0
+
+ tests/ntpd/ntp_util.c@1.1 +74 -0
+ BitKeeper file /home/loki/ntp_gsoc/2_damir_code/ntp-stable-unity/tests/ntpd/ntp_util.c
+
+ tests/ntpd/ntp_util.c@1.0 +0 -0
+
+ChangeSet@1.3548.1.3, 2015-08-03 08:51:53+02:00, viperus@ubuntu.(none)
+ ntp_signd.c~736d4c4a37ef4b86:
+ Delete: tests/ntpd/ntp_signd.c
+
+ BitKeeper/deleted/7f/ntp_signd.c~736d4c4a37ef4b86@1.3 +0 -0
+ Delete: tests/ntpd/ntp_signd.c
+
+ChangeSet@1.3552, 2015-08-03 08:16:57+02:00, jnperlin@nemesis.localnet
+ [Bug 2889] ntp-dev-4.3.67 does not build on Windows
+
+ ChangeLog@1.1739 +1 -0
+ [Bug 2889] ntp-dev-4.3.67 does not build on Windows
+
+ libntp/msyslog.c@1.52 +2 -2
+ [Bug 2889] ntp-dev-4.3.67 does not build on Windows
+ - fixed a Windows-specific const clash in string processing
+
+ChangeSet@1.3548.1.2, 2015-08-01 22:40:51+02:00, viperus@ubuntu.(none)
+ ntp_signdT.c:
+ MUST ADD #define HAVE_NTP_NAME above the #include "ntp_NAME.c"
+ Makefile.am:
+
+
+ Added test ntp_singd again, renamed it to ntp_signdT (including the original ntp_signd.c doesn't work if you have 2 files with the same name).
+ I included the original ntp_signd.c, so static functions can be tested.
+ Additional .o objects had to be added for everyhting to work.
+
+
+ run-ntp_signdT.c:
+ autogenerated
+
+ tests/ntpd/Makefile.am@1.14 +7 -2
+
+
+ Added test ntp_singd again, renamed it to ntp_signdT (including the original ntp_signd.c doesn't work if you have 2 files with the same name).
+ I included the original ntp_signd.c, so static functions can be tested.
+ Additional .o objects had to be added for everyhting to work.
+
+
+
+ tests/ntpd/ntp_signdT.c@1.2 +17 -2
+ MUST ADD #define HAVE_NTP_NAME above the #include "ntp_NAME.c"
+
+ tests/ntpd/run-ntp_signdT.c@1.2 +2 -2
+ autogenerated
+
+ChangeSet@1.3548.1.1, 2015-08-01 20:49:22+02:00, viperus@ubuntu.(none)
+ Makefile.am:
+ added ntp_signdT
+ ntp_signdT.c, run-ntp_signdT.c:
+ new file
+
+ tests/ntpd/Makefile.am@1.13 +11 -9
+ added ntp_signdT
+
+ tests/ntpd/ntp_signdT.c@1.1 +28 -0
+ new file
+
+ tests/ntpd/ntp_signdT.c@1.0 +0 -0
+
+ tests/ntpd/run-ntp_signdT.c@1.1 +58 -0
+ new file
+
+ tests/ntpd/run-ntp_signdT.c@1.0 +0 -0
+
+ChangeSet@1.3549.1.1, 2015-07-31 07:58:11+00:00, stenn@psp-at1.ntp.org
+ [Bug 2890] Ignore ENOBUFS on routing netlink socket. Konstantin Khlebnikov.
+
+ ChangeLog@1.1736.1.1 +1 -0
+ [Bug 2890] Ignore ENOBUFS on routing netlink socket. Konstantin Khlebnikov.
+
+ ntpd/ntp_io.c@1.405 +9 -4
+ [Bug 2890] Ignore ENOBUFS on routing netlink socket. Konstantin Khlebnikov.
+
+ChangeSet@1.3550, 2015-07-29 22:50:29+02:00, jnperlin@hydra.(none)
+ Bug 2821: minor build issues: fixed refclock_gpsdjson.c
+
+ ChangeLog@1.1737 +1 -0
+ Bug 2821: minor build issues: fixed refclock_gpsdjson.c
+
+ ntpd/refclock_gpsdjson.c@1.23 +9 -9
+ Bug 2821: minor build issues: fixed refclock_gpsdjson.c
+ - 'isprint()' is called with u_char argument
+ - unified 'unsigned char' and 'u_char' to 'u_char'
+
+ChangeSet@1.3549, 2015-07-29 10:04:53+00:00, stenn@psp-at1.ntp.org
+ ChangeLog cleanup
+
+ ChangeLog@1.1736 +5 -3
+ ChangeLog cleanup
+
+ChangeSet@1.3548, 2015-07-29 12:01:10+02:00, viperus@ubuntu.(none)
+ ChangeLog:
+ updated ChangeLog
+
+ ChangeLog@1.1735 +3 -1
+ updated ChangeLog
+
+ChangeSet@1.3529.3.1, 2015-07-29 13:18:47+05:30, loki@dadasgift.(none)
+ ntp_util
+
+ tests/ntpd/Makefile.am@1.6.2.1 +13 -10
+
+ChangeSet@1.3545, 2015-07-28 09:37:25+00:00, stenn@psp-at1.ntp.org
+ update tests/libntp/run-socktoa.c
+
+ tests/libntp/run-socktoa.c@1.8.1.1 +6 -6
+ update tests/libntp/run-socktoa.c
+
+ChangeSet@1.3544, 2015-07-28 09:36:24+00:00, stenn@psp-at1.ntp.org
+ Typo fix for GCC warning suppression. Harlan Stenn.
+
+ ChangeLog@1.1734 +1 -0
+ Typo fix for GCC warning suppression. Harlan Stenn.
+
+ ntpd/ntp_config.c@1.333 +5 -5
+ Typo fix for GCC warning suppression. Harlan Stenn.
+
+ ntpd/ntp_proto.c@1.364 +1 -1
+ Typo fix for GCC warning suppression. Harlan Stenn.
+
+ChangeSet@1.3529.1.18, 2015-07-27 19:46:25+02:00, viperus@ubuntu.(none)
+ Many files:
+ update
+
+ run-leapsec.c:
+ minor change
+ run-ntp_scanner.c, run-decodenetnum.c:
+ update
+ ntp_scanner.c:
+ Added more tests
+ lfptest.h:
+ minor move after merge with lokesh
+ Makefile.am:
+ Merge
+
+ tests/libntp/lfptest.h@1.5.1.2 +0 -16
+ minor move after merge with lokesh
+
+ tests/libntp/run-decodenetnum.c@1.7 +1 -0
+ update
+
+ tests/libntp/run-lfptostr.c@1.6 +11 -11
+ update
+
+
+ tests/libntp/run-netof.c@1.6 +0 -1
+ update
+
+
+ tests/libntp/run-socktoa.c@1.9 +6 -6
+ update
+
+
+ tests/ntpd/Makefile.am@1.6.1.4 +8 -3
+ Merge
+
+ tests/ntpd/ntp_scanner.c@1.2 +30 -2
+ Added more tests
+
+ tests/ntpd/run-leapsec.c@1.4 +9 -3
+ minor change
+
+ tests/ntpd/run-ntp_scanner.c@1.2 +7 -1
+ update
+
+ tests/ntpd/run-ntp_signd.c@1.3 +2 -2
+ update
+
+
+ tests/ntpd/run-rc_cmdlength.c@1.2 +8 -3
+ update
+
+
+ChangeSet@1.3543, 2015-07-27 04:11:08+00:00, stenn@psp-at1.ntp.org
+ [Bug 2595] ntpdate man page quirks. Hal Murray, Harlan Stenn
+
+ ChangeLog@1.1733 +1 -0
+ [Bug 2595] ntpdate man page quirks. Hal Murray, Harlan Stenn
+
+ ntpd/ntp.conf.def@1.19 +1 -1
+ [Bug 2595] ntpdate man page quirks. Hal Murray, Harlan Stenn
+
+ ntpd/ntpd-opts.def@1.13 +5 -1
+ [Bug 2595] ntpdate man page quirks. Hal Murray, Harlan Stenn
+
+ChangeSet@1.3542, 2015-07-27 03:16:04+00:00, stenn@psp-at1.ntp.org
+ [Bug 2625] Deprecate flag1 in local refclock. Hal Murray, Harlan Stenn.
+
+ ChangeLog@1.1732 +1 -0
+ [Bug 2625] Deprecate flag1 in local refclock. Hal Murray, Harlan Stenn.
+
+ ntpd/refclock_local.c@1.21 +2 -16
+ [Bug 2625] Deprecate flag1 in local refclock. Hal Murray, Harlan Stenn.
+
+ChangeSet@1.3540, 2015-07-27 00:07:00+00:00, tflendrich@psp-at1.ntp.org
+ ChangeLog:
+ updated with info about progname and ntp_restrict.c
+
+ ChangeLog@1.1730 +4 -0
+ updated with info about progname and ntp_restrict.c
+
+ChangeSet@1.3529.2.1, 2015-07-26 22:04:07+00:00, stenn@psp-at1.ntp.org
+ [Bug 2817] Stop locking ntpd into memory by default under Linux. H.Stenn.
+
+ ChangeLog@1.1725.1.8 +1 -0
+ [Bug 2817] Stop locking ntpd into memory by default under Linux. H.Stenn.
+
+ sntp/m4/ntp_rlimit.m4@1.2 +5 -1
+ [Bug 2817] Stop locking ntpd into memory by default under Linux. H.Stenn.
+
+ChangeSet@1.3529.1.17, 2015-07-26 21:48:29+02:00, viperus@ubuntu.(none)
+ run-ntp_scanner.c, ntp_scanner.c:
+ new file
+
+ tests/ntpd/ntp_scanner.c@1.1 +29 -0
+ BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/ntpd/ntp_scanner.c
+
+ tests/ntpd/ntp_scanner.c@1.0 +0 -0
+
+ tests/ntpd/run-ntp_scanner.c@1.1 +55 -0
+ BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/ntpd/run-ntp_scanner.c
+
+ tests/ntpd/run-ntp_scanner.c@1.0 +0 -0
+
+ChangeSet@1.3529.1.16, 2015-07-26 21:34:45+02:00, viperus@ubuntu.(none)
+
+ tests/ntpd/Makefile.am@1.6.1.3 +20 -1
+
+ tests/ntpd/ntp_signd.c@1.2 +3 -1
+
+ tests/ntpd/run-ntp_signd.c@1.2 +9 -3
+
+ChangeSet@1.3529.1.14, 2015-07-26 07:23:22+00:00, stenn@psp-at1.ntp.org
+ update tests/sec-2853/run-sec-2853.
+
+ tests/sec-2853/run-sec-2853.c@1.3.1.1 +4 -5
+ update
+
+ChangeSet@1.3529.1.13, 2015-07-26 07:14:53+00:00, stenn@psp-at1.ntp.org
+ Add std_unity_tests to various Makefile.am files. Harlan Stenn.
+
+ ChangeLog@1.1725.1.7 +1 -0
+ Add std_unity_tests to various Makefile.am files. Harlan Stenn.
+
+ sntp/tests/Makefile.am@1.62 +4 -0
+ Add std_unity_tests to various Makefile.am files. Harlan Stenn.
+
+ tests/libntp/Makefile.am@1.85.1.4 +4 -0
+ Add std_unity_tests to various Makefile.am files. Harlan Stenn.
+
+ tests/ntpd/Makefile.am@1.4.1.1 +4 -0
+ Add std_unity_tests to various Makefile.am files. Harlan Stenn.
+
+ tests/sandbox/Makefile.am@1.6 +4 -0
+ Add std_unity_tests to various Makefile.am files. Harlan Stenn.
+
+ChangeSet@1.3529.1.12, 2015-07-26 06:43:54+00:00, stenn@psp-at1.ntp.org
+ [Bug 2886] Mis-spelling: "outlyer" should be "outlier". dave@horsfall.org
+
+ NEWS@1.145 +10 -0
+ [Bug 2886] Mis-spelling: "outlyer" should be "outlier". dave@horsfall.org
+
+ChangeSet@1.3529.1.11, 2015-07-26 06:37:30+00:00, stenn@psp-at1.ntp.org
+ [Bug 2886] Mis-spelling: "outlyer" should be "outlier". dave@horsfall.org
+
+ ChangeLog@1.1725.1.6 +1 -0
+ [Bug 2886] Mis-spelling: "outlyer" should be "outlier". dave@horsfall.org
+
+ html/decode.html@1.26 +2 -2
+ [Bug 2886] Mis-spelling: "outlyer" should be "outlier". dave@horsfall.org
+
+ html/stats.html@1.4 +24 -24
+ [Bug 2886] Mis-spelling: "outlyer" should be "outlier". dave@horsfall.org
+
+ include/ntp_control.h@1.59 +1 -1
+ [Bug 2886] Mis-spelling: "outlyer" should be "outlier". dave@horsfall.org
+
+ libntp/statestr.c@1.28 +1 -1
+ [Bug 2886] Mis-spelling: "outlyer" should be "outlier". dave@horsfall.org
+
+ ntpd/invoke-ntp.conf.texi@1.189 +2 -2
+ [Bug 2886] Mis-spelling: "outlyer" should be "outlier". dave@horsfall.org
+
+ ntpd/ntp.conf.5man@1.223 +4 -4
+ [Bug 2886] Mis-spelling: "outlyer" should be "outlier". dave@horsfall.org
+
+ ntpd/ntp.conf.5mdoc@1.223 +3 -3
+ [Bug 2886] Mis-spelling: "outlyer" should be "outlier". dave@horsfall.org
+
+ ntpd/ntp.conf.def@1.18 +1 -1
+ [Bug 2886] Mis-spelling: "outlyer" should be "outlier". dave@horsfall.org
+
+ ntpd/ntp.conf.html@1.178 +1522 -1191
+ [Bug 2886] Mis-spelling: "outlyer" should be "outlier". dave@horsfall.org
+
+ ntpd/ntp.conf.man.in@1.223 +4 -4
+ [Bug 2886] Mis-spelling: "outlyer" should be "outlier". dave@horsfall.org
+
+ ntpd/ntp.conf.mdoc.in@1.223 +3 -3
+ [Bug 2886] Mis-spelling: "outlyer" should be "outlier". dave@horsfall.org
+
+ ntpd/ntp_loopfilter.c@1.185 +4 -4
+ [Bug 2886] Mis-spelling: "outlyer" should be "outlier". dave@horsfall.org
+
+ ntpd/ntp_proto.c@1.363 +1 -1
+ [Bug 2886] Mis-spelling: "outlyer" should be "outlier". dave@horsfall.org
+
+ ntpq/libntpq.h@1.10 +1 -1
+ [Bug 2886] Mis-spelling: "outlyer" should be "outlier". dave@horsfall.org
+
+ ntpq/ntpq-subs.c@1.111 +1 -1
+ [Bug 2886] Mis-spelling: "outlyer" should be "outlier". dave@horsfall.org
+
+ChangeSet@1.3537, 2015-07-25 18:08:16+02:00, tomek@tomek-n56vz.(none)
+ Changed "char * progname;" variable to be "char const * progname;", so now it is consistent
+ Many files:
+ changed a variable to be const
+ autogenerated
+
+ adjtimed/adjtimed.c@1.5 +1 -1
+ changed a variable to be const
+
+ clockstuff/chutest.c@1.7 +1 -1
+ changed a variable to be const
+
+ clockstuff/propdelay.c@1.8 +1 -1
+ changed a variable to be const
+
+ libntp/msyslog.c@1.51 +3 -3
+ changed a variable to be const
+
+ libntp/ntp_lineedit.c@1.13 +1 -1
+ changed a variable to be const
+
+ ntpdate/ntpdate.c@1.94 +1 -1
+ changed a variable to be const
+
+ ntpdc/ntpdc.c@1.104 +1 -1
+ changed a variable to be const
+
+ ntpq/ntpq.c@1.160 +1 -1
+ changed a variable to be const
+
+ sntp/log.c@1.23 +1 -1
+ changed a variable to be const
+
+ sntp/log.h@1.12 +1 -1
+ changed a variable to be const
+
+ sntp/tests/run-crypto.c@1.6 +1 -1
+ autogenerated
+
+ sntp/tests/run-keyFile.c@1.9 +1 -1
+ autogenerated
+
+ sntp/tests/run-kodDatabase.c@1.7 +1 -1
+ autogenerated
+
+ sntp/tests/run-kodFile.c@1.7 +1 -1
+ autogenerated
+
+ sntp/tests/run-networking.c@1.3 +1 -1
+ autogenerated
+
+ sntp/tests/run-packetHandling.c@1.6 +1 -1
+ autogenerated
+
+ sntp/tests/run-packetProcessing.c@1.7 +1 -1
+ autogenerated
+
+ sntp/tests/run-utilities.c@1.6 +1 -1
+ autogenerated
+
+ tests/ntpd/run-ntp_restrict.c@1.4 +1 -1
+ autogenerated
+
+ tests/sandbox/run-modetoa.c@1.3 +7 -4
+ autogenerated
+
+ tests/sandbox/run-uglydate.c@1.3 +9 -4
+ autogenerated
+
+ tests/sandbox/run-ut-2803.c@1.2 +7 -4
+ autogenerated
+
+ util/ntp-keygen.c@1.106 +1 -1
+ changed a variable to be const
+
+ util/ntptime.c@1.27 +1 -1
+ changed a variable to be const
+
+ChangeSet@1.3529.1.10, 2015-07-25 16:54:29+02:00, viperus@ubuntu.(none)
+ Many files:
+ added declarations
+
+ lfpfunc.c:
+ adding declarations, reorganizing
+ Many files:
+ adding declarations
+
+ update
+
+ run-clocktime.c:
+ update
+ clocktime.c:
+ adding declarations
+ socktoa.c:
+ added declarations
+
+ tests/libntp/clocktime.c@1.7 +1 -0
+ adding declarations
+
+ tests/libntp/lfpfunc.c@1.13 +28 -7
+ adding declarations, reorganizing
+
+ tests/libntp/netof.c@1.3.1.1 +8 -0
+ adding declarations
+
+
+ tests/libntp/numtoa.c@1.6 +2 -0
+ adding declarations
+
+
+ tests/libntp/numtohost.c@1.5 +2 -0
+ adding declarations
+
+
+ tests/libntp/octtoint.c@1.3.1.1 +10 -0
+ adding declarations
+
+
+ tests/libntp/prettydate.c@1.3 +3 -0
+ adding declarations
+
+
+ tests/libntp/recvbuff.c@1.5 +4 -0
+ adding declarations
+
+
+ tests/libntp/refidsmear.c@1.5 +6 -3
+ adding declarations
+
+
+ tests/libntp/refnumtoa.c@1.5 +4 -0
+ adding declarations
+
+
+ tests/libntp/run-clocktime.c@1.9 +1 -1
+ update
+
+ tests/libntp/run-lfpfunc.c@1.16 +9 -9
+ update
+
+
+ tests/libntp/run-netof.c@1.5 +4 -4
+ update
+
+
+ tests/libntp/run-numtoa.c@1.9 +2 -2
+ update
+
+
+ tests/libntp/run-numtohost.c@1.9 +1 -1
+ update
+
+
+ tests/libntp/run-octtoint.c@1.6 +7 -7
+ update
+
+
+ tests/libntp/run-prettydate.c@1.4 +1 -1
+ update
+
+
+ tests/libntp/run-recvbuff.c@1.4 +3 -3
+ update
+
+
+ tests/libntp/run-refidsmear.c@1.5 +1 -1
+ update
+
+
+ tests/libntp/run-refnumtoa.c@1.7 +2 -2
+ update
+
+
+ tests/libntp/run-sfptostr.c@1.4 +7 -7
+ update
+
+
+ tests/libntp/run-socktoa.c@1.8 +6 -6
+ update
+
+
+ tests/libntp/run-ssl_init.c@1.8 +5 -5
+ update
+
+
+ tests/libntp/run-statestr.c@1.9 +4 -4
+ update
+
+
+ tests/libntp/run-strtolfp.c@1.4 +6 -6
+ update
+
+
+ tests/libntp/run-timespecops.c@1.9 +28 -28
+ update
+
+
+ tests/libntp/run-timevalops.c@1.11 +28 -28
+ update
+
+
+ tests/libntp/run-tstotv.c@1.4 +3 -3
+ update
+
+
+ tests/libntp/run-tvtots.c@1.5 +3 -3
+ update
+
+
+ tests/libntp/run-vi64ops.c@1.7 +3 -3
+ update
+
+
+ tests/libntp/run-ymd2yd.c@1.10 +4 -4
+ update
+
+
+ tests/libntp/sfptostr.c@1.3 +10 -0
+ update
+
+
+ tests/libntp/sockaddrtest.c@1.2 +1 -0
+ update
+
+
+ tests/libntp/socktoa.c@1.3.1.1 +6 -0
+ added declarations
+
+ tests/libntp/ssl_init.c@1.8 +6 -0
+ added declarations
+
+
+ tests/libntp/statestr.c@1.5 +4 -0
+ added declarations
+
+
+ tests/libntp/strtolfp.c@1.2.1.1 +9 -0
+ added declarations
+
+
+ tests/libntp/timespecops.c@1.8 +40 -1
+ added declarations
+
+
+ tests/libntp/timevalops.c@1.11 +37 -1
+ added declarations
+
+
+ tests/libntp/tstotv.c@1.3 +5 -0
+ added declarations
+
+
+ tests/libntp/tvtots.c@1.5 +3 -0
+ added declarations
+
+
+ tests/libntp/vi64ops.c@1.6 +6 -0
+ added declarations
+
+
+ tests/libntp/ymd2yd.c@1.6 +5 -0
+ added declarations
+
+
+ChangeSet@1.3536, 2015-07-25 02:08:32+02:00, tomek@tomek-n56vz.(none)
+ run-ntp_restrict.c:
+ autogenerated, but modified manually...
+ Makefile.am:
+ removed something not longer in use
+ ntp_restrict.c:
+ added another test
+ run-ntp_restrict.c, run-ntp_prio_q.c, run-sec-2853.c, run-bug-2803.c:
+ autogenerated
+
+ tests/bug-2803/run-bug-2803.c@1.8 +8 -4
+ autogenerated
+
+ tests/ntpd/Makefile.am@1.9 +0 -3
+ removed something not longer in use
+
+ tests/ntpd/ntp_restrict.c@1.2 +17 -4
+ added another test
+
+ tests/ntpd/run-ntp_prio_q.c@1.2 +9 -4
+ autogenerated
+
+ tests/ntpd/run-ntp_restrict.c@1.3 +1 -1
+ autogenerated, but modified manually...
+
+ tests/ntpd/run-ntp_restrict.c@1.2 +8 -4
+ autogenerated
+
+ tests/sec-2853/run-sec-2853.c@1.4 +5 -6
+ autogenerated
+
+ChangeSet@1.3529.1.9, 2015-07-24 18:38:05+02:00, viperus@ubuntu.(none)
+ calendar.c:
+ added function declarations + minor comment fixes
+
+ Many files:
+ added declarations
+
+ updated
+
+ run-buftvtots.c, run-calendar.c:
+ update
+ lfptest.c:
+ added #include
+ buftvtots.c:
+ added function declarations
+ caljulian.c:
+ added declarations
+ run-caljulian.c:
+ updated
+
+ tests/libntp/buftvtots.c@1.4 +4 -0
+ added function declarations
+
+ tests/libntp/calendar.c@1.6 +42 -18
+ added function declarations + minor comment fixes
+
+
+ tests/libntp/caljulian.c@1.9 +10 -0
+ added declarations
+
+ tests/libntp/caltontp.c@1.3 +5 -0
+ added declarations
+
+
+ tests/libntp/calyearstart.c@1.4 +5 -0
+ added declarations
+
+
+ tests/libntp/clocktime.c@1.6 +11 -0
+ added declarations
+
+
+ tests/libntp/decodenetnum.c@1.3.1.1 +7 -0
+ added declarations
+
+
+ tests/libntp/hextoint.c@1.4 +6 -0
+ added declarations
+
+
+ tests/libntp/hextolfp.c@1.5.1.1 +7 -0
+ added declarations
+
+
+ tests/libntp/humandate.c@1.5 +4 -0
+ added declarations
+
+
+ tests/libntp/lfpfunc.c@1.12 +13 -0
+ added declarations
+
+
+ tests/libntp/lfptest.c@1.2 +1 -0
+ added #include
+
+ tests/libntp/lfptostr.c@1.3.1.1 +15 -0
+ added declarations
+
+
+ tests/libntp/modetoa.c@1.7 +3 -0
+ added declarations
+
+
+ tests/libntp/msyslog.c@1.6 +10 -0
+ added declarations
+
+
+ tests/libntp/run-buftvtots.c@1.5 +10 -10
+ update
+
+ tests/libntp/run-calendar.c@1.8 +11 -11
+ update
+
+ tests/libntp/run-caljulian.c@1.12 +4 -4
+ updated
+
+ tests/libntp/run-caltontp.c@1.4 +4 -4
+ updated
+
+
+ tests/libntp/run-calyearstart.c@1.6 +3 -3
+ updated
+
+
+ tests/libntp/run-clocktime.c@1.8 +8 -8
+ updated
+
+
+ tests/libntp/run-decodenetnum.c@1.6 +6 -6
+ updated
+
+
+ tests/libntp/run-hextoint.c@1.8 +5 -5
+ updated
+
+
+ tests/libntp/run-hextolfp.c@1.7 +6 -6
+ updated
+
+
+ tests/libntp/run-humandate.c@1.5 +2 -2
+ updated
+
+
+ tests/libntp/run-lfpfunc.c@1.15 +9 -9
+ updated
+
+
+ tests/libntp/run-lfptostr.c@1.5 +10 -10
+ updated
+
+
+ tests/libntp/run-modetoa.c@1.10 +2 -2
+ updated
+
+
+ tests/libntp/run-msyslog.c@1.7 +8 -8
+ updated
+
+
+ChangeSet@1.3523.2.7, 2015-07-24 12:01:24+05:30, loki@dadasgift.(none)
+ ntp signd testing
+
+ tests/ntpd/ntp_signd.c@1.1 +24 -0
+ BitKeeper file /home/loki/ntp_gsoc/2_damir_code/ntp-stable-unity/tests/ntpd/ntp_signd.c
+
+ tests/ntpd/ntp_signd.c@1.0 +0 -0
+
+ChangeSet@1.3523.2.6, 2015-07-24 11:55:00+05:30, loki@dadasgift.(none)
+ ntp_signd test changes
+
+ tests/ntpd/Makefile.am@1.6.1.1 +21 -0
+
+ tests/ntpd/run-ntp_signd.c@1.1 +52 -0
+ BitKeeper file /home/loki/ntp_gsoc/2_damir_code/ntp-stable-unity/tests/ntpd/run-ntp_signd.c
+
+ tests/ntpd/run-ntp_signd.c@1.0 +0 -0
+
+ChangeSet@1.3535, 2015-07-23 19:19:08+02:00, tomek@tomek-n56vz.(none)
+ Wrote tests for ntpd/ntp_restrict.c
+ ntp_restrict.c, run-ntp_restrict.c:
+ new file
+ Makefile.am:
+ added ntp_restrict.c test
+ ntp_restrict.c:
+ added assertions (I prefer them to a segfault)
+
+ ntpd/ntp_restrict.c@1.39 +6 -0
+ added assertions (I prefer them to a segfault)
+
+ tests/ntpd/Makefile.am@1.8 +25 -0
+ added ntp_restrict.c test
+
+ tests/ntpd/ntp_restrict.c@1.1 +185 -0
+ BitKeeper file /home/tomek/ntp/ntpd_tests/ntp-stable-unity/tests/ntpd/ntp_restrict.c
+
+ tests/ntpd/ntp_restrict.c@1.0 +0 -0
+
+ tests/ntpd/run-ntp_restrict.c@1.1 +64 -0
+ BitKeeper file /home/tomek/ntp/ntpd_tests/ntp-stable-unity/tests/ntpd/run-ntp_restrict.c
+
+ tests/ntpd/run-ntp_restrict.c@1.0 +0 -0
+
+ChangeSet@1.3529.1.8, 2015-07-23 18:37:16+02:00, viperus@ubuntu.(none)
+ reduced number of warnings in sntp/tests/
+
+ sntp/tests/crypto.c@1.9 +6 -0
+ added declarations for tests
+
+ sntp/tests/fileHandlingTest.c@1.2 +1 -1
+ commented out unnecessary array
+
+ sntp/tests/keyFile.c@1.7 +4 -0
+ added declarations for tests
+
+
+ sntp/tests/kodDatabase.c@1.7 +6 -0
+ added declarations for tests
+
+
+ sntp/tests/kodFile.c@1.8 +8 -0
+ added declarations for tests
+
+
+ sntp/tests/nameresolution.c@1.2 +3 -0
+ added declarations for tests
+
+
+ sntp/tests/packetHandling.c@1.5 +13 -0
+ added declarations for tests
+
+
+ sntp/tests/packetProcessing.c@1.7 +24 -0
+ added declarations for tests
+
+
+ sntp/tests/run-crypto.c@1.5 +5 -5
+ added declarations for tests
+
+
+ sntp/tests/run-keyFile.c@1.8 +4 -4
+ updated
+
+ sntp/tests/run-kodDatabase.c@1.6 +5 -5
+ updated
+
+ sntp/tests/run-kodFile.c@1.6 +6 -6
+ updated
+
+ sntp/tests/run-packetHandling.c@1.5 +10 -10
+ updated
+
+ sntp/tests/run-packetProcessing.c@1.6 +18 -18
+ updated
+
+ sntp/tests/run-utilities.c@1.5 +7 -7
+ updated
+
+ sntp/tests/utilities.c@1.4 +12 -0
+ added declarations for tests
+
+
+ChangeSet@1.3529.1.7, 2015-07-22 20:09:39+02:00, viperus@ubuntu.(none)
+ Updated unity ruby testRunner generator with mark's latest fixes. Modified tests/libntp/Makefile.am and sntp/tests/Makefile.am accordingly. Also, split some .h files into .h and .c because they contained declarations and definitions which caused error in the newly generated test runners. Started fixing some warnings. We can add both declarations and defitions in a single test.c file without any issues now. Autogenerated tests will be run in order of the declarations in the test file.
+
+ sntp/tests/Makefile.am@1.61 +4 -0
+ New ruby generator script required some changes. Removed some definitions form header files and created their own .c files.
+
+ sntp/tests/crypto.c@1.8 +2 -0
+ started adding declarations at the top of the file
+
+ sntp/tests/fileHandlingTest.c@1.1 +74 -0
+ new file. Contains definitions from fileHandlingTest.h.in
+
+ sntp/tests/fileHandlingTest.c@1.0 +0 -0
+
+ sntp/tests/fileHandlingTest.h.in@1.14 +7 -46
+ changes stuff a bit, to work with the updated ruby generator
+
+ sntp/tests/keyFile.c@1.6 +4 -0
+ added declarations to avoid warnings
+
+ sntp/tests/run-crypto.c@1.4 +12 -9
+ updated autogenerated code
+
+ sntp/tests/run-keyFile.c@1.7 +12 -8
+ updated autogenerated code
+
+
+ sntp/tests/run-kodDatabase.c@1.5 +9 -3
+ updated autogenerated code
+
+
+ sntp/tests/run-kodFile.c@1.5 +7 -3
+ updated autogenerated code
+
+
+ sntp/tests/run-networking.c@1.2 +5 -2
+ updated autogenerated code
+
+
+ sntp/tests/run-packetHandling.c@1.4 +11 -3
+ updated autogenerated code
+
+
+ sntp/tests/run-packetProcessing.c@1.5 +6 -3
+ updated autogenerated code
+
+
+ sntp/tests/run-utilities.c@1.4 +8 -3
+ updated autogenerated code
+
+
+ sntp/tests/sntptest.c@1.1 +33 -0
+ definitions placed from .h to .c
+
+ sntp/tests/sntptest.c@1.0 +0 -0
+
+ sntp/tests/sntptest.h@1.6 +0 -29
+ added sntptest.c and put definitions in it.
+
+ sntp/unity/auto/generate_test_runner.rb@1.9 +3 -3
+ some changes were needed after mark's update to work better with NTP
+
+ sntp/unity/auto/generate_test_runner.rb@1.8 +209 -110
+ updated the ruby script with new stuff from Mark
+
+ sntp/unity/auto/parseOutput.rb@1.1 +191 -0
+ mark's new file from the update
+
+ sntp/unity/auto/parseOutput.rb@1.0 +0 -0
+
+ sntp/unity/auto/type_sanitizer.rb@1.1 +8 -0
+ mark's new file from the update
+
+
+ sntp/unity/auto/type_sanitizer.rb@1.0 +0 -0
+
+ sntp/unity/auto/unity_test_summary.py@1.1 +135 -0
+ mark's new file from the update
+
+
+ sntp/unity/auto/unity_test_summary.py@1.0 +0 -0
+
+ sntp/unity/auto/unity_test_summary.rb@1.3 +48 -25
+ added Marks new changes
+
+ tests/libntp/Makefile.am@1.85.1.3 +7 -0
+ New ruby generator script required some changes. Removed some definitions form header files and created their own .c files.
+
+
+ tests/libntp/a_md5encrypt.c@1.11 +8 -0
+ added declarations
+
+ tests/libntp/atoint.c@1.4 +9 -0
+ added declarations
+
+
+ tests/libntp/atouint.c@1.5 +8 -0
+ added declarations
+
+
+ tests/libntp/authkeys.c@1.10 +17 -6
+ added declarations
+
+
+ tests/libntp/lfptest.c@1.1 +10 -0
+ new file, contains definitions from lfptest.h
+
+ tests/libntp/lfptest.c@1.0 +0 -0
+
+ tests/libntp/lfptest.h@1.4.1.3 +2 -8
+ split to .h and .c which now contains definitions
+
+ tests/libntp/run-a_md5encrypt.c@1.13 +9 -7
+ autogenerated file update
+
+ tests/libntp/run-atoint.c@1.7 +10 -7
+ autogenerated file update
+
+
+ tests/libntp/run-atouint.c@1.8 +10 -7
+ autogenerated file update
+
+
+ tests/libntp/run-authkeys.c@1.10 +12 -9
+ autogenerated file update
+
+
+ tests/libntp/run-buftvtots.c@1.4 +8 -3
+ autogenerated file update
+
+
+ tests/libntp/run-calendar.c@1.7 +6 -3
+ autogenerated file update
+
+
+ tests/libntp/run-caljulian.c@1.11 +7 -3
+ autogenerated file update
+
+
+ tests/libntp/run-caltontp.c@1.3 +4 -3
+ autogenerated file update
+
+
+ tests/libntp/run-calyearstart.c@1.5 +6 -3
+ autogenerated file update
+
+
+ tests/libntp/run-clocktime.c@1.7 +6 -3
+ autogenerated file update
+
+
+ tests/libntp/run-decodenetnum.c@1.5 +5 -3
+ autogenerated file update
+
+
+ tests/libntp/run-hextoint.c@1.7 +6 -2
+ autogenerated file update
+
+
+ tests/libntp/run-hextolfp.c@1.6 +6 -3
+ autogenerated file update
+
+
+ tests/libntp/run-humandate.c@1.4 +5 -3
+ autogenerated file update
+
+
+ tests/libntp/run-lfpfunc.c@1.14 +7 -3
+ autogenerated file update
+
+
+ tests/libntp/run-lfptostr.c@1.4 +5 -3
+ autogenerated file update
+
+
+ tests/libntp/run-modetoa.c@1.9 +4 -3
+ autogenerated file update
+
+
+ tests/libntp/run-msyslog.c@1.6 +4 -3
+ autogenerated file update
+
+
+ tests/libntp/run-netof.c@1.4 +6 -3
+ autogenerated file update
+
+
+ tests/libntp/run-numtoa.c@1.8 +5 -3
+ autogenerated file update
+
+
+ tests/libntp/run-numtohost.c@1.8 +5 -3
+ autogenerated file update
+
+
+ tests/libntp/run-octtoint.c@1.5 +4 -2
+ autogenerated file update
+
+
+ tests/libntp/run-prettydate.c@1.3 +6 -2
+ autogenerated file update
+
+
+ tests/libntp/run-recvbuff.c@1.3 +4 -2
+ autogenerated file update
+
+
+ tests/libntp/run-refidsmear.c@1.4 +7 -3
+ autogenerated file update
+
+
+ tests/libntp/run-refnumtoa.c@1.6 +5 -3
+ autogenerated file update
+
+
+ tests/libntp/run-sfptostr.c@1.3 +4 -3
+ autogenerated file update
+
+
+ tests/libntp/run-socktoa.c@1.7 +6 -2
+ autogenerated file update
+
+
+ tests/libntp/run-ssl_init.c@1.7 +4 -3
+ autogenerated file update
+
+
+ tests/libntp/run-statestr.c@1.8 +6 -3
+ autogenerated file update
+
+
+ tests/libntp/run-strtolfp.c@1.3 +6 -2
+ autogenerated file update
+
+
+ tests/libntp/run-timespecops.c@1.8 +8 -3
+ autogenerated file update
+
+
+ tests/libntp/run-timevalops.c@1.10 +7 -3
+ autogenerated file update
+
+
+ tests/libntp/run-tstotv.c@1.3 +5 -2
+ autogenerated file update
+
+
+ tests/libntp/run-tvtots.c@1.4 +6 -3
+ autogenerated file update
+
+
+ tests/libntp/run-uglydate.c@1.9 +6 -4
+ autogenerated file update
+
+
+ tests/libntp/run-vi64ops.c@1.6 +5 -3
+ autogenerated file update
+
+
+ tests/libntp/run-ymd2yd.c@1.9 +4 -3
+ autogenerated file update
+
+
+ tests/libntp/sockaddrtest.c@1.1 +50 -0
+ New file created by splitting sockaddrtest.h.
+
+ tests/libntp/sockaddrtest.c@1.0 +0 -0
+
+ tests/libntp/sockaddrtest.h@1.6 +4 -45
+ removed definitions and placed them in sockaddrtest.c
+
+ tests/libntp/uglydate.c@1.7 +1 -0
+ added some declarations to test the new generator. Unfinished
+
+ChangeSet@1.3523.3.18, 2015-07-21 06:47:23+00:00, stenn@psp-deb1.ntp.org
+ [Bug 2883] ntpd crashes on exit with empty driftfile. Miroslav Lichvar.
+
+ ChangeLog@1.1708.1.19 +1 -0
+ [Bug 2883] ntpd crashes on exit with empty driftfile. Miroslav Lichvar.
+
+ ntpd/ntp_parser.c@1.98 +1141 -1381
+ [Bug 2883] ntpd crashes on exit with empty driftfile. Miroslav Lichvar.
+
+ ntpd/ntp_parser.h@1.63 +216 -230
+ [Bug 2883] ntpd crashes on exit with empty driftfile. Miroslav Lichvar.
+
+ ntpd/ntp_parser.y@1.88 +1 -1
+ [Bug 2883] ntpd crashes on exit with empty driftfile. Miroslav Lichvar.
+
+ChangeSet@1.3523.3.17, 2015-07-20 07:32:09+00:00, stenn@psp-at1.ntp.org
+ ntpd/ntp_peer.c:newpeer(): added a DEBUG_REQUIRE(srcadr). Harlan Stenn.
+
+ ChangeLog@1.1708.1.18 +1 -0
+ ntpd/ntp_peer.c:newpeer(): added a DEBUG_REQUIRE(srcadr). Harlan Stenn.
+
+ ntpd/ntp_peer.c@1.158 +2 -0
+ ntpd/ntp_peer.c:newpeer(): added a DEBUG_REQUIRE(srcadr). Harlan Stenn.
+
+ChangeSet@1.3523.3.16, 2015-07-20 07:20:04+00:00, stenn@psp-at1.ntp.org
+ [Bug 2849] Systems with more than one default route may never synchronize. Brian Utterback.
+
+ ChangeLog@1.1708.1.17 +3 -0
+ [Bug 2849] Systems with more than one default route may never synchronize. Brian Utterback.
+
+ ntpd/ntp_peer.c@1.157 +7 -3
+ [Bug 2849] Systems with more than one default route may never synchronize. Brian Utterback.
+
+ChangeSet@1.3523.3.15, 2015-07-20 06:38:37+00:00, stenn@psp-at1.ntp.org
+ util/ntptime.c: initialization nit. Harlan Stenn.
+
+ ChangeLog@1.1708.1.16 +1 -0
+ util/ntptime.c: initialization nit. Harlan Stenn.
+
+ util/ntptime.c@1.26 +1 -1
+ util/ntptime.c: initialization nit. Harlan Stenn.
+
+ChangeSet@1.3523.3.14, 2015-07-19 21:49:06-04:00, stenn@deacon.udel.edu
+ Typo
+
+ ChangeLog@1.1708.1.15 +1 -1
+ Typo
+
+ChangeSet@1.3523.3.13, 2015-07-19 21:46:59-04:00, stenn@deacon.udel.edu
+ libntp/icom.c: Typos fix. Harlan Stenn.
+
+ ChangeLog@1.1708.1.14 +1 -0
+ libntp/icom.c: Typos fix. Harlan Stenn.
+
+ libntp/icom.c@1.20 +1 -1
+ libntp/icom.c: Typos fix. Harlan Stenn.
+
+ChangeSet@1.3523.3.12, 2015-07-19 05:37:40+00:00, stenn@psp-at1.ntp.org
+ Code cleanup. Harlan Stenn.
+
+ ChangeLog@1.1708.1.13 +1 -0
+ Code cleanup. Harlan Stenn.
+
+ include/Makefile.am@1.52 +1 -0
+ Code cleanup. Harlan Stenn.
+
+ include/rc_cmdlength.h@1.1 +2 -0
+ BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable/include/rc_cmdlength.h
+
+ include/rc_cmdlength.h@1.0 +0 -0
+
+ libntp/audio.c@1.36 +8 -5
+ Code cleanup. Harlan Stenn.
+
+ libntp/icom.c@1.19 +23 -7
+ Code cleanup. Harlan Stenn.
+
+ libntp/ntp_worker.c@1.5 +1 -1
+ Code cleanup. Harlan Stenn.
+
+ ntpd/ntp_config.c@1.332 +10 -0
+ Code cleanup. Harlan Stenn.
+
+ ntpd/ntp_control.c@1.203 +1 -2
+ Code cleanup. Harlan Stenn.
+
+ ntpd/ntp_crypto.c@1.181 +1 -1
+ Code cleanup. Harlan Stenn.
+
+ ntpd/ntp_monitor.c@1.44 +4 -0
+ Code cleanup. Harlan Stenn.
+
+ ntpd/ntp_peer.c@1.156 +1 -0
+ Code cleanup. Harlan Stenn.
+
+ ntpd/ntp_proto.c@1.362 +3 -1
+ Code cleanup. Harlan Stenn.
+
+ ntpd/ntp_restrict.c@1.38 +4 -0
+ Code cleanup. Harlan Stenn.
+
+ ntpd/rc_cmdlength.c@1.2 +1 -0
+ Code cleanup. Harlan Stenn.
+
+ ntpd/refclock_arc.c@1.33 +1 -1
+ Code cleanup. Harlan Stenn.
+
+ ntpd/refclock_chu.c@1.57 +1 -1
+ Code cleanup. Harlan Stenn.
+
+ ntpd/refclock_nmea.c@1.78 +4 -3
+ Code cleanup. Harlan Stenn.
+
+ ntpd/refclock_parse.c@1.81 +3 -0
+ Code cleanup. Harlan Stenn.
+
+ ntpd/refclock_wwv.c@1.80 +4 -2
+ Code cleanup. Harlan Stenn.
+
+ ntpq/ntpq.c@1.159 +0 -1
+ Code cleanup. Harlan Stenn.
+
+ sntp/networking.c@1.66 +1 -1
+ Code cleanup. Harlan Stenn.
+
+ tests/sec-2853/run-sec-2853.c@1.3 +2 -2
+ Code cleanup. Harlan Stenn.
+
+ tests/sec-2853/sec-2853.c@1.5 +2 -2
+ Code cleanup. Harlan Stenn.
+
+ util/ntp-keygen.c@1.105 +2 -2
+ Code cleanup. Harlan Stenn.
+
+ChangeSet@1.3523.3.11, 2015-07-16 07:37:32+00:00, stenn@psp-at1.ntp.org
+ Get rid of the NTP_ prefix on our assertion macros. Harlan Stenn.
+
+ ChangeLog@1.1708.1.12 +1 -0
+ Get rid of the NTP_ prefix on our assertion macros. Harlan Stenn.
+
+ include/ntp_assert.h@1.9 +0 -4
+ Get rid of the NTP_ prefix on our assertion macros. Harlan Stenn.
+
+ include/ntp_lists.h@1.15 +3 -3
+ Get rid of the NTP_ prefix on our assertion macros. Harlan Stenn.
+
+ libntp/atolfp.c@1.6 +1 -1
+ Get rid of the NTP_ prefix on our assertion macros. Harlan Stenn.
+
+ libntp/caljulian.c@1.16 +1 -1
+ Get rid of the NTP_ prefix on our assertion macros. Harlan Stenn.
+
+ libntp/caltontp.c@1.7 +8 -8
+ Get rid of the NTP_ prefix on our assertion macros. Harlan Stenn.
+
+ libntp/decodenetnum.c@1.17 +3 -3
+ Get rid of the NTP_ prefix on our assertion macros. Harlan Stenn.
+
+ libntp/msyslog.c@1.50 +1 -1
+ Get rid of the NTP_ prefix on our assertion macros. Harlan Stenn.
+
+ libntp/ntp_intres.c@1.99 +12 -12
+ Get rid of the NTP_ prefix on our assertion macros. Harlan Stenn.
+
+ libntp/ntp_rfc2553.c@1.48 +1 -1
+ Get rid of the NTP_ prefix on our assertion macros. Harlan Stenn.
+
+ libntp/prettydate.c@1.20 +1 -1
+ Get rid of the NTP_ prefix on our assertion macros. Harlan Stenn.
+
+ libntp/recvbuff.c@1.40 +1 -1
+ Get rid of the NTP_ prefix on our assertion macros. Harlan Stenn.
+
+ libntp/socket.c@1.10 +2 -2
+ Get rid of the NTP_ prefix on our assertion macros. Harlan Stenn.
+
+ libntp/socktohost.c@1.15 +1 -1
+ Get rid of the NTP_ prefix on our assertion macros. Harlan Stenn.
+
+ ntpd/ntp_config.c@1.331 +7 -8
+ Get rid of the NTP_ prefix on our assertion macros. Harlan Stenn.
+
+ ntpd/ntp_control.c@1.202 +18 -18
+ Get rid of the NTP_ prefix on our assertion macros. Harlan Stenn.
+
+ ntpd/ntp_crypto.c@1.180 +14 -14
+ Get rid of the NTP_ prefix on our assertion macros. Harlan Stenn.
+
+ ntpd/ntp_io.c@1.404 +15 -15
+ Get rid of the NTP_ prefix on our assertion macros. Harlan Stenn.
+
+ ntpd/ntp_monitor.c@1.43 +1 -1
+ Get rid of the NTP_ prefix on our assertion macros. Harlan Stenn.
+
+ ntpd/ntp_peer.c@1.155 +1 -1
+ Get rid of the NTP_ prefix on our assertion macros. Harlan Stenn.
+
+ ntpd/ntp_refclock.c@1.120 +1 -1
+ Get rid of the NTP_ prefix on our assertion macros. Harlan Stenn.
+
+ ntpd/ntp_restrict.c@1.37 +9 -9
+ Get rid of the NTP_ prefix on our assertion macros. Harlan Stenn.
+
+ ntpdc/ntpdc.c@1.103 +1 -1
+ Get rid of the NTP_ prefix on our assertion macros. Harlan Stenn.
+
+ ntpq/ntpq-subs.c@1.110 +7 -7
+ Get rid of the NTP_ prefix on our assertion macros. Harlan Stenn.
+
+ ports/winnt/libntp/termios.c@1.31 +1 -1
+ Get rid of the NTP_ prefix on our assertion macros. Harlan Stenn.
+
+ ports/winnt/ntpd/nt_clockstuff.c@1.66 +1 -1
+ Get rid of the NTP_ prefix on our assertion macros. Harlan Stenn.
+
+ ports/winnt/ntpd/ntp_iocompletionport.c@1.71 +7 -8
+ Get rid of the NTP_ prefix on our assertion macros. Harlan Stenn.
+
+ChangeSet@1.3523.3.10, 2015-07-13 04:28:29+00:00, stenn@psp-at1.ntp.org
+ [Bug 2823] ntpsweep with recursive peers option doesn't work. H.Stenn.
+
+ ChangeLog@1.1708.1.11 +1 -0
+ [Bug 2823] ntpsweep with recursive peers option doesn't work. H.Stenn.
+
+ scripts/ntpsweep/ntpsweep.in@1.9 +2 -1
+ [Bug 2823] ntpsweep with recursive peers option doesn't work. H.Stenn.
+
+ChangeSet@1.3523.3.9, 2015-07-13 04:18:36+00:00, stenn@psp-at1.ntp.org
+ scripts/lib/NTP/Util.pm: stratum output is version-dependent. Harlan Stenn.
+
+ ChangeLog@1.1708.1.10 +1 -0
+ scripts/lib/NTP/Util.pm: stratum output is version-dependent. Harlan Stenn.
+
+ scripts/lib/NTP/Util.pm@1.5 +8 -1
+ scripts/lib/NTP/Util.pm: stratum output is version-dependent. Harlan Stenn.
+
+ChangeSet@1.3531, 2015-07-13 04:21:50+02:00, tomek@tomek-n56vz.(none)
+ wrote tests for ntpd/ntp_prio_q.c
+
+ Makefile.am:
+ added ntp_prio_q.c
+ ntp_prio_q.c, run-ntp_prio_q.c:
+ new file
+ ChangeLog:
+ added info about the test of ntpd/ntp_prio_q.c
+
+ ChangeLog@1.1726 +1 -0
+ added info about the test of ntpd/ntp_prio_q.c
+
+ tests/ntpd/Makefile.am@1.7 +28 -0
+ added ntp_prio_q.c
+
+ tests/ntpd/ntp_prio_q.c@1.1 +261 -0
+ BitKeeper file /home/tomek/ntp/ntpd_tests/ntp-stable-unity/tests/ntpd/ntp_prio_q.c
+
+ tests/ntpd/ntp_prio_q.c@1.0 +0 -0
+
+ tests/ntpd/run-ntp_prio_q.c@1.1 +64 -0
+ BitKeeper file /home/tomek/ntp/ntpd_tests/ntp-stable-unity/tests/ntpd/run-ntp_prio_q.c
+
+ tests/ntpd/run-ntp_prio_q.c@1.0 +0 -0
+
+ChangeSet@1.3523.2.5, 2015-07-12 22:59:46+05:30, loki@dadasgift.(none)
+ rc_cmdlength test
+
+ tests/ntpd/rc_cmdlength.c@1.2 +20 -4
+
+ tests/ntpd/run-rc_cmdlength.c@1.1 +52 -0
+ BitKeeper file /home/loki/ntp_gsoc/2_damir_code/ntp-stable-unity/tests/ntpd/run-rc_cmdlength.c
+
+ tests/ntpd/run-rc_cmdlength.c@1.0 +0 -0
+
+ChangeSet@1.3523.3.8, 2015-07-11 19:20:33-04:00, stenn@deacon.udel.edu
+ br-flock: --enable-local-libevent. Harlan Stenn.
+
+ ChangeLog@1.1708.1.9 +1 -0
+ br-flock: --enable-local-libevent. Harlan Stenn.
+
+ br-flock@1.17 +1 -1
+ br-flock: --enable-local-libevent. Harlan Stenn.
+
+ChangeSet@1.3523.3.7, 2015-07-11 18:46:20-04:00, stenn@deacon.udel.edu
+ [Bug 2875] libevent is improperly bundled in the tarball
+
+ Makefile.am@1.133 +1 -1
+ [Bug 2875] libevent is improperly bundled in the tarball
+
+ChangeSet@1.3523.4.1, 2015-07-11 20:28:26+00:00, stenn@psp-at1.ntp.org
+ [Bug 2875] sntp/Makefile.am: Get rid of DIST_SUBDIRS. libevent must be configured for the distribution targets. Harlan Stenn.
+
+ ChangeLog@1.1708.2.1 +2 -0
+ [Bug 2875] sntp/Makefile.am: Get rid of DIST_SUBDIRS. libevent must be configured for the distribution targets. Harlan Stenn.
+
+ sntp/Makefile.am@1.86 +13 -24
+ [Bug 2875] sntp/Makefile.am: Get rid of DIST_SUBDIRS. libevent must be configured for the distribution targets. Harlan Stenn.
+
+ChangeSet@1.3523.2.4, 2015-07-11 00:19:36+05:30, loki@dadasgift.(none)
+ rc_cmdlength testing
+
+ tests/ntpd/Makefile.am@1.6 +20 -0
+
+ tests/ntpd/rc_cmdlength.c@1.1 +22 -0
+ BitKeeper file /home/loki/ntp_gsoc/2_damir_code/ntp-stable-unity/tests/ntpd/rc_cmdlength.c
+
+ tests/ntpd/rc_cmdlength.c@1.0 +0 -0
+
+ChangeSet@1.3523.3.5, 2015-07-09 09:03:46+00:00, stenn@psp-at1.ntp.org
+ tests/libntp/test_caltontp needs -lpthread. Harlan Stenn.
+
+ ChangeLog@1.1708.1.7 +1 -0
+ tests/libntp/test_caltontp needs -lpthread. Harlan Stenn.
+
+ tests/libntp/Makefile.am@1.85.1.2 +5 -0
+ tests/libntp/test_caltontp needs -lpthread. Harlan Stenn.
+
+ChangeSet@1.3523.3.4, 2015-07-09 03:42:45-04:00, stenn@deacon.udel.edu
+ Don't build sntp/libevent/sample/. Harlan Stenn.
+
+ ChangeLog@1.1708.1.6 +1 -0
+ Don't build sntp/libevent/sample/. Harlan Stenn.
+
+ sntp/libevent/Makefile.am@1.14 +1 -1
+ Don't build sntp/libevent/sample/. Harlan Stenn.
+
+ChangeSet@1.3523.3.3, 2015-07-09 06:06:50+00:00, stenn@psp-at1.ntp.org
+ Phase 1 deprecation of google test in tests/libntp/. Harlan Stenn.
+
+ ChangeLog@1.1708.1.5 +1 -0
+ Phase 1 deprecation of google test in tests/libntp/. Harlan Stenn.
+
+ tests/libntp/Makefile.am@1.85.1.1 +113 -408
+ Phase 1 deprecation of google test in tests/libntp/. Harlan Stenn.
+
+ChangeSet@1.3527, 2015-07-09 04:25:01+02:00, tomek@tomek-n56vz.(none)
+ lfptest.h:
+ now it uses NTP's conventions
+ ChangeLog:
+ add info about lfptest.h
+ test-libntp.c:
+ fixed formatting
+ sockaddrtest.h:
+ formatting fix
+ kodDatabase.c:
+ formatting, adding const, adding a missing library
+ ChangeLog:
+ added info about timespecops.c
+ kodFile.c:
+ formatting, changes to usage of unity macros to get better print messages, cleanup
+ crypto.c, lfptest.h:
+ cleanup
+ ChangeLog:
+ add info about test-libntp.c
+ timespecops.c:
+ further formatting changes
+ ChangeLog:
+ added info about timevalops.c
+ fileHandlingTest.h.in:
+ fixed buffer overflow problem and fixed one function that previously did nothing
+ timevalops.c:
+ fixed the order of includes, deleted unnecessary
+ packetProcessing.c:
+ formatting, sprintf->snprintf
+ packetHandling.c:
+ formatting, using better unity functions, using proper unity functions, deleting unused variable
+ keyFile.c:
+ formatting, using proper unity's macros
+ ChangeLog:
+ fileHandlingTest.h info
+ updating with info about sockaddrtest.h
+ timespecops.c:
+ forgot to delete one comment
+ ChangeLog:
+ added info about my code review changes in sntp/tests/
+ kodDatabase.c:
+ missed something in formatting
+ sntptest.h:
+ formatting
+ Many files:
+ autogenerated
+ kodDatabase.c:
+ added a header. now it's windows compliant too!
+ fileHandlingTest.h.in:
+ formatting, deleted unnecessary prints
+ timespecops.c:
+ fixed formatting, fixed the order of includes,
+ removed unnecessary comments, cleanup
+ utilities.c:
+ the order of includes, formatting, removing unnecessary comments, using proper unity assertions
+
+ ChangeLog@1.1723 +2 -1
+ fileHandlingTest.h info
+
+ ChangeLog@1.1722 +17 -0
+ added info about my code review changes in sntp/tests/
+
+ ChangeLog@1.1721 +1 -0
+ add info about test-libntp.c
+
+ ChangeLog@1.1720 +2 -0
+ updating with info about sockaddrtest.h
+
+ ChangeLog@1.1719 +1 -0
+ add info about lfptest.h
+
+ ChangeLog@1.1718 +2 -0
+ added info about timevalops.c
+
+ ChangeLog@1.1717 +3 -1
+ added info about timespecops.c
+
+ sntp/tests/crypto.c@1.7 +14 -8
+ cleanup
+
+ sntp/tests/fileHandlingTest.h.in@1.13 +6 -6
+ fixed buffer overflow problem and fixed one function that previously did nothing
+
+ sntp/tests/fileHandlingTest.h.in@1.12 +13 -39
+ formatting, deleted unnecessary prints
+
+ sntp/tests/keyFile.c@1.5 +33 -24
+ formatting, using proper unity's macros
+
+ sntp/tests/kodDatabase.c@1.6 +1 -1
+ added a header. now it's windows compliant too!
+
+ sntp/tests/kodDatabase.c@1.5 +1 -2
+ missed something in formatting
+
+ sntp/tests/kodDatabase.c@1.4 +39 -31
+ formatting, adding const, adding a missing library
+
+ sntp/tests/kodFile.c@1.7 +34 -32
+ formatting, changes to usage of unity macros to get better print messages, cleanup
+
+ sntp/tests/packetHandling.c@1.4 +46 -31
+ formatting, using better unity functions, using proper unity functions, deleting unused variable
+
+ sntp/tests/packetProcessing.c@1.6 +67 -25
+ formatting, sprintf->snprintf
+
+ sntp/tests/run-crypto.c@1.3 +6 -6
+ autogenerated
+
+ sntp/tests/run-keyFile.c@1.6 +5 -5
+ autogenerated
+
+ sntp/tests/run-kodDatabase.c@1.4 +5 -5
+ autogenerated
+
+ sntp/tests/run-kodDatabase.c@1.3 +4 -4
+ autogenerated
+
+ sntp/tests/run-kodFile.c@1.4 +5 -5
+ autogenerated
+
+ sntp/tests/run-packetHandling.c@1.3 +10 -10
+ autogenerated
+
+ sntp/tests/run-packetProcessing.c@1.4 +18 -18
+ autogenerated
+
+ sntp/tests/run-utilities.c@1.3 +7 -7
+ autogenerated
+
+ sntp/tests/sntptest.h@1.5 +9 -3
+ formatting
+
+ sntp/tests/utilities.c@1.3 +38 -20
+ the order of includes, formatting, removing unnecessary comments, using proper unity assertions
+
+ tests/libntp/lfptest.h@1.4.1.2 +2 -3
+ now it uses NTP's conventions
+
+ tests/libntp/lfptest.h@1.4.1.1 +7 -16
+ cleanup
+
+ tests/libntp/run-timespecops.c@1.5.1.3 +28 -28
+ autogenerated
+
+ tests/libntp/run-timespecops.c@1.5.1.2 +28 -28
+ autogenerated
+
+ tests/libntp/run-timespecops.c@1.5.1.1 +28 -28
+ autogenerated
+
+ tests/libntp/run-timevalops.c@1.7.1.1 +28 -28
+ autogenerated
+
+ tests/libntp/sockaddrtest.h@1.5 +6 -5
+ formatting fix
+
+ tests/libntp/test-libntp.c@1.10 +6 -11
+ fixed formatting
+
+ tests/libntp/timespecops.c@1.5.1.3 +7 -6
+ further formatting changes
+
+ tests/libntp/timespecops.c@1.5.1.2 +0 -1
+ forgot to delete one comment
+
+ tests/libntp/timespecops.c@1.5.1.1 +129 -85
+ fixed formatting, fixed the order of includes,
+ removed unnecessary comments, cleanup
+
+ tests/libntp/timevalops.c@1.8.1.1 +137 -87
+ fixed the order of includes, deleted unnecessary
+
+ChangeSet@1.3523.3.2, 2015-07-07 01:27:49+00:00, stenn@psp-at1.ntp.org
+ sntp/unity/unity.c: Clean up a printf(). Harlan Stenn
+
+ ChangeLog@1.1708.1.4 +1 -0
+ sntp/unity/unity.c: Clean up a printf(). Harlan Stenn
+
+ sntp/unity/unity.c@1.3 +1 -3
+ sntp/unity/unity.c: Clean up a printf(). Harlan Stenn
+
+ChangeSet@1.3523.3.1, 2015-07-07 01:21:36+00:00, stenn@psp-at1.ntp.org
+ [Bug 2873] libevent should not include .deps/ in the tarball. H.Stenn
+
+ ChangeLog@1.1708.1.3 +1 -0
+ [Bug 2873] libevent should not include .deps/ in the tarball. H.Stenn
+
+ sntp/Makefile.am@1.85 +1 -1
+ [Bug 2873] libevent should not include .deps/ in the tarball. H.Stenn
+
+ChangeSet@1.3523.2.2, 2015-07-06 20:30:39+05:30, loki@dadasgift.(none)
+ code review changes
+
+ tests/libntp/lfptest.h@1.5 +7 -6
+
+ tests/libntp/strtolfp.c@1.3 +20 -19
+
+ChangeSet@1.3514.1.2, 2015-07-06 19:55:50+05:30, loki@dadasgift.(none)
+ Code review changes
+
+ tests/libntp/decodenetnum.c@1.2.1.1 +13 -9
+
+ tests/libntp/hextolfp.c@1.4.1.1 +0 -1
+
+ tests/libntp/lfptostr.c@1.2.1.1 +23 -12
+
+ tests/libntp/netof.c@1.4 +9 -6
+
+ tests/libntp/octtoint.c@1.4 +14 -7
+
+ tests/libntp/socktoa.c@1.4 +16 -13
+
+ChangeSet@1.3523.1.3, 2015-07-06 08:37:13+00:00, stenn@psp-at1.ntp.org
+ [Bug 2874] Don't distribute generated sntp/tests/fileHandlingTest.h. H.Stenn
+
+ ChangeLog@1.1708.1.2 +1 -0
+ [Bug 2874] Don't distribute generated sntp/tests/fileHandlingTest.h. H.Stenn
+
+ sntp/tests/Makefile.am@1.60 +0 -1
+ [Bug 2874] Don't distribute generated sntp/tests/fileHandlingTest.h. H.Stenn
+
+ChangeSet@1.3523.1.2, 2015-07-06 08:31:19+00:00, stenn@psp-at1.ntp.org
+ update tests/libntp/run-lfpfunc.c
+
+ tests/libntp/run-lfpfunc.c@1.13 +9 -9
+ update
+
+ChangeSet@1.3523.1.1, 2015-07-06 05:48:25+00:00, stenn@psp-at1.ntp.org
+ sntp/unity/Makefile.am: fix some broken paths. Harlan Stenn.
+
+ ChangeLog@1.1708.1.1 +1 -0
+ sntp/unity/Makefile.am: fix some broken paths. Harlan Stenn.
+
+ sntp/tests/Makefile.am@1.59 +4 -4
+ sntp/unity/Makefile.am: fix some broken paths. Harlan Stenn.
+
+ChangeSet@1.3524, 2015-07-05 23:58:57+02:00, tomek@tomek-n56vz.(none)
+ vi64ops.c:
+ deleted a comment
+ ymd2yd.c:
+ fixed formatting, deleted empty setUp() and tearDown()
+ ssl_init.c:
+ fixed formatting
+ ChangeLog:
+ updated the changes to vi64ops.c
+ vi64ops.c:
+ fixed formatting (trailing spaces, the order of includes, return type of a function in a new line)
+ ChangeLog:
+ info about tvtots.c
+ ymd2yd.c:
+ removed an include
+ ChangeLog:
+ info about ymd2yd.c
+ uglydate.c:
+ removed an unnecessary include
+ ChangeLog:
+ info about uglydate.c
+ statestr.c:
+ deleted unnecessary empty functions, fixed formatting, removed an unnecessary include
+ ChangeLog:
+ info about vi64ops.c
+ tvtots.c:
+ fixed a bug, fixed formatting
+ Many files:
+ autogenerated
+
+ ChangeLog@1.1714 +2 -3
+ info about ymd2yd.c
+
+ ChangeLog@1.1713 +2 -0
+ info about ymd2yd.c
+
+ ChangeLog@1.1712 +2 -1
+ updated the changes to vi64ops.c
+
+ ChangeLog@1.1711 +1 -0
+ info about vi64ops.c
+
+ ChangeLog@1.1710 +1 -0
+ info about uglydate.c
+
+ ChangeLog@1.1709 +4 -0
+ info about tvtots.c
+
+ tests/libntp/run-ssl_init.c@1.6 +5 -5
+ autogenerated
+
+ tests/libntp/run-statestr.c@1.7 +5 -4
+ autogenerated
+
+ tests/libntp/run-tvtots.c@1.3 +4 -3
+ autogenerated
+
+ tests/libntp/run-uglydate.c@1.8 +2 -1
+ autogenerated
+
+ tests/libntp/run-vi64ops.c@1.5 +3 -3
+ autogenerated
+
+ tests/libntp/run-ymd2yd.c@1.8 +4 -4
+ autogenerated
+
+ tests/libntp/run-ymd2yd.c@1.7 +5 -4
+ autogenerated
+
+ tests/libntp/ssl_init.c@1.7 +11 -6
+ fixed formatting
+
+ tests/libntp/statestr.c@1.4 +12 -15
+ deleted unnecessary empty functions, fixed formatting, removed an unnecessary include
+
+ tests/libntp/tvtots.c@1.4 +12 -5
+ fixed a bug, fixed formatting
+
+ tests/libntp/uglydate.c@1.6 +0 -1
+ removed an unnecessary include
+
+ tests/libntp/vi64ops.c@1.5 +1 -1
+ deleted a comment
+
+ tests/libntp/vi64ops.c@1.4 +17 -14
+ fixed formatting (trailing spaces, the order of includes, return type of a function in a new line)
+
+ tests/libntp/ymd2yd.c@1.5 +0 -1
+ removed an include
+
+ tests/libntp/ymd2yd.c@1.4 +14 -16
+ fixed formatting, deleted empty setUp() and tearDown()
+
+ChangeSet@1.3523, 2015-07-05 18:41:36+02:00, tomek@tomek-n56vz.(none)
+ refnumtoa.c:
+ fixed formatting
+ numtoa.c:
+ remove unnecessary empty functions, fix formatting
+ lfpfunc.c:
+ remove unnecessary include, remove old comments, fix formatting, cleanup
+ numtohost.c:
+ added const, fixed formatting
+ lfptostr.c:
+ fix formatting, delete an include
+ lfpfunc.c:
+ removed an endline
+ ChangeLog:
+ update with new changes to numtoa.c
+ numtoa.c:
+ added "const"
+ ChangeLog:
+ changes with numtohost.c
+ added changes to lfpfunc.c
+ add info about numtoa.c
+ updated with modetoa.c changes
+ add info about lfptostr.c
+ msyslog.c, modetoa.c:
+ fix formatting
+ Many files:
+ autogenerated
+ ChangeLog:
+ add info about msyslog.c
+ lfpfunc.c:
+ added spaces after the commas
+ ChangeLog:
+ updated info about refnumtoa.c
+
+ ChangeLog@1.1708 +1 -0
+ updated info about refnumtoa.c
+
+ ChangeLog@1.1707 +1 -0
+ changes with numtohost.c
+
+ ChangeLog@1.1706 +2 -2
+ update with new changes to numtoa.c
+
+ ChangeLog@1.1705 +2 -0
+ add info about numtoa.c
+
+ ChangeLog@1.1704 +1 -0
+ add info about msyslog.c
+
+ ChangeLog@1.1703 +1 -0
+ updated with modetoa.c changes
+
+ ChangeLog@1.1702 +3 -1
+ add info about lfptostr.c
+
+ ChangeLog@1.1701 +2 -0
+ added changes to lfpfunc.c
+
+ tests/libntp/lfpfunc.c@1.11 +0 -2
+ removed an endline
+
+ tests/libntp/lfpfunc.c@1.10 +55 -55
+ added spaces after the commas
+
+ tests/libntp/lfpfunc.c@1.9 +100 -188
+ remove unnecessary include, remove old comments, fix formatting, cleanup
+
+ tests/libntp/lfptostr.c@1.3 +20 -13
+ fix formatting, delete an include
+
+ tests/libntp/modetoa.c@1.6 +5 -5
+ fix formatting
+
+ tests/libntp/msyslog.c@1.5 +11 -2
+ fix formatting
+
+ tests/libntp/numtoa.c@1.5 +3 -3
+ added "const"
+
+ tests/libntp/numtoa.c@1.4 +12 -20
+ remove unnecessary empty functions, fix formatting
+
+ tests/libntp/numtohost.c@1.4 +3 -4
+ added const, fixed formatting
+
+ tests/libntp/refnumtoa.c@1.4 +10 -12
+ fixed formatting
+
+ tests/libntp/run-lfpfunc.c@1.12 +9 -9
+ autogenerated
+
+ tests/libntp/run-lfptostr.c@1.3 +11 -10
+ autogenerated
+
+ tests/libntp/run-modetoa.c@1.8 +2 -1
+ autogenerated
+
+ tests/libntp/run-msyslog.c@1.5 +8 -8
+ autogenerated
+
+ tests/libntp/run-numtoa.c@1.7 +3 -2
+ autogenerated
+
+ tests/libntp/run-numtohost.c@1.7 +1 -0
+ autogenerated
+
+ tests/libntp/run-refnumtoa.c@1.5 +1 -1
+ autogenerated
+
+ChangeSet@1.3514.2.2, 2015-07-04 21:58:49+00:00, stenn@psp-at1.ntp.org
+ sntp/libevent/evconfig-private.h: remove generated filefrom SCM. H.Stenn.
+
+ BitKeeper/deleted/42/evconfig-private.h~c311ed41afa56d3b@1.2 +0 -0
+ Delete: sntp/libevent/evconfig-private.h
+
+ ChangeLog@1.1695.1.2 +1 -0
+ sntp/libevent/evconfig-private.h: remove generated filefrom SCM. H.Stenn.
+
+ChangeSet@1.3514.2.1, 2015-07-04 21:44:33+00:00, stenn@psp-at1.ntp.org
+ sntp/unity/unity_config.h: Distribute it. Harlan Stenn.
+
+ ChangeLog@1.1695.1.1 +1 -0
+ sntp/unity/unity_config.h: Distribute it. Harlan Stenn.
+
+ sntp/unity/Makefile.am@1.6.1.1 +1 -0
+ sntp/unity/unity_config.h: Distribute it. Harlan Stenn.
+
+ChangeSet@1.3513.1.1, 2015-07-04 23:32:08+02:00, viperus@ubuntu.(none)
+ timevalops.c:
+ added timevaltoa() and fixed the printfs
+ timespecops.c:
+ added timespectoa() and fixed the printfs
+
+ tests/libntp/run-timespecops.c@1.6 +28 -28
+
+ tests/libntp/run-timevalops.c@1.8 +28 -28
+
+ tests/libntp/timespecops.c@1.6 +58 -1
+ added timespectoa() and fixed the printfs
+
+ tests/libntp/timevalops.c@1.9 +53 -1
+ added timevaltoa() and fixed the printfs
+
+ChangeSet@1.3520, 2015-07-04 14:10:34+00:00, tflendrich@psp-deb1.ntp.org
+ ChangeLog:
+ updated my changes
+
+ ChangeLog@1.1698 +1 -0
+ updated my changs
+
+ChangeSet@1.3519, 2015-07-04 15:41:50+02:00, tomek@tomek-n56vz.(none)
+ ChangeLog:
+ updated to match my changes
+
+ ChangeLog@1.1697 +3 -3
+ updated to match my changes
+
+ChangeSet@1.3518, 2015-07-04 15:39:51+02:00, tomek@tomek-n56vz.(none)
+ humandate.c:
+ reordered code so that it is C90-compilant, renamed variables so that they are different that function names, fixed formatting to match NTP's convention
+ hextolfp.c:
+ removed a trailing endline, changed formatting to match NTP's convention,
+ decodenetnum.c:
+ changed the order of imports, removed an unnecessary import, removed a trailing space, changed the return type from a function to be in a new line
+ run-humandate.c, run-hextolfp.c, run-decodenetnum.c:
+ autogenerated
+
+ tests/libntp/decodenetnum.c@1.3 +16 -11
+ changed the order of imports, removed an unnecessary import, removed a trailing space, changed the return type from a function to be in a new line
+
+ tests/libntp/hextolfp.c@1.5 +12 -7
+ removed a trailing endline, changed formatting to match NTP's convention,
+
+ tests/libntp/humandate.c@1.4 +11 -9
+ reordered code so that it is C90-compilant, renamed variables so that they are different that function names, fixed formatting to match NTP's convention
+
+ tests/libntp/run-decodenetnum.c@1.4 +5 -5
+ autogenerated
+
+ tests/libntp/run-hextolfp.c@1.5 +6 -6
+ autogenerated
+
+ tests/libntp/run-humandate.c@1.3 +3 -2
+ autogenerated
+
+ChangeSet@1.3517, 2015-07-04 12:38:08+00:00, tflendrich@psp-deb1.ntp.org
+ Makefile.am:
+ adding a forgotten header, so that "make distcheck" works
+
+ sntp/unity/Makefile.am@1.7 +1 -0
+ adding a forgotten header, so that "make distcheck" works
+
+ChangeSet@1.3516, 2015-07-04 11:55:26+00:00, tflendrich@psp-deb1.ntp.org
+ ChangeLog:
+ updated with my changes
+
+ ChangeLog@1.1696 +4 -0
+ updated with my changes
+
+ChangeSet@1.3499.1.1, 2015-07-04 13:39:28+02:00, tomek@tomek-n56vz.(none)
+ buftvtots.c:
+ fix formatting, declarations before code (C90)
+ authkeys.c:
+ fixed formatting, removed unnecessary comment
+ calendar.c:
+ further cleanup: deleted unnecessary comments, made first declaration, then code
+ clocktime.c:
+ removed comments, fixed formatting
+ a_md5encrypt.c:
+ fix formatting, add (void) as argument to a function etc
+ caltontp.c:
+ fixed the order of #includes
+ run-buftvtots.c, run-a_md5encrypt.c:
+ adding autogenerated file
+ calendar.c:
+ deleted comments, fixed formatting, used snprintf instead of sprintf, change variable names to be meaningful,
+ caljulian.c:
+ changed sprintf to snprintf, fixed formatting etc
+ a_md5encrypt.c:
+ changed to first declaration, then code (C90 compatibility)
+ Many files:
+ autogenerated
+ authkeys.c:
+ further changes of formatting
+
+ tests/libntp/a_md5encrypt.c@1.9 +8 -3
+ changed to first declaration, then code (C90 compatibility)
+
+ tests/libntp/a_md5encrypt.c@1.8 +17 -21
+ fix formatting, add (void) as argument to a function etc
+
+ tests/libntp/authkeys.c@1.8 +20 -10
+ further changes of formatting
+
+ tests/libntp/authkeys.c@1.7 +5 -11
+ fixed formatting, removed unnecessary comment
+
+ tests/libntp/buftvtots.c@1.2 +10 -7
+ fix formatting, declarations before code (C90)
+
+ tests/libntp/calendar.c@1.4 +12 -7
+ further cleanup: deleted unnecessary comments, made first declaration, then code
+
+ tests/libntp/calendar.c@1.3 +121 -114
+ deleted comments, fixed formatting, used snprintf instead of sprintf, change variable names to be meaningful,
+
+ tests/libntp/caljulian.c@1.7 +41 -39
+ changed sprintf to snprintf, fixed formatting etc
+
+ tests/libntp/caltontp.c@1.2 +1 -1
+ fixed the order of #includes
+
+ tests/libntp/clocktime.c@1.4 +24 -15
+ removed comments, fixed formatting
+
+ tests/libntp/run-a_md5encrypt.c@1.11 +4 -4
+ adding autogenerated file
+
+ tests/libntp/run-a_md5encrypt.c@1.10 +10 -10
+ adding autogenerated file
+
+ tests/libntp/run-authkeys.c@1.8 +6 -5
+ autogenerated
+
+ tests/libntp/run-buftvtots.c@1.2 +9 -8
+ adding autogenerated file
+
+ tests/libntp/run-calendar.c@1.5 +10 -10
+ autogenerated
+
+ tests/libntp/run-calendar.c@1.4 +22 -21
+ autogenerated
+
+ tests/libntp/run-caljulian.c@1.9 +7 -7
+ autogenerated
+
+ tests/libntp/run-caltontp.c@1.2 +1 -0
+ autogenerated
+
+ tests/libntp/run-clocktime.c@1.5 +17 -16
+ autogenerated
+
+ChangeSet@1.3514, 2015-07-04 10:24:57+00:00, viperus@psp-at1.ntp.org
+ cleanup
+
+ ChangeLog@1.1695 +2 -3
+ cleanup
+
+ChangeSet@1.3512, 2015-07-04 12:19:42+02:00, viperus@ubuntu.(none)
+ fixes to unsigned printing in timespecops.c and timevalops.c
+
+ tests/libntp/timespecops.c@1.5 +1 -1
+
+ tests/libntp/timevalops.c@1.8 +1 -1
+
+ChangeSet@1.3511, 2015-07-04 12:15:31+02:00, viperus@ubuntu.(none)
+ ChangeLog:
+ added my changes
+ timespecops.c:
+ many fixes, better printfs etc.
+ minor fixes to printf, formatting, etc.
+ timevalops.c:
+ minor fixes to printf, formatting, etc.
+
+ ChangeLog@1.1692.1.1 +3 -0
+ added my changes
+
+ tests/libntp/run-timespecops.c@1.5 +28 -28
+
+ tests/libntp/run-timevalops.c@1.7 +28 -28
+
+ tests/libntp/timespecops.c@1.4 +7 -13
+ many fixes, better printfs etc.
+ minor fixes to printf, formatting, etc.
+
+ tests/libntp/timevalops.c@1.7 +5 -9
+ minor fixes to printf, formatting, etc.
+
+ChangeSet@1.3509.1.1, 2015-07-04 09:34:18+00:00, stenn@psp-at1.ntp.org
+ [Bug 2866] segmentation fault at initgroups(). Harlan Stenn.
+
+ ChangeLog@1.1693 +1 -0
+ [Bug 2866] segmentation fault at initgroups(). Harlan Stenn.
+
+ ntpd/ntpd.c@1.160 +11 -4
+ [Bug 2866] segmentation fault at initgroups(). Harlan Stenn.
+
+ChangeSet@1.3510, 2015-07-04 11:27:04+02:00, viperus@ubuntu.(none)
+ sockaddrtest.h:
+ fully converted some tricky cout to printf (af_inet, sockaddr etc.)
+
+ tests/libntp/sockaddrtest.h@1.4 +3 -7
+ fully converted some tricky cout to printf (af_inet, sockaddr etc.)
+
+ChangeSet@1.3505.1.3, 2015-07-04 09:19:48+00:00, stenn@psp-at1.ntp.org
+ sntp/unity/unity_internals.h: handle *INTPTR_MAX on old Solaris. Harlan Stenn.
+
+ ChangeLog@1.1690.1.2 +1 -0
+ sntp/unity/unity_internals.h: handle *INTPTR_MAX on old Solaris. Harlan Stenn.
+
+ sntp/unity/unity_internals.h@1.4 +6 -6
+ sntp/unity/unity_internals.h: handle *INTPTR_MAX on old Solaris. Harlan Stenn.
+
+ChangeSet@1.3505.1.2, 2015-07-04 09:16:51+00:00, stenn@psp-at1.ntp.org
+ sntp/unity/unity_config.h: handle stdint.h. Harlan Stenn.
+
+ ChangeLog@1.1690.1.1 +1 -0
+ sntp/unity/unity_config.h: handle stdint.h. Harlan Stenn.
+
+ sntp/unity/unity_config.h@1.2 +4 -0
+ sntp/unity/unity_config.h: handle stdint.h. Harlan Stenn.
+
+ChangeSet@1.3508, 2015-07-04 09:11:47+00:00, stenn@psp-at1.ntp.org
+ tests/{libntp,ntpd} function parameter cleanup from Damir
+
+ ChangeLog@1.1691 +2 -0
+ tests/{libntp,ntpd} function parameter cleanup from Damir
+
+ChangeSet@1.3505.1.1, 2015-07-04 08:56:15+00:00, stenn@psp-at1.ntp.org
+ Update sntp/tests/run-crypto.c
+
+ sntp/tests/run-crypto.c@1.2 +6 -6
+ Update sntp/tests/run-crypto.c
+
+ChangeSet@1.3504.1.2, 2015-07-04 10:38:08+02:00, viperus@ubuntu.(none)
+ minor fixes, adding void, cleanup...
+
+ tests/libntp/a_md5encrypt.c@1.7.1.1 +5 -5
+
+ tests/libntp/atouint.c@1.4 +5 -5
+
+ tests/libntp/authkeys.c@1.6.1.1 +6 -6
+
+ tests/libntp/buftvtots.c@1.1.1.1 +4 -4
+
+ tests/libntp/calendar.c@1.2.1.1 +27 -32
+
+ tests/libntp/caljulian.c@1.6.1.1 +6 -8
+
+ tests/libntp/calyearstart.c@1.3 +6 -6
+
+ tests/libntp/clocktime.c@1.3.1.1 +10 -10
+
+ tests/libntp/lfpfunc.c@1.8 +9 -10
+
+ tests/libntp/lfptest.h@1.4 +2 -0
+
+ tests/libntp/msyslog.c@1.4 +0 -1
+
+ tests/libntp/refnumtoa.c@1.3 +2 -2
+
+ tests/libntp/run-a_md5encrypt.c@1.9.1.1 +5 -5
+
+ tests/libntp/run-atouint.c@1.7 +6 -5
+
+ tests/libntp/run-authkeys.c@1.7.1.1 +7 -6
+
+ tests/libntp/run-buftvtots.c@1.1.1.1 +5 -4
+
+ tests/libntp/run-calendar.c@1.3.1.1 +23 -22
+
+ tests/libntp/run-caljulian.c@1.8.1.1 +8 -8
+
+ tests/libntp/run-calyearstart.c@1.4 +4 -3
+
+ tests/libntp/run-clocktime.c@1.4.1.1 +9 -8
+
+ tests/libntp/run-lfpfunc.c@1.11 +17 -17
+
+ tests/libntp/run-msyslog.c@1.4 +8 -8
+
+ tests/libntp/run-refidsmear.c@1.3 +1 -1
+
+ tests/libntp/run-refnumtoa.c@1.4 +3 -2
+
+ tests/libntp/run-ssl_init.c@1.5 +6 -5
+
+ tests/libntp/run-timespecops.c@1.4 +29 -28
+
+ tests/libntp/run-timevalops.c@1.6 +29 -28
+
+ tests/libntp/run-vi64ops.c@1.4 +6 -6
+
+ tests/libntp/ssl_init.c@1.6 +5 -5
+
+ tests/libntp/timespecops.c@1.3 +28 -28
+
+ tests/libntp/timevalops.c@1.6 +37 -37
+
+ tests/libntp/vi64ops.c@1.3 +10 -11
+
+ChangeSet@1.3504.1.1, 2015-07-04 10:08:41+02:00, viperus@ubuntu.(none)
+ minor warning fixes, adding voids etc.
+
+ tests/ntpd/leapsec.c@1.3 +40 -45
+
+ tests/ntpd/run-leapsec.c@1.3 +66 -66
+
+ChangeSet@1.3505, 2015-07-04 08:08:23+00:00, stenn@psp-at1.ntp.org
+ sntp/tests/ function parameter list cleanup. Damir Tomi\xc4\x87.
+
+ ChangeLog@1.1690 +1 -0
+ sntp/tests/ function parameter list cleanup. Damir Tomi\xc4\x87.
+
+ChangeSet@1.3504, 2015-07-04 09:49:26+02:00, viperus@ubuntu.(none)
+ minor warning fixes like adding void etc.
+
+ sntp/tests/crypto.c@1.6 +1 -0
+
+ sntp/tests/keyFile.c@1.4 +5 -5
+
+ sntp/tests/kodDatabase.c@1.3 +5 -5
+
+ sntp/tests/kodFile.c@1.6 +8 -8
+
+ sntp/tests/packetProcessing.c@1.5 +2 -2
+
+ sntp/tests/run-keyFile.c@1.5 +6 -5
+
+ sntp/tests/run-kodDatabase.c@1.2 +6 -5
+
+ sntp/tests/run-kodFile.c@1.3 +7 -6
+
+ sntp/tests/run-utilities.c@1.2 +14 -14
+
+ sntp/tests/sntptest.h@1.4 +6 -3
+
+ sntp/tests/utilities.c@1.2 +7 -9
+
+ChangeSet@1.3503, 2015-07-04 07:25:15+00:00, stenn@psp-at1.ntp.org
+ top_srcdir can change based on ntp v. sntp. Harlan Stenn.
+
+ ChangeLog@1.1689 +1 -0
+ top_srcdir can change based on ntp v. sntp. Harlan Stenn.
+
+ sntp/tests/Makefile.am@1.58 +1 -1
+ top_srcdir can change based on ntp v. sntp. Harlan Stenn.
+
+ChangeSet@1.3502, 2015-07-04 00:44:41-04:00, stenn@deacon.udel.edu
+ On some versions of HP-UX, inttypes.h does not include stdint.h. H.Stenn.
+
+ ChangeLog@1.1688 +1 -0
+ On some versions of HP-UX, inttypes.h does not include stdint.h. H.Stenn.
+
+ include/ntp_types.h@1.35 +2 -1
+ On some versions of HP-UX, inttypes.h does not include stdint.h. H.Stenn.
+
+ChangeSet@1.3501, 2015-07-04 03:49:10+00:00, stenn@psp-at1.ntp.org
+ Phase 1 deprecation of google test in sntp/tests/. Harlan Stenn.
+
+ ChangeLog@1.1687 +1 -0
+ Phase 1 deprecation of google test in sntp/tests/. Harlan Stenn.
+
+ sntp/tests/Makefile.am@1.57 +20 -97
+ Phase 1 deprecation of google test in sntp/tests/. Harlan Stenn.
+
+ChangeSet@1.3500, 2015-07-03 20:30:06+00:00, stenn@psp-fb1.ntp.org
+ tests/ntpd/g_leapsec.cpp typo fix. Harlan Stenn.
+
+ ChangeLog@1.1686 +1 -0
+ tests/ntpd/g_leapsec.cpp typo fix. Harlan Stenn.
+
+ tests/ntpd/g_leapsec.cpp@1.16 +1 -1
+ tests/ntpd/g_leapsec.cpp typo fix. Harlan Stenn.
+
+ChangeSet@1.3498, 2015-07-03 19:27:53+00:00, stenn@psp-at1.ntp.org
+ Put Unity CPPFLAGS items in unity_config.h. Harlan Stenn.
+
+ ChangeLog@1.1685 +1 -0
+ Put Unity CPPFLAGS items in unity_config.h. Harlan Stenn.
+
+ sntp/tests/Makefile.am@1.56 +4 -2
+ Put Unity CPPFLAGS items in unity_config.h. Harlan Stenn.
+
+ sntp/unity/Makefile.am@1.6 +1 -1
+ Put Unity CPPFLAGS items in unity_config.h. Harlan Stenn.
+
+ sntp/unity/unity_config.h@1.1 +8 -0
+ BitKeeper file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity/sntp/unity/unity_config.h
+
+ sntp/unity/unity_config.h@1.0 +0 -0
+
+ tests/bug-2803/Makefile.am@1.13 +2 -0
+ Put Unity CPPFLAGS items in unity_config.h. Harlan Stenn.
+
+ tests/libntp/Makefile.am@1.83.1.1 +2 -4
+ Put Unity CPPFLAGS items in unity_config.h. Harlan Stenn.
+
+ tests/ntpd/Makefile.am@1.1.1.1 +2 -0
+ Put Unity CPPFLAGS items in unity_config.h. Harlan Stenn.
+
+ tests/sandbox/Makefile.am@1.5 +2 -0
+ Put Unity CPPFLAGS items in unity_config.h. Harlan Stenn.
+
+ tests/sandbox/smeartest.c@1.3.1.3 +12 -0
+ Put Unity CPPFLAGS items in unity_config.h. Harlan Stenn.
+
+ tests/sec-2853/Makefile.am@1.3 +2 -0
+ Put Unity CPPFLAGS items in unity_config.h. Harlan Stenn.
+
+ChangeSet@1.3497, 2015-07-03 09:30:02+00:00, stenn@psp-at1.ntp.org
+ libntp/emalloc.c: Remove explicit include of stdint.h. Harlan Stenn.
+
+ ChangeLog@1.1684 +1 -0
+ libntp/emalloc.c: Remove explicit include of stdint.h. Harlan Stenn.
+
+ libntp/emalloc.c@1.19 +0 -2
+ libntp/emalloc.c: Remove explicit include of stdint.h. Harlan Stenn.
+
+ChangeSet@1.3492.1.3, 2015-07-02 09:34:06+00:00, stenn@psp-at1.ntp.org
+ Fix ChangeLog
+
+ ChangeLog@1.1680.1.2 +3 -1
+ Fix ChangeLog
+
+ChangeSet@1.3495, 2015-07-02 09:32:14+00:00, stenn@psp-at1.ntp.org
+ Fix ChangeLog
+
+ ChangeLog@1.1682 +3 -1
+ Fix ChangeLog
+
+ChangeSet@1.3473.1.23, 2015-07-01 10:06:49+02:00, viperus@ubuntu.(none)
+ leapsec.c:
+ added include to fix everything, yey!
+ Makefile.am:
+ changed the order of libntp.a and libntpd.a, stuff builds now
+
+ tests/ntpd/Makefile.am@1.3 +11 -9
+ changed the order of libntp.a and libntpd.a, stuff builds now
+
+ tests/ntpd/leapsec.c@1.2 +8 -4
+ added include to fix everything, yey!
+
+ tests/ntpd/run-leapsec.c@1.2 +33 -33
+
+ChangeSet@1.3473.1.22, 2015-07-01 09:31:35+02:00, viperus@ubuntu.(none)
+ g_leapsec.cpp:
+ Rename: tests/ntpd/leapsec.cpp -> tests/ntpd/g_leapsec.cpp
+ run-leapsec.c, leapsec.c:
+ new file
+ Makefile.am:
+ added /tests/ntpd/ dir
+ unity tests
+ removed a comment line
+ g_ntpdtest.h:
+ Rename: tests/ntpd/ntpdtest.h -> tests/ntpd/g_ntpdtest.h
+ Makefile.am:
+ added support for unity tests
+ test-libntp.h:
+ added new headers
+ g_ntpdtest.cpp:
+ minor change in the header name
+ Rename: tests/ntpd/ntpdtest.cpp -> tests/ntpd/g_ntpdtest.cpp
+
+ tests/Makefile.am@1.9.1.1 +6 -5
+ added /tests/ntpd/ dir
+ unity tests
+
+ tests/libntp/Makefile.am@1.84 +0 -1
+ removed a comment line
+
+ tests/libntp/test-libntp.h@1.7 +5 -0
+ added new headers
+
+ tests/ntpd/Makefile.am@1.2 +62 -6
+ added support for unity tests
+
+ tests/ntpd/g_leapsec.cpp@1.15 +0 -0
+ Rename: tests/ntpd/leapsec.cpp -> tests/ntpd/g_leapsec.cpp
+
+ tests/ntpd/g_ntpdtest.cpp@1.3 +1 -1
+ minor change in the header name
+
+ tests/ntpd/g_ntpdtest.cpp@1.2 +0 -0
+ Rename: tests/ntpd/ntpdtest.cpp -> tests/ntpd/g_ntpdtest.cpp
+
+ tests/ntpd/g_ntpdtest.h@1.2 +0 -0
+ Rename: tests/ntpd/ntpdtest.h -> tests/ntpd/g_ntpdtest.h
+
+ tests/ntpd/leapsec.c@1.1 +1230 -0
+ BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/ntpd/leapsec.c
+
+ tests/ntpd/leapsec.c@1.0 +0 -0
+
+ tests/ntpd/run-leapsec.c@1.1 +116 -0
+ BitKeeper file /home/viperus/Desktop/ntp-stable-unity/tests/ntpd/run-leapsec.c
+
+ tests/ntpd/run-leapsec.c@1.0 +0 -0
+
+ChangeSet@1.3492.2.1, 2015-07-01 03:11:28-04:00, stenn@deacon.udel.edu
+ Update the repo's description and contact email
+
+ BitKeeper/etc/config@1.11 +2 -2
+ Update the repo's description and contact email
+
+ChangeSet@1.3492.1.1, 2015-07-01 08:53:24+02:00, jnperlin@hydra.(none)
+ [Bug 2867] ntpd with autokey active crashed by 'ntpq -crv'
+
+ ChangeLog@1.1680.1.1 +1 -0
+ [Bug 2867] ntpd with autokey active crashed by 'ntpq -crv'
+
+
+ ntpd/ntp_control.c@1.201 +5 -2
+ [Bug 2867] ntpd with autokey active crashed by 'ntpq -crv'
+ make sure 'ctl_var' table matches indices (CS_LEAPSMEAR* is unconditionally defined and affects AUTOKEY vars)
+
+ChangeSet@1.3493, 2015-07-01 08:40:44+02:00, jnperlin@nemesis.localnet
+ [Bug 2864] 4.2.8p3 fails to compile on Windows.
+ fixed project files. (tested with VS2008 and VS2013)
+
+ ChangeLog@1.1681 +1 -0
+ [Bug 2864] 4.2.8p3 fails to compile on Windows.
+ fix project files. (tested with VS2008 and VS2013)
+
+ ports/winnt/vs2005/ntpd.vcproj@1.20 +22 -0
+ [Bug 2864] 4.2.8p3 fails to compile on Windows.
+ fixed project files. (UNTESTED!)
+
+ ports/winnt/vs2008/ntpd/ntpd.vcproj@1.49 +4 -0
+ [Bug 2864] 4.2.8p3 fails to compile on Windows.
+ fixed project files. (tested)
+
+ ports/winnt/vs2013/ntpd/ntpd.vcxproj@1.7 +1 -0
+ [Bug 2864] 4.2.8p3 fails to compile on Windows.
+ fixed project files. (tested)
+
+ ports/winnt/vs2013/ntpd/ntpd.vcxproj.filters@1.5 +3 -0
+ [Bug 2864] 4.2.8p3 fails to compile on Windows.
+ fixed project files. (tested)
+
+ChangeSet@1.3492, 2015-06-29 16:52:34-04:00, stenn@deacon.udel.edu
+ Makefile.in should not be checked in
+
+ BitKeeper/deleted/bd/Makefile.in~a06c74c485656b20@1.3 +0 -0
+ Delete: tests/sec-2853/Makefile.in
+
ChangeSet@1.3491, 2015-06-29 16:34:44-04:00, stenn@deacon.udel.edu
NTP_4_2_8P3
TAG: NTP_4_2_8P3
@@ -344,7 +5257,16 @@ ChangeSet@1.3489, 2015-06-29 19:33:22+00:00, stenn@psp-at1.ntp.org
NEWS@1.144 +18 -3
NEWS file update for bug 2853
-ChangeSet@1.3473.1.40, 2015-06-29 06:00:52+00:00, stenn@psp-at1.ntp.org
+ChangeSet@1.3473.1.21, 2015-06-29 20:33:15+02:00, viperus@ubuntu.(none)
+ a_md5encrypt.c:
+ minor change to memory compare, suggested by Tomasz
+
+ tests/libntp/a_md5encrypt.c@1.7 +2 -1
+ minor change to memory compare, suggested by Tomasz
+
+ tests/libntp/run-a_md5encrypt.c@1.9 +5 -4
+
+ChangeSet@1.3473.3.23, 2015-06-29 06:00:52+00:00, stenn@psp-at1.ntp.org
html/miscopt.html: Document leapsmearinterval, other cleanup. Harlan Stenn.
ChangeLog@1.1666.1.19 +1 -0
@@ -353,7 +5275,7 @@ ChangeSet@1.3473.1.40, 2015-06-29 06:00:52+00:00, stenn@psp-at1.ntp.org
html/miscopt.html@1.82 +18 -15
html/miscopt.html: Document leapsmearinterval, other cleanup. Harlan Stenn.
-ChangeSet@1.3473.1.39, 2015-06-29 05:28:47+00:00, stenn@psp-at1.ntp.org
+ChangeSet@1.3473.3.22, 2015-06-29 05:28:47+00:00, stenn@psp-at1.ntp.org
ntpd/ntp.conf.def: Document DSCP and leapsmearinterval. Harlan Stenn.
ChangeLog@1.1666.1.18 +1 -0
@@ -383,14 +5305,14 @@ ChangeSet@1.3486, 2015-06-29 03:39:39+00:00, stenn@psp-at1.ntp.org
ChangeLog@1.1677 +2 -1
Updated entry for Sec 2853
-ChangeSet@1.3473.3.2, 2015-06-29 04:57:16+02:00, tomek@tomek-n56vz.(none)
+ChangeSet@1.3473.4.2, 2015-06-29 04:57:16+02:00, tomek@tomek-n56vz.(none)
ChangeLog:
moved a change to the proper place
ChangeLog@1.1666.2.2 +1 -1
moved a change to the proper place
-ChangeSet@1.3473.3.1, 2015-06-29 04:50:55+02:00, tomek@tomek-n56vz.(none)
+ChangeSet@1.3473.4.1, 2015-06-29 04:50:55+02:00, tomek@tomek-n56vz.(none)
ChangeLog:
updated my changes
msyslog.c:
@@ -407,7 +5329,7 @@ ChangeSet@1.3473.3.1, 2015-06-29 04:50:55+02:00, tomek@tomek-n56vz.(none)
tests/libntp/run-msyslog.c@1.3 +1 -0
checking in the autogenerated file
-ChangeSet@1.3473.1.37, 2015-06-29 01:16:44+00:00, stenn@psp-at1.ntp.org
+ChangeSet@1.3473.3.20, 2015-06-29 01:16:44+00:00, stenn@psp-at1.ntp.org
[Bug 2860] ntpq ifstats sanity check is too stringent. Frank Kardel.
ChangeLog@1.1666.1.16 +1 -0
@@ -419,13 +5341,13 @@ ChangeSet@1.3473.1.37, 2015-06-29 01:16:44+00:00, stenn@psp-at1.ntp.org
ntpq/ntpq-subs.c@1.109 +1 -1
[Bug 2860] ntpq ifstats sanity check is too stringent. Frank Kardel.
-ChangeSet@1.3473.1.36, 2015-06-29 01:13:38+00:00, stenn@psp-at1.ntp.org
+ChangeSet@1.3473.3.19, 2015-06-29 01:13:38+00:00, stenn@psp-at1.ntp.org
Update the NEWS file with info about README.leapsmear
NEWS@1.142 +2 -1
Update the NEWS file with info about README.leapsmear
-ChangeSet@1.3473.1.35, 2015-06-29 00:10:53+00:00, stenn@psp-at1.ntp.org
+ChangeSet@1.3473.3.18, 2015-06-29 00:10:53+00:00, stenn@psp-at1.ntp.org
README.leapsmear edited. Harlan Stenn.
ChangeLog@1.1666.1.15 +1 -0
@@ -434,7 +5356,7 @@ ChangeSet@1.3473.1.35, 2015-06-29 00:10:53+00:00, stenn@psp-at1.ntp.org
README.leapsmear@1.2 +240 -75
README.leapsmear edited. Harlan Stenn.
-ChangeSet@1.3473.1.34, 2015-06-28 21:20:27+00:00, stenn@psp-at1.ntp.org
+ChangeSet@1.3473.3.17, 2015-06-28 21:20:27+00:00, stenn@psp-at1.ntp.org
README.leapsmear added. Martin Burnicki.
ChangeLog@1.1666.1.14 +1 -0
@@ -448,19 +5370,19 @@ ChangeSet@1.3473.1.34, 2015-06-28 21:20:27+00:00, stenn@psp-at1.ntp.org
README.leapsmear@1.0 +0 -0
-ChangeSet@1.3473.1.33, 2015-06-27 23:05:51-04:00, stenn@deacon.udel.edu
+ChangeSet@1.3473.3.16, 2015-06-27 23:05:51-04:00, stenn@deacon.udel.edu
[Bug 2846] Report 'unsynchronized' status during the leap second. Fixed in Martin's changes to Bug 2855. Martin Burnicki.
ChangeLog@1.1666.1.13 +2 -0
[Bug 2846] Report 'unsynchronized' status during the leap second. Fixed in Martin's changes to Bug 2855. Martin Burnicki.
-ChangeSet@1.3473.1.32, 2015-06-27 21:34:55+00:00, stenn@psp-at1.ntp.org
+ChangeSet@1.3473.3.15, 2015-06-27 21:34:55+00:00, stenn@psp-at1.ntp.org
NEWS file update
NEWS@1.141 +12 -0
NEWS file update
-ChangeSet@1.3473.1.31, 2015-06-27 19:25:39+00:00, stenn@psp-at1.ntp.org
+ChangeSet@1.3473.3.14, 2015-06-27 19:25:39+00:00, stenn@psp-at1.ntp.org
[Bug 2859] Improve raw DCF77 robustness deconding. Frank Kardel.
ChangeLog@1.1666.1.12 +4 -0
@@ -487,7 +5409,7 @@ ChangeSet@1.3473.1.31, 2015-06-27 19:25:39+00:00, stenn@psp-at1.ntp.org
parseutil/testdcf.c@1.11 +1 -1
[Bug 2859] Improve raw DCF77 robustness deconding. Frank Kardel.
-ChangeSet@1.3473.1.30, 2015-06-27 05:21:56-04:00, stenn@deacon.udel.edu
+ChangeSet@1.3473.3.13, 2015-06-27 05:21:56-04:00, stenn@deacon.udel.edu
NTP_4_2_8P3_RC3
TAG: NTP_4_2_8P3_RC3
@@ -821,13 +5743,13 @@ ChangeSet@1.3473.1.30, 2015-06-27 05:21:56-04:00, stenn@deacon.udel.edu
util/ntp-keygen.mdoc.in@1.326 +2 -2
NTP_4_2_8P3_RC3
-ChangeSet@1.3473.1.29, 2015-06-27 04:45:02-04:00, stenn@deacon.udel.edu
+ChangeSet@1.3473.3.12, 2015-06-27 04:45:02-04:00, stenn@deacon.udel.edu
Update the NEWS file for 4.2.8p3-RC3
NEWS@1.140 +26 -0
Update the NEWS file for 4.2.8p3-RC3
-ChangeSet@1.3473.1.28, 2015-06-27 04:20:07-04:00, stenn@deacon.udel.edu
+ChangeSet@1.3473.3.11, 2015-06-27 04:20:07-04:00, stenn@deacon.udel.edu
html/drivers/driver22.html: typo fix. Harlan Stenn.
ChangeLog@1.1666.1.10 +1 -0
@@ -836,7 +5758,7 @@ ChangeSet@1.3473.1.28, 2015-06-27 04:20:07-04:00, stenn@deacon.udel.edu
html/drivers/driver22.html@1.23 +1 -1
html/drivers/driver22.html: typo fix. Harlan Stenn.
-ChangeSet@1.3473.1.27, 2015-06-27 02:22:09-04:00, stenn@deacon.udel.edu
+ChangeSet@1.3473.3.10, 2015-06-27 02:22:09-04:00, stenn@deacon.udel.edu
[Bug 2857] Stratus VOS does not support SIGIO. Paul Green.
ChangeLog@1.1666.1.9 +1 -0
@@ -848,7 +5770,7 @@ ChangeSet@1.3473.1.27, 2015-06-27 02:22:09-04:00, stenn@deacon.udel.edu
sntp/m4/ntp_libntp.m4@1.30 +9 -0
[Bug 2857] Stratus VOS does not support SIGIO. Paul Green.
-ChangeSet@1.3473.1.26, 2015-06-27 01:58:07-04:00, stenn@deacon.udel.edu
+ChangeSet@1.3473.3.9, 2015-06-27 01:58:07-04:00, stenn@deacon.udel.edu
[Bug 2856] ntpd should wait() on terminated child processes. Paul Green.
ChangeLog@1.1666.1.8 +1 -0
@@ -857,7 +5779,7 @@ ChangeSet@1.3473.1.26, 2015-06-27 01:58:07-04:00, stenn@deacon.udel.edu
libntp/work_fork.c@1.14 +23 -4
[Bug 2856] ntpd should wait() on terminated child processes. Paul Green.
-ChangeSet@1.3473.1.25, 2015-06-27 05:12:21+00:00, stenn@psp-at1.ntp.org
+ChangeSet@1.3473.3.8, 2015-06-27 05:12:21+00:00, stenn@psp-at1.ntp.org
[Bug 2855] Report leap smear in the REFID. Harlan Stenn.
ChangeLog@1.1666.1.7 +1 -0
@@ -866,7 +5788,7 @@ ChangeSet@1.3473.1.25, 2015-06-27 05:12:21+00:00, stenn@psp-at1.ntp.org
ntpd/ntp_proto.c@1.361 +8 -2
[Bug 2855] Report leap smear in the REFID. Harlan Stenn.
-ChangeSet@1.3473.1.24, 2015-06-27 04:53:42+00:00, stenn@psp-at1.ntp.org
+ChangeSet@1.3473.3.7, 2015-06-27 04:53:42+00:00, stenn@psp-at1.ntp.org
refidsmear test cleanup. Tomasz Flendrich.
ChangeLog@1.1666.1.6 +1 -0
@@ -875,14 +5797,14 @@ ChangeSet@1.3473.1.24, 2015-06-27 04:53:42+00:00, stenn@psp-at1.ntp.org
tests/libntp/refidsmear.c@1.4 +4 -5
refidsmear test cleanup. Tomasz Flendrich.
-ChangeSet@1.3473.1.23, 2015-06-27 06:44:17+02:00, tomek@tomek-n56vz.(none)
+ChangeSet@1.3473.3.6, 2015-06-27 06:44:17+02:00, tomek@tomek-n56vz.(none)
refidsmear.c:
moved assertions to proper places
tests/libntp/refidsmear.c@1.3 +4 -2
moved assertions to proper places
-ChangeSet@1.3473.1.22, 2015-06-27 04:46:21+02:00, tomek@tomek-n56vz.(none)
+ChangeSet@1.3473.3.5, 2015-06-27 04:46:21+02:00, tomek@tomek-n56vz.(none)
run-refidsmear.c:
updated autogenerated file
refidsmear.c:
@@ -894,7 +5816,7 @@ ChangeSet@1.3473.1.22, 2015-06-27 04:46:21+02:00, tomek@tomek-n56vz.(none)
tests/libntp/run-refidsmear.c@1.2 +1 -1
updated autogenerated file
-ChangeSet@1.3473.1.21, 2015-06-27 01:16:47+00:00, stenn@psp-at1.ntp.org
+ChangeSet@1.3473.3.4, 2015-06-27 01:16:47+00:00, stenn@psp-at1.ntp.org
refidsmear function support and tests. Harlan Stenn.
ChangeLog@1.1666.1.5 +1 -0
@@ -929,24 +5851,31 @@ ChangeSet@1.3473.1.21, 2015-06-27 01:16:47+00:00, stenn@psp-at1.ntp.org
tests/libntp/run-refidsmear.c@1.0 +0 -0
-ChangeSet@1.3473.1.20, 2015-06-26 22:45:16+00:00, stenn@psp-at1.ntp.org
+ChangeSet@1.3473.3.3, 2015-06-26 22:45:16+00:00, stenn@psp-at1.ntp.org
tests/sandbox/smeartest.c: Harlan Stenn, Damir Tomic, Juergen Perlinger.
ChangeLog@1.1666.1.4 +1 -0
tests/sandbox/smeartest.c: Harlan Stenn, Damir Tomic, Juergen Perlinger.
-ChangeSet@1.3473.1.19, 2015-06-26 20:10:51+00:00, stenn@psp-at1.ntp.org
+ChangeSet@1.3473.3.2, 2015-06-26 20:10:51+00:00, stenn@psp-at1.ntp.org
smeartest.c fixes from Harlan
- tests/sandbox/smeartest.c@1.5 +52 -1
+ tests/sandbox/smeartest.c@1.3.1.2 +52 -1
smeartest.c fixes from Harlan
-ChangeSet@1.3473.1.18, 2015-06-26 18:43:39+00:00, stenn@psp-at1.ntp.org
+ChangeSet@1.3473.3.1, 2015-06-26 18:43:39+00:00, stenn@psp-at1.ntp.org
smeartest.c fixes from Juergen, Damir, and Harlan
- tests/sandbox/smeartest.c@1.4 +26 -17
+ tests/sandbox/smeartest.c@1.3.1.1 +26 -17
smeartest.c fixes from Juergen, Damir, and Harlan
+ChangeSet@1.3473.1.18, 2015-06-26 15:17:10+02:00, viperus@ubuntu.(none)
+ smeartest.c:
+ maybed fixed both funtions, needs checking!!!
+
+ tests/sandbox/smeartest.c@1.4 +69 -26
+ maybed fixed both funtions, needs checking!!!
+
ChangeSet@1.3473.1.17, 2015-06-26 11:24:43+00:00, stenn@psp-at1.ntp.org
smeartest.c - Harlan Stenn
diff --git a/Makefile.am b/Makefile.am
index 11b20bfdb971..43f45edbfff2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,7 +23,7 @@ SUBDIRS = \
tests \
$(NULL)
-DISTCHECK_CONFIGURE_FLAGS = -C --with-sntp
+DISTCHECK_CONFIGURE_FLAGS = -C --with-sntp --enable-local-libevent $(NTP_DCF)
EXTRA_DIST = \
$(srcdir)/COPYRIGHT \
diff --git a/Makefile.in b/Makefile.in
index 4d71d85fd0d2..bc2327ff756f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -115,6 +115,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
$(top_srcdir)/sntp/m4/ntp_locinfo.m4 \
$(top_srcdir)/sntp/m4/ntp_openssl.m4 \
$(top_srcdir)/sntp/m4/ntp_pkg_config.m4 \
+ $(top_srcdir)/sntp/m4/ntp_problemtests.m4 \
$(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \
$(top_srcdir)/sntp/m4/ntp_rlimit.m4 \
$(top_srcdir)/sntp/m4/ntp_sntp.m4 \
@@ -262,6 +263,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_THREAD = @BUILD_THREAD@
CALC_TICKADJ_DB = @CALC_TICKADJ_DB@
CALC_TICKADJ_DL = @CALC_TICKADJ_DL@
CALC_TICKADJ_DS = @CALC_TICKADJ_DS@
@@ -270,6 +272,7 @@ CALC_TICKADJ_NI = @CALC_TICKADJ_NI@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
+CFLAGS_LIBEVENT = @CFLAGS_LIBEVENT@
CFLAGS_NTP = @CFLAGS_NTP@
CHUTEST = @CHUTEST@
CONFIG_SHELL = @CONFIG_SHELL@
@@ -331,6 +334,7 @@ LIBTOOL_DEPS = @LIBTOOL_DEPS@
LIPO = @LIPO@
LN_S = @LN_S@
LSCF = @LSCF@
+LTHREAD_LIBS = @LTHREAD_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MAKE_ADJTIMED = @MAKE_ADJTIMED@
@@ -539,7 +543,7 @@ SUBDIRS = \
tests \
$(NULL)
-DISTCHECK_CONFIGURE_FLAGS = -C --with-sntp
+DISTCHECK_CONFIGURE_FLAGS = -C --with-sntp --enable-local-libevent $(NTP_DCF)
EXTRA_DIST = \
$(srcdir)/COPYRIGHT \
ChangeLog \
diff --git a/NEWS b/NEWS
index 4e61d1b80bb7..e16d93700837 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,499 @@
---
+NTP 4.2.8p4
+
+Focus: Security, Bug fies, enhancements.
+
+Severity: MEDIUM
+
+In addition to bug fixes and enhancements, this release fixes the
+following 13 low- and medium-severity vulnerabilities:
+
+* Incomplete vallen (value length) checks in ntp_crypto.c, leading
+ to potential crashes or potential code injection/information leakage.
+
+ References: Sec 2899, Sec 2671, CVE-2015-7691, CVE-2015-7692, CVE-2015-7702
+ Affects: All ntp-4 releases up to, but not including 4.2.8p4,
+ and 4.3.0 up to, but not including 4.3.77
+ CVSS: (AV:N/AC:H/Au:M/C:N/I:N/A:C) Base Score: 4.6
+ Summary: The fix for CVE-2014-9750 was incomplete in that there were
+ certain code paths where a packet with particular autokey operations
+ that contained malicious data was not always being completely
+ validated. Receipt of these packets can cause ntpd to crash.
+ Mitigation:
+ Don't use autokey.
+ Upgrade to 4.2.8p4, or later, from the NTP Project Download
+ Page or the NTP Public Services Project Download Page
+ Monitor your ntpd instances.
+ Credit: This weakness was discovered by Tenable Network Security.
+
+* Clients that receive a KoD should validate the origin timestamp field.
+
+ References: Sec 2901 / CVE-2015-7704, CVE-2015-7705
+ Affects: All ntp-4 releases up to, but not including 4.2.8p4,
+ and 4.3.0 up to, but not including 4.3.77
+ CVSS: (AV:N/AC:M/Au:N/C:N/I:N/A:P) Base Score: 4.3-5.0 at worst
+ Summary: An ntpd client that honors Kiss-of-Death responses will honor
+ KoD messages that have been forged by an attacker, causing it to
+ delay or stop querying its servers for time updates. Also, an
+ attacker can forge packets that claim to be from the target and
+ send them to servers often enough that a server that implements
+ KoD rate limiting will send the target machine a KoD response to
+ attempt to reduce the rate of incoming packets, or it may also
+ trigger a firewall block at the server for packets from the target
+ machine. For either of these attacks to succeed, the attacker must
+ know what servers the target is communicating with. An attacker
+ can be anywhere on the Internet and can frequently learn the
+ identity of the target's time source by sending the target a
+ time query.
+ Mitigation:
+ Implement BCP-38.
+ Upgrade to 4.2.8p4, or later, from the NTP Project Download Page
+ or the NTP Public Services Project Download Page
+ If you can't upgrade, restrict who can query ntpd to learn who
+ its servers are, and what IPs are allowed to ask your system
+ for the time. This mitigation is heavy-handed.
+ Monitor your ntpd instances.
+ Note:
+ 4.2.8p4 protects against the first attack. For the second attack,
+ all we can do is warn when it is happening, which we do in 4.2.8p4.
+ Credit: This weakness was discovered by Aanchal Malhotra,
+ Issac E. Cohen, and Sharon Goldberg of Boston University.
+
+* configuration directives to change "pidfile" and "driftfile" should
+ only be allowed locally.
+
+ References: Sec 2902 / CVE-2015-5196
+ Affects: All ntp-4 releases up to, but not including 4.2.8p4,
+ and 4.3.0 up to, but not including 4.3.77
+ CVSS: (AV:N/AC:H/Au:M/C:N/I:C/A:C) Base Score: 6.2 worst case
+ Summary: If ntpd is configured to allow for remote configuration,
+ and if the (possibly spoofed) source IP address is allowed to
+ send remote configuration requests, and if the attacker knows
+ the remote configuration password, it's possible for an attacker
+ to use the "pidfile" or "driftfile" directives to potentially
+ overwrite other files.
+ Mitigation:
+ Implement BCP-38.
+ Upgrade to 4.2.8p4, or later, from the NTP Project Download
+ Page or the NTP Public Services Project Download Page
+ If you cannot upgrade, don't enable remote configuration.
+ If you must enable remote configuration and cannot upgrade,
+ remote configuration of NTF's ntpd requires:
+ - an explicitly configured trustedkey, and you should also
+ configure a controlkey.
+ - access from a permitted IP. You choose the IPs.
+ - authentication. Don't disable it. Practice secure key safety.
+ Monitor your ntpd instances.
+ Credit: This weakness was discovered by Miroslav Lichvar of Red Hat.
+
+* Slow memory leak in CRYPTO_ASSOC
+
+ References: Sec 2909 / CVE-2015-7701
+ Affects: All ntp-4 releases that use autokey up to, but not
+ including 4.2.8p4, and 4.3.0 up to, but not including 4.3.77
+ CVSS: (AV:N/AC:H/Au:M/C:N/I:N/A:C) Base Score: 0.0 best/usual case,
+ 4.6 otherwise
+ Summary: If ntpd is configured to use autokey, then an attacker can
+ send packets to ntpd that will, after several days of ongoing
+ attack, cause it to run out of memory.
+ Mitigation:
+ Don't use autokey.
+ Upgrade to 4.2.8p4, or later, from the NTP Project Download
+ Page or the NTP Public Services Project Download Page
+ Monitor your ntpd instances.
+ Credit: This weakness was discovered by Tenable Network Security.
+
+* mode 7 loop counter underrun
+
+ References: Sec 2913 / CVE-2015-7848 / TALOS-CAN-0052
+ Affects: All ntp-4 releases up to, but not including 4.2.8p4,
+ and 4.3.0 up to, but not including 4.3.77
+ CVSS: (AV:N/AC:H/Au:M/C:N/I:N/A:C) Base Score: 4.6
+ Summary: If ntpd is configured to enable mode 7 packets, and if the
+ use of mode 7 packets is not properly protected thru the use of
+ the available mode 7 authentication and restriction mechanisms,
+ and if the (possibly spoofed) source IP address is allowed to
+ send mode 7 queries, then an attacker can send a crafted packet
+ to ntpd that will cause it to crash.
+ Mitigation:
+ Implement BCP-38.
+ Upgrade to 4.2.8p4, or later, from the NTP Project Download
+ Page or the NTP Public Services Project Download Page.
+ If you are unable to upgrade:
+ In ntp-4.2.8, mode 7 is disabled by default. Don't enable it.
+ If you must enable mode 7:
+ configure the use of a requestkey to control who can issue
+ mode 7 requests.
+ configure restrict noquery to further limit mode 7 requests
+ to trusted sources.
+ Monitor your ntpd instances.
+Credit: This weakness was discovered by Aleksandar Nikolic of Cisco Talos.
+
+* memory corruption in password store
+
+ References: Sec 2916 / CVE-2015-7849 / TALOS-CAN-0054
+ Affects: All ntp-4 releases up to, but not including 4.2.8p4, and 4.3.0 up to, but not including 4.3.77
+ CVSS: (AV:N/AC:H/Au:M/C:N/I:C/A:C) Base Score: 6.8, worst case
+ Summary: If ntpd is configured to allow remote configuration, and if
+ the (possibly spoofed) source IP address is allowed to send
+ remote configuration requests, and if the attacker knows the
+ remote configuration password or if ntpd was configured to
+ disable authentication, then an attacker can send a set of
+ packets to ntpd that may cause a crash or theoretically
+ perform a code injection attack.
+ Mitigation:
+ Implement BCP-38.
+ Upgrade to 4.2.8p4, or later, from the NTP Project Download
+ Page or the NTP Public Services Project Download Page.
+ If you are unable to upgrade, remote configuration of NTF's
+ ntpd requires:
+ an explicitly configured "trusted" key. Only configure
+ this if you need it.
+ access from a permitted IP address. You choose the IPs.
+ authentication. Don't disable it. Practice secure key safety.
+ Monitor your ntpd instances.
+ Credit: This weakness was discovered by Yves Younan of Cisco Talos.
+
+* Infinite loop if extended logging enabled and the logfile and
+ keyfile are the same.
+
+ References: Sec 2917 / CVE-2015-7850 / TALOS-CAN-0055
+ Affects: All ntp-4 releases up to, but not including 4.2.8p4,
+ and 4.3.0 up to, but not including 4.3.77
+ CVSS: (AV:N/AC:H/Au:M/C:N/I:N/A:C) Base Score: 4.6, worst case
+ Summary: If ntpd is configured to allow remote configuration, and if
+ the (possibly spoofed) source IP address is allowed to send
+ remote configuration requests, and if the attacker knows the
+ remote configuration password or if ntpd was configured to
+ disable authentication, then an attacker can send a set of
+ packets to ntpd that will cause it to crash and/or create a
+ potentially huge log file. Specifically, the attacker could
+ enable extended logging, point the key file at the log file,
+ and cause what amounts to an infinite loop.
+ Mitigation:
+ Implement BCP-38.
+ Upgrade to 4.2.8p4, or later, from the NTP Project Download
+ Page or the NTP Public Services Project Download Page.
+ If you are unable to upgrade, remote configuration of NTF's ntpd
+ requires:
+ an explicitly configured "trusted" key. Only configure this
+ if you need it.
+ access from a permitted IP address. You choose the IPs.
+ authentication. Don't disable it. Practice secure key safety.
+ Monitor your ntpd instances.
+ Credit: This weakness was discovered by Yves Younan of Cisco Talos.
+
+* Potential path traversal vulnerability in the config file saving of
+ ntpd on VMS.
+
+ References: Sec 2918 / CVE-2015-7851 / TALOS-CAN-0062
+ Affects: All ntp-4 releases running under VMS up to, but not
+ including 4.2.8p4, and 4.3.0 up to, but not including 4.3.77
+ CVSS: (AV:N/AC:H/Au:M/C:N/I:P/A:C) Base Score: 5.2, worst case
+ Summary: If ntpd is configured to allow remote configuration, and if
+ the (possibly spoofed) IP address is allowed to send remote
+ configuration requests, and if the attacker knows the remote
+ configuration password or if ntpd was configured to disable
+ authentication, then an attacker can send a set of packets to
+ ntpd that may cause ntpd to overwrite files.
+ Mitigation:
+ Implement BCP-38.
+ Upgrade to 4.2.8p4, or later, from the NTP Project Download
+ Page or the NTP Public Services Project Download Page.
+ If you are unable to upgrade, remote configuration of NTF's ntpd
+ requires:
+ an explicitly configured "trusted" key. Only configure
+ this if you need it.
+ access from permitted IP addresses. You choose the IPs.
+ authentication. Don't disable it. Practice key security safety.
+ Monitor your ntpd instances.
+ Credit: This weakness was discovered by Yves Younan of Cisco Talos.
+
+* ntpq atoascii() potential memory corruption
+
+ References: Sec 2919 / CVE-2015-7852 / TALOS-CAN-0063
+ Affects: All ntp-4 releases running up to, but not including 4.2.8p4,
+ and 4.3.0 up to, but not including 4.3.77
+ CVSS: (AV:N/AC:H/Au:N/C:N/I:P/A:P) Base Score: 4.0, worst case
+ Summary: If an attacker can figure out the precise moment that ntpq
+ is listening for data and the port number it is listening on or
+ if the attacker can provide a malicious instance ntpd that
+ victims will connect to then an attacker can send a set of
+ crafted mode 6 response packets that, if received by ntpq,
+ can cause ntpq to crash.
+ Mitigation:
+ Implement BCP-38.
+ Upgrade to 4.2.8p4, or later, from the NTP Project Download
+ Page or the NTP Public Services Project Download Page.
+ If you are unable to upgrade and you run ntpq against a server
+ and ntpq crashes, try again using raw mode. Build or get a
+ patched ntpq and see if that fixes the problem. Report new
+ bugs in ntpq or abusive servers appropriately.
+ If you use ntpq in scripts, make sure ntpq does what you expect
+ in your scripts.
+ Credit: This weakness was discovered by Yves Younan and
+ Aleksander Nikolich of Cisco Talos.
+
+* Invalid length data provided by a custom refclock driver could cause
+ a buffer overflow.
+
+ References: Sec 2920 / CVE-2015-7853 / TALOS-CAN-0064
+ Affects: Potentially all ntp-4 releases running up to, but not
+ including 4.2.8p4, and 4.3.0 up to, but not including 4.3.77
+ that have custom refclocks
+ CVSS: (AV:L/AC:H/Au:M/C:C/I:C/A:C) Base Score: 0.0 usual case,
+ 5.9 unusual worst case
+ Summary: A negative value for the datalen parameter will overflow a
+ data buffer. NTF's ntpd driver implementations always set this
+ value to 0 and are therefore not vulnerable to this weakness.
+ If you are running a custom refclock driver in ntpd and that
+ driver supplies a negative value for datalen (no custom driver
+ of even minimal competence would do this) then ntpd would
+ overflow a data buffer. It is even hypothetically possible
+ in this case that instead of simply crashing ntpd the attacker
+ could effect a code injection attack.
+ Mitigation:
+ Upgrade to 4.2.8p4, or later, from the NTP Project Download
+ Page or the NTP Public Services Project Download Page.
+ If you are unable to upgrade:
+ If you are running custom refclock drivers, make sure
+ the signed datalen value is either zero or positive.
+ Monitor your ntpd instances.
+ Credit: This weakness was discovered by Yves Younan of Cisco Talos.
+
+* Password Length Memory Corruption Vulnerability
+
+ References: Sec 2921 / CVE-2015-7854 / TALOS-CAN-0065
+ Affects: All ntp-4 releases up to, but not including 4.2.8p4, and
+ 4.3.0 up to, but not including 4.3.77
+ CVSS: (AV:N/AC:H/Au:M/C:C/I:C/A:C) Base Score: 0.0 best case,
+ 1.7 usual case, 6.8, worst case
+ Summary: If ntpd is configured to allow remote configuration, and if
+ the (possibly spoofed) source IP address is allowed to send
+ remote configuration requests, and if the attacker knows the
+ remote configuration password or if ntpd was (foolishly)
+ configured to disable authentication, then an attacker can
+ send a set of packets to ntpd that may cause it to crash,
+ with the hypothetical possibility of a small code injection.
+ Mitigation:
+ Implement BCP-38.
+ Upgrade to 4.2.8p4, or later, from the NTP Project Download
+ Page or the NTP Public Services Project Download Page.
+ If you are unable to upgrade, remote configuration of NTF's
+ ntpd requires:
+ an explicitly configured "trusted" key. Only configure
+ this if you need it.
+ access from a permitted IP address. You choose the IPs.
+ authentication. Don't disable it. Practice secure key safety.
+ Monitor your ntpd instances.
+ Credit: This weakness was discovered by Yves Younan and
+ Aleksander Nikolich of Cisco Talos.
+
+* decodenetnum() will ASSERT botch instead of returning FAIL on some
+ bogus values.
+
+ References: Sec 2922 / CVE-2015-7855
+ Affects: All ntp-4 releases up to, but not including 4.2.8p4, and
+ 4.3.0 up to, but not including 4.3.77
+ CVSS: (AV:N/AC:H/Au:M/C:N/I:N/A:C) Base Score: 4.6, worst case
+ Summary: If ntpd is fed a crafted mode 6 or mode 7 packet containing
+ an unusually long data value where a network address is expected,
+ the decodenetnum() function will abort with an assertion failure
+ instead of simply returning a failure condition.
+ Mitigation:
+ Implement BCP-38.
+ Upgrade to 4.2.8p4, or later, from the NTP Project Download
+ Page or the NTP Public Services Project Download Page.
+ If you are unable to upgrade:
+ mode 7 is disabled by default. Don't enable it.
+ Use restrict noquery to limit who can send mode 6
+ and mode 7 requests.
+ Configure and use the controlkey and requestkey
+ authentication directives to limit who can
+ send mode 6 and mode 7 requests.
+ Monitor your ntpd instances.
+ Credit: This weakness was discovered by John D "Doug" Birdwell of IDA.org.
+
+* NAK to the Future: Symmetric association authentication bypass via
+ crypto-NAK.
+
+ References: Sec 2941 / CVE-2015-7871
+ Affects: All ntp-4 releases between 4.2.5p186 up to but not including
+ 4.2.8p4, and 4.3.0 up to but not including 4.3.77
+ CVSS: (AV:N/AC:L/Au:N/C:N/I:P/A:P) Base Score: 6.4
+ Summary: Crypto-NAK packets can be used to cause ntpd to accept time
+ from unauthenticated ephemeral symmetric peers by bypassing the
+ authentication required to mobilize peer associations. This
+ vulnerability appears to have been introduced in ntp-4.2.5p186
+ when the code handling mobilization of new passive symmetric
+ associations (lines 1103-1165) was refactored.
+ Mitigation:
+ Implement BCP-38.
+ Upgrade to 4.2.8p4, or later, from the NTP Project Download
+ Page or the NTP Public Services Project Download Page.
+ If you are unable to upgrade:
+ Apply the patch to the bottom of the "authentic" check
+ block around line 1136 of ntp_proto.c.
+ Monitor your ntpd instances.
+ Credit: This weakness was discovered by Stephen Gray <stepgray@cisco.com>.
+
+Backward-Incompatible changes:
+* [Bug 2817] Default on Linux is now "rlimit memlock -1".
+While the general default of 32M is still the case, under Linux
+the default value has been changed to -1 (do not lock ntpd into
+ memory). A value of 0 means "lock ntpd into memory with whatever
+ memory it needs." If your ntp.conf file has an explicit "rlimit memlock"
+ value in it, that value will continue to be used.
+
+* [Bug 2886] Misspelling: "outlyer" should be "outlier".
+ If you've written a script that looks for this case in, say, the
+ output of ntpq, you probably want to change your regex matches
+ from 'outlyer' to 'outl[iy]er'.
+
+New features in this release:
+* 'rlimit memlock' now has finer-grained control. A value of -1 means
+ "don't lock ntpd into memore". This is the default for Linux boxes.
+ A value of 0 means "lock ntpd into memory" with no limits. Otherwise
+ the value is the number of megabytes of memory to lock. The default
+ is 32 megabytes.
+
+* The old Google Test framework has been replaced with a new framework,
+ based on http://www.throwtheswitch.org/unity/ .
+
+Bug Fixes and Improvements:
+* [Bug 2332] (reopened) Exercise thread cancellation once before dropping
+ privileges and limiting resources in NTPD removes the need to link
+ forcefully against 'libgcc_s' which does not always work. J.Perlinger
+* [Bug 2595] ntpdate man page quirks. Hal Murray, Harlan Stenn.
+* [Bug 2625] Deprecate flag1 in local refclock. Hal Murray, Harlan Stenn.
+* [Bug 2817] Stop locking ntpd into memory by default under Linux. H.Stenn.
+* [Bug 2821] minor build issues: fixed refclock_gpsdjson.c. perlinger@ntp.org
+* [Bug 2823] ntpsweep with recursive peers option doesn't work. H.Stenn.
+* [Bug 2849] Systems with more than one default route may never
+ synchronize. Brian Utterback. Note that this patch might need to
+ be reverted once Bug 2043 has been fixed.
+* [Bug 2864] 4.2.8p3 fails to compile on Windows. Juergen Perlinger
+* [Bug 2866] segmentation fault at initgroups(). Harlan Stenn.
+* [Bug 2867] ntpd with autokey active crashed by 'ntpq -crv'. J.Perlinger
+* [Bug 2873] libevent should not include .deps/ in the tarball. H.Stenn
+* [Bug 2874] Don't distribute generated sntp/tests/fileHandlingTest.h. H.Stenn
+* [Bug 2875] sntp/Makefile.am: Get rid of DIST_SUBDIRS. libevent must
+ be configured for the distribution targets. Harlan Stenn.
+* [Bug 2883] ntpd crashes on exit with empty driftfile. Miroslav Lichvar.
+* [Bug 2886] Mis-spelling: "outlyer" should be "outlier". dave@horsfall.org
+* [Bug 2888] streamline calendar functions. perlinger@ntp.org
+* [Bug 2889] ntp-dev-4.3.67 does not build on Windows. perlinger@ntp.org
+* [Bug 2890] Ignore ENOBUFS on routing netlink socket. Konstantin Khlebnikov.
+* [Bug 2906] make check needs better support for pthreads. Harlan Stenn.
+* [Bug 2907] dist* build targets require our libevent/ to be enabled. HStenn.
+* [Bug 2912] no munlockall() under Windows. David Taylor, Harlan Stenn.
+* libntp/emalloc.c: Remove explicit include of stdint.h. Harlan Stenn.
+* Put Unity CPPFLAGS items in unity_config.h. Harlan Stenn.
+* tests/ntpd/g_leapsec.cpp typo fix. Harlan Stenn.
+* Phase 1 deprecation of google test in sntp/tests/. Harlan Stenn.
+* On some versions of HP-UX, inttypes.h does not include stdint.h. H.Stenn.
+* top_srcdir can change based on ntp v. sntp. Harlan Stenn.
+* sntp/tests/ function parameter list cleanup. Damir Tomić.
+* tests/libntp/ function parameter list cleanup. Damir Tomić.
+* tests/ntpd/ function parameter list cleanup. Damir Tomić.
+* sntp/unity/unity_config.h: handle stdint.h. Harlan Stenn.
+* sntp/unity/unity_internals.h: handle *INTPTR_MAX on old Solaris. H.Stenn.
+* tests/libntp/timevalops.c and timespecops.c fixed error printing. D.Tomić.
+* tests/libntp/ improvements in code and fixed error printing. Damir Tomić.
+* tests/libntp: a_md5encrypt.c, authkeys.c, buftvtots.c, calendar.c, caljulian.c,
+ caltontp.c, clocktime.c, humandate.c, hextolfp.c, decodenetnum.c - fixed
+ formatting; first declaration, then code (C90); deleted unnecessary comments;
+ changed from sprintf to snprintf; fixed order of includes. Tomasz Flendrich
+* tests/libntp/lfpfunc.c remove unnecessary include, remove old comments,
+ fix formatting, cleanup. Tomasz Flendrich
+* tests/libntp/lfptostr.c remove unnecessary include, add consts, fix formatting.
+ Tomasz Flendrich
+* tests/libntp/statestr.c remove empty functions, remove unnecessary include,
+ fix formatting. Tomasz Flendrich
+* tests/libntp/modetoa.c fixed formatting. Tomasz Flendrich
+* tests/libntp/msyslog.c fixed formatting. Tomasz Flendrich
+* tests/libntp/numtoa.c deleted unnecessary empty functions, fixed formatting.
+ Tomasz Flendrich
+* tests/libntp/numtohost.c added const, fixed formatting. Tomasz Flendrich
+* tests/libntp/refnumtoa.c fixed formatting. Tomasz Flendrich
+* tests/libntp/ssl_init.c fixed formatting. Tomasz Flendrich
+* tests/libntp/tvtots.c fixed a bug, fixed formatting. Tomasz Flendrich
+* tests/libntp/uglydate.c removed an unnecessary include. Tomasz Flendrich
+* tests/libntp/vi64ops.c removed an unnecessary comment, fixed formatting.
+* tests/libntp/ymd3yd.c removed an empty function and an unnecessary include,
+fixed formatting. Tomasz Flendrich
+* tests/libntp/timespecops.c fixed formatting, fixed the order of includes,
+ removed unnecessary comments, cleanup. Tomasz Flendrich
+* tests/libntp/timevalops.c fixed the order of includes, deleted unnecessary
+ comments, cleanup. Tomasz Flendrich
+* tests/libntp/sockaddrtest.h making it agree to NTP's conventions of formatting.
+ Tomasz Flendrich
+* tests/libntp/lfptest.h cleanup. Tomasz Flendrich
+* tests/libntp/test-libntp.c fix formatting. Tomasz Flendrich
+* sntp/tests/crypto.c is now using proper Unity's assertions, fixed formatting.
+ Tomasz Flendrich
+* sntp/tests/kodDatabase.c added consts, deleted empty function,
+ fixed formatting. Tomasz Flendrich
+* sntp/tests/kodFile.c cleanup, fixed formatting. Tomasz Flendrich
+* sntp/tests/packetHandling.c is now using proper Unity's assertions,
+ fixed formatting, deleted unused variable. Tomasz Flendrich
+* sntp/tests/keyFile.c is now using proper Unity's assertions, fixed formatting.
+ Tomasz Flendrich
+* sntp/tests/packetProcessing.c changed from sprintf to snprintf,
+ fixed formatting. Tomasz Flendrich
+* sntp/tests/utilities.c is now using proper Unity's assertions, changed
+ the order of includes, fixed formatting, removed unnecessary comments.
+ Tomasz Flendrich
+* sntp/tests/sntptest.h fixed formatting. Tomasz Flendrich
+* sntp/tests/fileHandlingTest.h.in fixed a possible buffer overflow problem,
+ made one function do its job, deleted unnecessary prints, fixed formatting.
+ Tomasz Flendrich
+* sntp/unity/Makefile.am added a missing header. Tomasz Flendrich
+* sntp/unity/unity_config.h: Distribute it. Harlan Stenn.
+* sntp/libevent/evconfig-private.h: remove generated filefrom SCM. H.Stenn.
+* sntp/unity/Makefile.am: fix some broken paths. Harlan Stenn.
+* sntp/unity/unity.c: Clean up a printf(). Harlan Stenn.
+* Phase 1 deprecation of google test in tests/libntp/. Harlan Stenn.
+* Don't build sntp/libevent/sample/. Harlan Stenn.
+* tests/libntp/test_caltontp needs -lpthread. Harlan Stenn.
+* br-flock: --enable-local-libevent. Harlan Stenn.
+* Wrote tests for ntpd/ntp_prio_q.c. Tomasz Flendrich
+* scripts/lib/NTP/Util.pm: stratum output is version-dependent. Harlan Stenn.
+* Get rid of the NTP_ prefix on our assertion macros. Harlan Stenn.
+* Code cleanup. Harlan Stenn.
+* libntp/icom.c: Typo fix. Harlan Stenn.
+* util/ntptime.c: initialization nit. Harlan Stenn.
+* ntpd/ntp_peer.c:newpeer(): added a DEBUG_REQUIRE(srcadr). Harlan Stenn.
+* Add std_unity_tests to various Makefile.am files. Harlan Stenn.
+* ntpd/ntp_restrict.c: added a few assertions, created tests for this file.
+ Tomasz Flendrich
+* Changed progname to be const in many files - now it's consistent. Tomasz
+ Flendrich
+* Typo fix for GCC warning suppression. Harlan Stenn.
+* Added tests/ntpd/ntp_scanner.c test. Damir Tomić.
+* Added declarations to all Unity tests, and did minor fixes to them.
+ Reduced the number of warnings by half. Damir Tomić.
+* Updated generate_test_runner.rb and updated the sntp/unity/auto directory
+ with the latest Unity updates from Mark. Damir Tomić.
+* Retire google test - phase I. Harlan Stenn.
+* Unity test cleanup: move declaration of 'initializing'. Harlan Stenn.
+* Update the NEWS file. Harlan Stenn.
+* Autoconf cleanup. Harlan Stenn.
+* Unit test dist cleanup. Harlan Stenn.
+* Cleanup various test Makefile.am files. Harlan Stenn.
+* Pthread autoconf macro cleanup. Harlan Stenn.
+* Fix progname definition in unity runner scripts. Harlan Stenn.
+* Clean trailing whitespace in tests/ntpd/Makefile.am. Harlan Stenn.
+* Update the patch for bug 2817. Harlan Stenn.
+* More updates for bug 2817. Harlan Stenn.
+* Fix bugs in tests/ntpd/ntp_prio_q.c. Harlan Stenn.
+* gcc on older HPUX may need +allowdups. Harlan Stenn.
+* Adding missing MCAST protection. Harlan Stenn.
+* Disable certain test programs on certain platforms. Harlan Stenn.
+* Implement --enable-problem-tests (on by default). Harlan Stenn.
+* build system tweaks. Harlan Stenn.
+
+---
NTP 4.2.8p3 (Harlan Stenn <stenn@ntp.org>, 2015/06/29)
Focus: 1 Security fix. Bug fixes and enhancements. Leap-second improvements.
diff --git a/aclocal.m4 b/aclocal.m4
index bbc54be40406..0c81f43706bb 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1355,6 +1355,7 @@ m4_include([sntp/m4/ntp_lineeditlibs.m4])
m4_include([sntp/m4/ntp_locinfo.m4])
m4_include([sntp/m4/ntp_openssl.m4])
m4_include([sntp/m4/ntp_pkg_config.m4])
+m4_include([sntp/m4/ntp_problemtests.m4])
m4_include([sntp/m4/ntp_prog_cc.m4])
m4_include([sntp/m4/ntp_rlimit.m4])
m4_include([sntp/m4/ntp_sntp.m4])
diff --git a/adjtimed/Makefile.in b/adjtimed/Makefile.in
index 716b9401e542..7a546ef2fe3c 100644
--- a/adjtimed/Makefile.in
+++ b/adjtimed/Makefile.in
@@ -124,6 +124,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
$(top_srcdir)/sntp/m4/ntp_locinfo.m4 \
$(top_srcdir)/sntp/m4/ntp_openssl.m4 \
$(top_srcdir)/sntp/m4/ntp_pkg_config.m4 \
+ $(top_srcdir)/sntp/m4/ntp_problemtests.m4 \
$(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \
$(top_srcdir)/sntp/m4/ntp_rlimit.m4 \
$(top_srcdir)/sntp/m4/ntp_sntp.m4 \
@@ -229,6 +230,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_THREAD = @BUILD_THREAD@
CALC_TICKADJ_DB = @CALC_TICKADJ_DB@
CALC_TICKADJ_DL = @CALC_TICKADJ_DL@
CALC_TICKADJ_DS = @CALC_TICKADJ_DS@
@@ -237,6 +239,7 @@ CALC_TICKADJ_NI = @CALC_TICKADJ_NI@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
+CFLAGS_LIBEVENT = @CFLAGS_LIBEVENT@
CFLAGS_NTP = @CFLAGS_NTP@
CHUTEST = @CHUTEST@
CONFIG_SHELL = @CONFIG_SHELL@
@@ -298,6 +301,7 @@ LIBTOOL_DEPS = @LIBTOOL_DEPS@
LIPO = @LIPO@
LN_S = @LN_S@
LSCF = @LSCF@
+LTHREAD_LIBS = @LTHREAD_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MAKE_ADJTIMED = @MAKE_ADJTIMED@
diff --git a/adjtimed/adjtimed.c b/adjtimed/adjtimed.c
index f38e66dd0f75..fd28dfb1be07 100644
--- a/adjtimed/adjtimed.c
+++ b/adjtimed/adjtimed.c
@@ -58,7 +58,7 @@ void Exit (int);
/* emacs cc-mode goes nuts if we split the next line... */
#define tvtod(tv) ((double)tv.tv_sec + ((double)tv.tv_usec / (double)MILLION))
-char *progname = NULL;
+char const *progname = NULL;
int verbose = 0;
int sysdebug = 0;
static int mqid;
diff --git a/clockstuff/Makefile.in b/clockstuff/Makefile.in
index 0236354805cf..e75f4c047409 100644
--- a/clockstuff/Makefile.in
+++ b/clockstuff/Makefile.in
@@ -117,6 +117,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
$(top_srcdir)/sntp/m4/ntp_locinfo.m4 \
$(top_srcdir)/sntp/m4/ntp_openssl.m4 \
$(top_srcdir)/sntp/m4/ntp_pkg_config.m4 \
+ $(top_srcdir)/sntp/m4/ntp_problemtests.m4 \
$(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \
$(top_srcdir)/sntp/m4/ntp_rlimit.m4 \
$(top_srcdir)/sntp/m4/ntp_sntp.m4 \
@@ -224,6 +225,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_THREAD = @BUILD_THREAD@
CALC_TICKADJ_DB = @CALC_TICKADJ_DB@
CALC_TICKADJ_DL = @CALC_TICKADJ_DL@
CALC_TICKADJ_DS = @CALC_TICKADJ_DS@
@@ -232,6 +234,7 @@ CALC_TICKADJ_NI = @CALC_TICKADJ_NI@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
+CFLAGS_LIBEVENT = @CFLAGS_LIBEVENT@
CFLAGS_NTP = @CFLAGS_NTP@
CHUTEST = @CHUTEST@
CONFIG_SHELL = @CONFIG_SHELL@
@@ -293,6 +296,7 @@ LIBTOOL_DEPS = @LIBTOOL_DEPS@
LIPO = @LIPO@
LN_S = @LN_S@
LSCF = @LSCF@
+LTHREAD_LIBS = @LTHREAD_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MAKE_ADJTIMED = @MAKE_ADJTIMED@
diff --git a/clockstuff/chutest.c b/clockstuff/chutest.c
index 488a0d16e0ff..78f6c5fe9818 100644
--- a/clockstuff/chutest.c
+++ b/clockstuff/chutest.c
@@ -56,7 +56,7 @@ struct chucode {
#define STREQ(a, b) (*(a) == *(b) && strcmp((a), (b)) == 0)
-char *progname;
+char const *progname;
int dofilter = 0; /* set to 1 when we should run filter algorithm */
int showtimes = 0; /* set to 1 when we should show char arrival times */
diff --git a/clockstuff/propdelay.c b/clockstuff/propdelay.c
index 52c20320cdc4..a3b9fc0b2850 100644
--- a/clockstuff/propdelay.c
+++ b/clockstuff/propdelay.c
@@ -117,7 +117,7 @@ int Cflag = 0;
int Gflag = 0;
int height;
-char *progname;
+char const *progname;
static void doit (double, double, double, double, double, char *);
static double latlong (char *, int);
diff --git a/configure b/configure
index 1d686cbdcba8..04813a8d5245 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.69 for ntp 4.2.8p3.
+# Generated by GNU Autoconf 2.69 for ntp 4.2.8p4.
#
# Report bugs to <http://bugs.ntp.org./>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='ntp'
PACKAGE_TARNAME='ntp'
-PACKAGE_VERSION='4.2.8p3'
-PACKAGE_STRING='ntp 4.2.8p3'
+PACKAGE_VERSION='4.2.8p4'
+PACKAGE_STRING='ntp 4.2.8p4'
PACKAGE_BUGREPORT='http://bugs.ntp.org./'
PACKAGE_URL='http://www.ntp.org./'
@@ -639,6 +639,12 @@ LTLIBOBJS
subdirs
PERLLIBDIR
NTP_KEYSDIR
+BUILD_TEST_NTP_SIGND_FALSE
+BUILD_TEST_NTP_SIGND_TRUE
+BUILD_TEST_NTP_SCANNER_FALSE
+BUILD_TEST_NTP_SCANNER_TRUE
+BUILD_TEST_NTP_RESTRICT_FALSE
+BUILD_TEST_NTP_RESTRICT_TRUE
GTEST_AVAILABLE_FALSE
GTEST_AVAILABLE_TRUE
GTEST_CPPFLAGS
@@ -689,6 +695,8 @@ PTHREADS_FALSE
PTHREADS_TRUE
LIBISC_PTHREADS_NOTHREADS
PTHREAD_LIBS
+LTHREAD_LIBS
+BUILD_THREAD
HAVE_INLINE
LDADD_LIBUTIL
ALLOCA
@@ -701,6 +709,7 @@ BUILD_LIBEVENT_FALSE
BUILD_LIBEVENT_TRUE
LDADD_LIBEVENT
CPPFLAGS_LIBEVENT
+CFLAGS_LIBEVENT
PKG_CONFIG
LIBOPTS_DIR
LIBOPTS_CFLAGS
@@ -1050,6 +1059,7 @@ enable_getifaddrs
enable_saveconfig
enable_leap_smear
with_gtest
+enable_problem_tests
'
ac_precious_vars='build_alias
host_alias
@@ -1606,7 +1616,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.8p3 to adapt to many kinds of systems.
+\`configure' configures ntp 4.2.8p4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1676,7 +1686,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ntp 4.2.8p3:";;
+ short | recursive ) echo "Configuration of ntp 4.2.8p4:";;
esac
cat <<\_ACEOF
@@ -1724,7 +1734,7 @@ Optional Features and Packages:
--enable-libseccomp EXPERIMENTAL: enable support for libseccomp
sandboxing (default is no)
--with-stack-limit ? =50 (200 for openbsd) 4k pages
- --with-memlock ? =32 (megabytes)
+ --with-memlock ? =32 (-1 on linux) megabytes
--enable-debug-timing - include processing time debugging code (costs
performance)
--enable-dst-minutes =60 minutes per DST adjustment
@@ -1821,6 +1831,7 @@ Optional Features and Packages:
--enable-saveconfig + saveconfig mechanism
--enable-leap-smear - experimental leap smear code
--with-gtest Use the gtest framework (Default: if it's available)
+ --enable-problem-tests + enable tests with undiagnosed problems
Some influential environment variables:
CC C compiler command
@@ -1908,7 +1919,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ntp configure 4.2.8p3
+ntp configure 4.2.8p4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2738,7 +2749,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.8p3, which was
+It was created by ntp $as_me 4.2.8p4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3117,6 +3128,12 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
@@ -3733,7 +3750,7 @@ fi
# Define the identity of the package.
PACKAGE='ntp'
- VERSION='4.2.8p3'
+ VERSION='4.2.8p4'
cat >>confdefs.h <<_ACEOF
@@ -6768,7 +6785,7 @@ esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking additional compiler flags" >&5
$as_echo_n "checking additional compiler flags... " >&6; }
- # allow ntp_os_flags to be preset to skip this stuff
+ # allow ntp_os_cflags to be preset to skip this stuff
case "${ntp_os_cflags+set}" in
set)
;;
@@ -6856,7 +6873,7 @@ $as_echo_n "checking additional compiler flags... " >&6; }
;;
esac
esac
- case "$ntp_os_flags" in
+ case "$ntp_os_cflags" in
'')
ntp_os_cflags_msg="none needed"
;;
@@ -6867,6 +6884,38 @@ $as_echo_n "checking additional compiler flags... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_os_cflags_msg" >&5
$as_echo "$ntp_os_cflags_msg" >&6; }
{ ntp_os_cflags_msg=; unset ntp_os_cflags_msg;}
+ ###
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking additional linker flags" >&5
+$as_echo_n "checking additional linker flags... " >&6; }
+ # HMS: The following might still need tweaking
+ # allow ntp_os_ldflags to be preset to skip this stuff
+ case "${ntp_os_ldflags+set}" in
+ set)
+ ;;
+ *)
+ ntp_os_ldflags=
+ case "$host_os" in
+ hpux*)
+ case "$GCC" in
+ yes)
+ ntp_os_ldflags="-Wl,+allowdups"
+ ;;
+ esac
+ ;;
+ esac
+ ;;
+ esac
+ case "$ntp_os_ldflags" in
+ '')
+ ntp_os_ldflags_msg="none needed"
+ ;;
+ *)
+ ntp_os_ldflags_msg="$ntp_os_ldflags"
+ esac
+ LDFLAGS_NTP="$LDFLAGS_NTP $ntp_os_ldflags"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_os_ldflags_msg" >&5
+$as_echo "$ntp_os_ldflags_msg" >&6; }
+ { ntp_os_ldflags_msg=; unset ntp_os_ldflags_msg;}
@@ -19945,6 +19994,7 @@ ntp_libevent_tearoff=sntp/libevent
+
case "$ntp_use_local_libevent" in
yes)
;;
@@ -19958,6 +20008,7 @@ $as_echo_n "checking if libevent $ntp_libevent_min_version or later is installed
ntp_use_local_libevent=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: Using the installed libevent" >&5
$as_echo "$as_me: Using the installed libevent" >&6;}
+ CFLAGS_LIBEVENT=`$PKG_CONFIG --cflags libevent_pthreads`
CPPFLAGS_LIBEVENT=`$PKG_CONFIG --cflags-only-I libevent`
# HMS: I hope the following is accurate.
# We don't need -levent, we only need -levent_core.
@@ -19987,6 +20038,9 @@ $as_echo "$as_me: Using the installed libevent" >&6;}
$as_echo "yes" >&6; }
else
ntp_use_local_libevent=yes
+ # HMS: do we only need to do this if LIBISC_PTHREADS_NOTHREADS
+ # is "pthreads"?
+ CFLAGS_LIBEVENT=`$PKG_CONFIG --cflags libevent_pthreads`
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -20012,6 +20066,7 @@ $as_echo "$as_me: Using libevent tearoff" >&6;}
esac
esac
+
if test "x$ntp_use_local_libevent" = "xyes"; then
BUILD_LIBEVENT_TRUE=
BUILD_LIBEVENT_FALSE='#'
@@ -22941,7 +22996,8 @@ fi
have_pthreads=no
case "$enable_thread_support" in
- yes)
+ no) ;;
+ *)
ol_found_pthreads=no
@@ -26358,6 +26414,9 @@ $as_echo "$ol_cv_pthread_lib_lpthreads" >&6; }
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: ol_link_threads: <$ol_link_threads> ol_link_pthreads <$ol_link_pthreads>" >&5
+$as_echo "$as_me: ol_link_threads: <$ol_link_threads> ol_link_pthreads <$ol_link_pthreads>" >&6;}
+
if test $ol_link_threads != no ; then
LTHREAD_LIBS="$LTHREAD_LIBS $ol_link_pthreads"
@@ -27398,6 +27457,10 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
case "$ol_found_pthreads" in
yes)
saved_LIBS="$LIBS"
@@ -27423,56 +27486,6 @@ done
yes)
PTHREAD_LIBS="$LTHREAD_LIBS"
have_pthreads=yes
- # Bug 2332: With GCC we need to force a reference to libgcc_s
- # (if libgcc_s exists) or the combination of
- # threads + setuid + mlockall does not work on linux because
- # thread cancellation fails to load libgcc_s with dlopen().
- # We have to pass this all as linker options to avoid argument
- # reordering by libtool.
- case "$GCC$with_gnu_ld" in
- yesyes)
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -lgcc_s" >&5
-$as_echo_n "checking for exit in -lgcc_s... " >&6; }
-if ${ac_cv_lib_gcc_s_exit+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgcc_s $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char exit ();
-int
-main ()
-{
-return exit ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_gcc_s_exit=yes
-else
- ac_cv_lib_gcc_s_exit=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gcc_s_exit" >&5
-$as_echo "$ac_cv_lib_gcc_s_exit" >&6; }
-if test "x$ac_cv_lib_gcc_s_exit" = xyes; then :
- PTHREAD_LIBS="$LTHREAD_LIBS -Wl,--no-as-needed,-lgcc_s,--as-needed"
-fi
-
- ;;
- esac
esac
esac
esac
@@ -31236,10 +31249,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_cv_rlimit_memlock" >&5
$as_echo "$ntp_cv_rlimit_memlock" >&6; }
+case "$host" in
+ *-*-*linux*)
+ ntp_dflt_rlimit_memlock="-1" ;;
+ *) ntp_dflt_rlimit_memlock="32" ;;
+esac
case "$ntp_cv_rlimit_memlock" in
yes)
- HAVE_RLIMIT_MEMLOCK=" memlock 32"
+ HAVE_RLIMIT_MEMLOCK=" memlock $ntp_dflt_rlimit_memlock" ;;
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for RLIMIT_STACK" >&5
@@ -31288,8 +31306,6 @@ case "$ntp_cv_rlimit_stack" in
HAVE_RLIMIT_STACK=" stacksize 50"
esac
-
-
# HMS: Only if we are doing the MLOCKALL stuff...
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the default number of 4k stack pages" >&5
$as_echo_n "checking for the default number of 4k stack pages... " >&6; }
@@ -31339,7 +31355,7 @@ fi
case "$ans" in
yes | no)
- ans=32
+ ans=$ntp_dflt_rlimit_memlock
;;
[1-9][0-9]*) ;;
*) as_fn_error $? "\"--with-memlock requires an integer argument.\"" "$LINENO" 5
@@ -31354,6 +31370,7 @@ _ACEOF
+
# some OSes prefer _exit() in forked children to exit()
for ac_func in _exit
do :
@@ -36995,6 +37012,81 @@ fi
+
+case "$build" in
+ $host) cross=0 ;;
+ *) cross=1 ;;
+esac
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we want to enable tests with undiagnosed problems" >&5
+$as_echo_n "checking if we want to enable tests with undiagnosed problems... " >&6; }
+# Check whether --enable-problem-tests was given.
+if test "${enable_problem_tests+set}" = set; then :
+ enableval=$enable_problem_tests; ntp_ept=$enableval
+else
+ ntp_ept=yes
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_ept" >&5
+$as_echo "$ntp_ept" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can run test-ntp_restrict" >&5
+$as_echo_n "checking if we can run test-ntp_restrict... " >&6; }
+ntp_test_ntp_restrict="no"
+case "$ntp_ept:$cross:$host" in
+ no:0:*-*-solaris*) ;;
+ no:0:*-*-hpux-11.23*) ;;
+ *) ntp_test_ntp_restrict="yes" ;;
+esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_test_ntp_restrict" >&5
+$as_echo "$ntp_test_ntp_restrict" >&6; }
+ if test x$ntp_test_ntp_restrict = xyes; then
+ BUILD_TEST_NTP_RESTRICT_TRUE=
+ BUILD_TEST_NTP_RESTRICT_FALSE='#'
+else
+ BUILD_TEST_NTP_RESTRICT_TRUE='#'
+ BUILD_TEST_NTP_RESTRICT_FALSE=
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can run test-ntp_scanner" >&5
+$as_echo_n "checking if we can run test-ntp_scanner... " >&6; }
+ntp_test_ntp_scanner="no"
+case "$ntp_ept:$cross:$host" in
+ no:0:*-*-solaris*) ;;
+ *) ntp_test_ntp_scanner="yes" ;;
+esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_test_ntp_scanner" >&5
+$as_echo "$ntp_test_ntp_scanner" >&6; }
+ if test x$ntp_test_ntp_scanner = xyes; then
+ BUILD_TEST_NTP_SCANNER_TRUE=
+ BUILD_TEST_NTP_SCANNER_FALSE='#'
+else
+ BUILD_TEST_NTP_SCANNER_TRUE='#'
+ BUILD_TEST_NTP_SCANNER_FALSE=
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can run test-ntp_signd" >&5
+$as_echo_n "checking if we can run test-ntp_signd... " >&6; }
+ntp_test_ntp_signd="no"
+case "$ntp_ept:$cross:$host" in
+ no:0:*-*-solaris*) ;;
+ *) ntp_test_ntp_signd="yes" ;;
+esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_test_ntp_signd" >&5
+$as_echo "$ntp_test_ntp_signd" >&6; }
+ if test x$ntp_test_ntp_signd = xyes; then
+ BUILD_TEST_NTP_SIGND_TRUE=
+ BUILD_TEST_NTP_SIGND_FALSE='#'
+else
+ BUILD_TEST_NTP_SIGND_TRUE='#'
+ BUILD_TEST_NTP_SIGND_FALSE=
+fi
+
+
+
###
@@ -37091,6 +37183,8 @@ ac_config_files="$ac_config_files tests/libntp/Makefile"
ac_config_files="$ac_config_files tests/ntpd/Makefile"
+ac_config_files="$ac_config_files tests/ntpq/Makefile"
+
ac_config_files="$ac_config_files tests/sandbox/Makefile"
ac_config_files="$ac_config_files tests/sec-2853/Makefile"
@@ -37333,6 +37427,18 @@ if test -z "${GTEST_AVAILABLE_TRUE}" && test -z "${GTEST_AVAILABLE_FALSE}"; then
as_fn_error $? "conditional \"GTEST_AVAILABLE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${BUILD_TEST_NTP_RESTRICT_TRUE}" && test -z "${BUILD_TEST_NTP_RESTRICT_FALSE}"; then
+ as_fn_error $? "conditional \"BUILD_TEST_NTP_RESTRICT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${BUILD_TEST_NTP_SCANNER_TRUE}" && test -z "${BUILD_TEST_NTP_SCANNER_FALSE}"; then
+ as_fn_error $? "conditional \"BUILD_TEST_NTP_SCANNER\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${BUILD_TEST_NTP_SIGND_TRUE}" && test -z "${BUILD_TEST_NTP_SIGND_FALSE}"; then
+ as_fn_error $? "conditional \"BUILD_TEST_NTP_SIGND\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
: "${CONFIG_STATUS=./config.status}"
ac_write_fail=0
@@ -37730,7 +37836,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.8p3, which was
+This file was extended by ntp $as_me 4.2.8p4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -37797,7 +37903,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-ntp config.status 4.2.8p3
+ntp config.status 4.2.8p4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -38344,6 +38450,7 @@ do
"tests/bug-2803/Makefile") CONFIG_FILES="$CONFIG_FILES tests/bug-2803/Makefile" ;;
"tests/libntp/Makefile") CONFIG_FILES="$CONFIG_FILES tests/libntp/Makefile" ;;
"tests/ntpd/Makefile") CONFIG_FILES="$CONFIG_FILES tests/ntpd/Makefile" ;;
+ "tests/ntpq/Makefile") CONFIG_FILES="$CONFIG_FILES tests/ntpq/Makefile" ;;
"tests/sandbox/Makefile") CONFIG_FILES="$CONFIG_FILES tests/sandbox/Makefile" ;;
"tests/sec-2853/Makefile") CONFIG_FILES="$CONFIG_FILES tests/sec-2853/Makefile" ;;
"util/Makefile") CONFIG_FILES="$CONFIG_FILES util/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index de6043015b17..42e18a49fe37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,6 +11,7 @@ AC_INIT(
)
AC_CONFIG_MACRO_DIR([sntp/m4])
AC_CONFIG_AUX_DIR([sntp/libevent/build-aux])
+AC_LANG([C])
AC_PRESERVE_HELP_ORDER
@@ -928,60 +929,6 @@ esac
NTP_RLIMIT_ITEMS
-# HMS: Only if we are doing the MLOCKALL stuff...
-AC_MSG_CHECKING([for the default number of 4k stack pages])
-AC_ARG_WITH(
- [stack-limit],
- [AS_HELP_STRING(
- [--with-stack-limit],
- [? =50 (200 for openbsd) 4k pages]
- )],
- [ans=$withval],
- [ans=yes]
-)
-case "$ans" in
- yes | no)
- case "$host" in
- *-*-openbsd*)
- ans=200
- ;;
- *) ans=50
- ;;
- esac
- ;;
- [[1-9]][[0-9]]*)
- ;;
- *) AC_MSG_ERROR(["--with-stack-limit requires an integer argument."])
- ;;
-esac
-AC_MSG_RESULT([$ans])
-AC_DEFINE_UNQUOTED([DFLT_RLIMIT_STACK], [$ans],
- [Default number of 4k pages for RLIMIT_STACK])
-
-# HMS: only if we have RLIMIT_MEMLOCK
-AC_MSG_CHECKING([for the default number of megabytes to MEMLOCK])
-AC_ARG_WITH(
- [memlock],
- [AS_HELP_STRING(
- [--with-memlock],
- [? =32 (megabytes)]
- )],
- [ans=$withval],
- [ans=yes]
-)
-case "$ans" in
- yes | no)
- ans=32
- ;;
- [[1-9]][[0-9]]*) ;;
- *) AC_MSG_ERROR(["--with-memlock requires an integer argument."])
- ;;
-esac
-AC_MSG_RESULT([$ans])
-AC_DEFINE_UNQUOTED([DFLT_RLIMIT_MEMLOCK], [$ans],
- [Default number of megabytes for RLIMIT_MEMLOCK])
-
-
# some OSes prefer _exit() in forked children to exit()
AC_CHECK_FUNCS([_exit])
ntp_worker_child_exit=exit
@@ -4382,6 +4329,8 @@ dnl require a C++ compiler only if we will use gtest, but AC_PROG_CXX
dnl can't be conditionalized.
NTP_GOOGLETEST
+NTP_PROBLEM_TESTS
+
###
AC_DEFINE_DIR([NTP_KEYSDIR], [sysconfdir],
@@ -4425,6 +4374,7 @@ AC_CONFIG_FILES([tests/Makefile])
AC_CONFIG_FILES([tests/bug-2803/Makefile])
AC_CONFIG_FILES([tests/libntp/Makefile])
AC_CONFIG_FILES([tests/ntpd/Makefile])
+AC_CONFIG_FILES([tests/ntpq/Makefile])
AC_CONFIG_FILES([tests/sandbox/Makefile])
AC_CONFIG_FILES([tests/sec-2853/Makefile])
AC_CONFIG_FILES([util/Makefile])
diff --git a/html/decode.html b/html/decode.html
index 51603ad67aae..a15046f3f22b 100644
--- a/html/decode.html
+++ b/html/decode.html
@@ -11,7 +11,7 @@
<img src="pic/alice47.gif" alt="gif" align="left"><a href="http://www.eecis.udel.edu/%7emills/pictures.html">from <i>Alice's Adventures in Wonderland</i>, Lewis Carroll</a>
<p>Caterpillar knows all the error codes, which is more than most of us do.</p>
<p>Last update:
- <!-- #BeginDate format:En2m -->16-Jul-2014 04:48<!-- #EndDate -->
+ <!-- #BeginDate format:En2m -->26-Jul-2015 06:26<!-- #EndDate -->
UTC</p>
</p>
<br clear="left">
@@ -296,7 +296,7 @@
</tr>
<tr>
<td><tt>3</tt></td>
- <td><tt>sel_outlyer</tt></td>
+ <td><tt>sel_outlier</tt></td>
<td><tt>-</tt></td>
<td>discarded by the cluster algorithm</td>
</tr>
diff --git a/html/miscopt.html b/html/miscopt.html
index ac32419df08a..c6190222bf96 100644
--- a/html/miscopt.html
+++ b/html/miscopt.html
@@ -11,7 +11,7 @@
<img src="pic/boom3.gif" alt="gif" align="left"><a href="http://www.eecis.udel.edu/~mills/pictures.html">from <i>Pogo</i>, Walt Kelly</a>
<p>We have three, now looking for more.</p>
<p>Last update:
- <!-- #BeginDate format:En2m -->29-Jun-2015 05:56<!-- #EndDate -->
+ <!-- #BeginDate format:En2m -->23-Sep-2015 10:20<!-- #EndDate -->
UTC</p>
<br clear="left">
<h4>Related Links</h4>
@@ -105,7 +105,7 @@
<dd>
<dl>
<dt><tt>memlock <i>Nmegabytes</i></tt></dt>
- <dd>Specify the number of megabytes of memory that can be allocated. Probably only available under Linux, this option is useful when dropping root (the <tt>-i</tt> option). The default is 32 megabytes. Setting this to zero will prevent any attemp to lock memory.</dd>
+ <dd>Specify the number of megabytes of memory that should be allocated and locked. Probably only available under Linux, this option may be useful when dropping root (the <tt>-i</tt> option). The default is 32 megabytes on non-Linux machines, and -1 under Linux. -1 means "do not lock the process into memory". 0 means "lock whatever memory the process wants into memory".</dd>
<dt><tt>stacksize <i>N4kPages</i></tt></dt>
<dd>Specifies the maximum size of the process stack on systems with the <tt>mlockall()</tt> function. Defaults to 50 4k pages (200 4k pages in OpenBSD).</dd>
<dt><tt>filenum <i>Nfiledescriptors</i></tt></dt>
diff --git a/html/stats.html b/html/stats.html
index 943851773c17..c5bc34c41612 100644
--- a/html/stats.html
+++ b/html/stats.html
@@ -7,9 +7,9 @@
<link href="scripts/style.css" type="text/css" rel="stylesheet">
</head>
<body>
-<h3>Performance Metrics</h3>
+<h3>Performance Metrics</h3>
<p>Last update:
- <!-- #BeginDate format:En2m -->10-Mar-2014 05:23<!-- #EndDate -->
+ <!-- #BeginDate format:En2m -->26-Jul-2015 06:29<!-- #EndDate -->
UTC</p>
<h4>Related Links</h4>
<script type="text/javascript" language="javascript" src="scripts/special.txt"></script>
@@ -25,45 +25,45 @@
<p>This page describes several statistics provided in the NTP specification and reference implementation and how they determine the accuracy and error measured during routine and exceptional operation. These statistics provide the following information.</p>
<ul>
- <li>Nominal estimate of the server clock time relative to the client clock time. This is called <em>clock offset</em> symbolized by the Greek letter &theta;.</li>
- <li>Roundtrip system and network delay measured by the on-wire protocol. This is call <em>roundtrip delay</em> symbolized by the Greek letter &delta;.</li>
- <li>Potential clock offset error due to the maximum uncorrected system clock frequency error. This is called <em>dispersion</em> symbolized by the Greek letter &epsilon;.</li>
- <li>Expected error, consisting of the root mean square (RMS) nominal clock offset sample differencess in a sliding window of several samples. This is called <em>jitter</em> symbolized by the Greek letter &phi;.</li>
+ <li>Nominal estimate of the server clock time relative to the client clock time. This is called <em>clock offset</em> symbolized by the Greek letter &theta;.</li>
+ <li>Roundtrip system and network delay measured by the on-wire protocol. This is call <em>roundtrip delay</em> symbolized by the Greek letter &delta;.</li>
+ <li>Potential clock offset error due to the maximum uncorrected system clock frequency error. This is called <em>dispersion</em> symbolized by the Greek letter &epsilon;.</li>
+ <li>Expected error, consisting of the root mean square (RMS) nominal clock offset sample differencess in a sliding window of several samples. This is called <em>jitter</em> symbolized by the Greek letter &phi;.</li>
</ul>
<p> Figure 1 shows how the various measured statistics are collected and compiled to calibrate NTP performance.</p>
<div align="center">
<img src="pic/stats.gif" alt="gif">
<p>Figure 1. Statistics Budget</p>
</div>
-<p>The data represented in boxes labeled Server are contained in fields in packet received from the server. The data represented in boxes labeled Peer are computed by the on-wire protocol, as described below. The algorithms of the box labeled Selection and Combining Algorithms process the peer data to select a system peer. The System box represents summary data inherited from the system peer. These data are available to application programs and dependent downstream clients.</p>
+<p>The data represented in boxes labeled Server are contained in fields in packet received from the server. The data represented in boxes labeled Peer are computed by the on-wire protocol, as described below. The algorithms of the box labeled Selection and Combining Algorithms process the peer data to select a system peer. The System box represents summary data inherited from the system peer. These data are available to application programs and dependent downstream clients.</p>
<h4 id="budget">2. Statistics Summary</h4>
-<p>Each NTP synchronization source is characterized by the offset &theta; and delay &delta; samples measured by the on-wire protocol, as described on the <a href="warp.html">How NTP Works</a> page. In addition, the dispersion &epsilon; sample is initialized with the sum of the source precision &rho;<sub>R</sub> and the client precision &rho; (not shown) as each source packet is received. The dispersion increases at a rate of 15 &mu;s/s after that. For this purpose, the precision is equal to the latency to read the system clock. The offset, delay and dispersion are called the sample statistics.</p>
+<p>Each NTP synchronization source is characterized by the offset &theta; and delay &delta; samples measured by the on-wire protocol, as described on the <a href="warp.html">How NTP Works</a> page. In addition, the dispersion &epsilon; sample is initialized with the sum of the source precision &rho;<sub>R</sub> and the client precision &rho; (not shown) as each source packet is received. The dispersion increases at a rate of 15 &mu;s/s after that. For this purpose, the precision is equal to the latency to read the system clock. The offset, delay and dispersion are called the sample statistics.</p>
<blockquote>
- <p>Note. In very fast networks where the client clock frequency is not within 1 PPM or so of the the server clock frequency, the roundtrip delay may have small negative values. This is usually a temporary condition when the client is first started. When using the roundtrip delay in calculations, negative values are assumed zero.</p>
+ <p>Note. In very fast networks where the client clock frequency is not within 1 PPM or so of the the server clock frequency, the roundtrip delay may have small negative values. This is usually a temporary condition when the client is first started. When using the roundtrip delay in calculations, negative values are assumed zero.</p>
</blockquote>
-<p> In a window of eight (offset, delay, dispersion) samples, the algorithm described on the <a href="filter.html">Clock Filter Algorithm</a> page selects the sample with minimum delay, which generally represents the most accurate offset statistic. The selected offset sample determines the <em>peer offset</em> and <em>peer delay </em>statistics. The <em>peer dispersion</em> is a weighted average of the dispersion samples in the window. These quantities are recalculated as each update is received from the source. Between updates, both the sample dispersion and peer dispersion continue to grow at the same rate, 15 &mu;s/s. Finally, the <em>peer jitter</em> &phi; is determined as the RMS differences between the offset samples in the window relative to the selected offset sample. The peer statistics are recorded by the <tt>peerstats</tt> option of the <a href="monopt.html#filegen"><tt>filegen</tt></a> command. Peer variables are displayed by the <tt>rv</tt> command of the <a href="ntpq.html#peer"><tt>ntpq</tt></a> program.</p>
-<p> The clock filter algorithm continues to process updates in this way until the source is no longer reachable. Reachability is determined by an eight-bit shift register, which is shifted left by one bit as each poll packet is sent, with 0 replacing the vacated rightmost bit. Each time a valid update is received, the rightmost bit is set to 1. The source is considered reachable if any bit is set to 1 in the register; otherwise, it is considered unreachable. When a source becomes unreachable, a dummy sample with &quot;infinite&quot; dispersion is inserted in the filter window at each poll, thus displacing old samples. This causes the peer dispersion to increase eventually to infinity.</p>
-<p>The composition of the source population and the system peer selection is redetermined as each update from each source is received. The system peer and system variables are determined as described on the <a href="prefer.html">Mitigation Rules and the <tt>prefer</tt> Keyword</a> page. The system variables &Theta;, &Delta;, &Epsilon; and &Phi; are updated from the system peer variables of the same name and the system stratum set one greater than the system peer stratum. The system statistics are recorded by the <tt>loopstats</tt> option of the <a href="monopt.html#filegen"><tt>filegen</tt></a> command. System variables are displayed by the <tt>rv</tt> command of the <a href="ntpq.html#system"><tt>ntpq</tt></a> program.</p>
-<p>Although it might seem counterintuitive, a cardinal rule in the selection process is, once a sample has been selected by the clock filter algorithm, older samples are no longer selectable. This applies also to the clock select algorithm. Once the peer variables for a source have been selected, older variables of the same or other sources are no longer selectable. The reason for these rules is to limit the time delay in the clock discipline algorithm. This is necessary to preserve the optimum impulse response and thus the risetime and overshoot.</p>
+<p> In a window of eight (offset, delay, dispersion) samples, the algorithm described on the <a href="filter.html">Clock Filter Algorithm</a> page selects the sample with minimum delay, which generally represents the most accurate offset statistic. The selected offset sample determines the <em>peer offset</em> and <em>peer delay </em>statistics. The <em>peer dispersion</em> is a weighted average of the dispersion samples in the window. These quantities are recalculated as each update is received from the source. Between updates, both the sample dispersion and peer dispersion continue to grow at the same rate, 15 &mu;s/s. Finally, the <em>peer jitter</em> &phi; is determined as the RMS differences between the offset samples in the window relative to the selected offset sample. The peer statistics are recorded by the <tt>peerstats</tt> option of the <a href="monopt.html#filegen"><tt>filegen</tt></a> command. Peer variables are displayed by the <tt>rv</tt> command of the <a href="ntpq.html#peer"><tt>ntpq</tt></a> program.</p>
+<p> The clock filter algorithm continues to process updates in this way until the source is no longer reachable. Reachability is determined by an eight-bit shift register, which is shifted left by one bit as each poll packet is sent, with 0 replacing the vacated rightmost bit. Each time a valid update is received, the rightmost bit is set to 1. The source is considered reachable if any bit is set to 1 in the register; otherwise, it is considered unreachable. When a source becomes unreachable, a dummy sample with &quot;infinite&quot; dispersion is inserted in the filter window at each poll, thus displacing old samples. This causes the peer dispersion to increase eventually to infinity.</p>
+<p>The composition of the source population and the system peer selection is redetermined as each update from each source is received. The system peer and system variables are determined as described on the <a href="prefer.html">Mitigation Rules and the <tt>prefer</tt> Keyword</a> page. The system variables &Theta;, &Delta;, &Epsilon; and &Phi; are updated from the system peer variables of the same name and the system stratum set one greater than the system peer stratum. The system statistics are recorded by the <tt>loopstats</tt> option of the <a href="monopt.html#filegen"><tt>filegen</tt></a> command. System variables are displayed by the <tt>rv</tt> command of the <a href="ntpq.html#system"><tt>ntpq</tt></a> program.</p>
+<p>Although it might seem counterintuitive, a cardinal rule in the selection process is, once a sample has been selected by the clock filter algorithm, older samples are no longer selectable. This applies also to the clock select algorithm. Once the peer variables for a source have been selected, older variables of the same or other sources are no longer selectable. The reason for these rules is to limit the time delay in the clock discipline algorithm. This is necessary to preserve the optimum impulse response and thus the risetime and overshoot.</p>
<p>This means that not every sample can be used to update the peer variables, and up to seven samples can be ignored between selected samples. This fact has been carefully considered in the discipline algorithm design with due consideration for feedback loop delay and minimum sampling rate. In engineering terms, even if only one sample in eight survives, the resulting sample rate is twice the Nyquist rate at any time constant and poll interval.</p>
<h4 id="quality">3. Quality of Service</h4>
-<p>This section discusses how an NTP client determines the system performance using a peer population including reference clocks and remote servers. This is determined for each peer from two statistics, <em>peer jitter</em> and <em>root distance.</em> Peer jitter is determined from various jitter components as described above. It represents the expected error in determining the clock offset estimate. Root distance represents the maximum error of the estimate due to all causes.</p>
-<p>The root distance statistic is computed as one-half the <em> root delay</em> of the primary source of time; i.e., the reference clock, plus the <em> root dispersion</em> of that source. The root variables are included in the NTP packet header received from each source. At each update the root delay is recomputed as the sum of the root delay in the packet plus the peer delay, while the root dispersion is recomputed as the sum of the root dispersion in the packet plus the peer dispersion.</p>
+<p>This section discusses how an NTP client determines the system performance using a peer population including reference clocks and remote servers. This is determined for each peer from two statistics, <em>peer jitter</em> and <em>root distance.</em> Peer jitter is determined from various jitter components as described above. It represents the expected error in determining the clock offset estimate. Root distance represents the maximum error of the estimate due to all causes.</p>
+<p>The root distance statistic is computed as one-half the <em> root delay</em> of the primary source of time; i.e., the reference clock, plus the <em> root dispersion</em> of that source. The root variables are included in the NTP packet header received from each source. At each update the root delay is recomputed as the sum of the root delay in the packet plus the peer delay, while the root dispersion is recomputed as the sum of the root dispersion in the packet plus the peer dispersion.</p>
<blockquote>
- <p>Note. In order to avoid timing loops, the root distance is adjusted to the maximum of the above computation and a <em>minimum threshold.</em> The minimum threshold defaults to 1 ms, but can be changed according to client preference using the <tt>mindist</tt> option of the <a href="miscopt.html#tos"><tt>tos</tt></a> command.</p>
+ <p>Note. In order to avoid timing loops, the root distance is adjusted to the maximum of the above computation and a <em>minimum threshold.</em> The minimum threshold defaults to 1 ms, but can be changed according to client preference using the <tt>mindist</tt> option of the <a href="miscopt.html#tos"><tt>tos</tt></a> command.</p>
</blockquote>
-<p>A source is considered selectable only if its root distance is less than the <em>select threshold</em>, by default 1.5 s, but can be changed according to client preference using the <tt>maxdist</tt> option of the <a href="miscopt.html#tos"><tt>tos</tt></a> command. When an upstream server loses all sources, its root distance apparent to dependent clients continues to increase. The clients are not aware of this condition and continue to accept synchronization as long as the root distance is less than the select threshold.</p>
-<p>The root distance statistic is used by the select, cluster and mitigation algorithms. In this respect, it is sometimes called the <em>synchronization distance</em> often shortened simply to <em>distance</em>. The root distance is also used in the following ways.</p>
+<p>A source is considered selectable only if its root distance is less than the <em>select threshold</em>, by default 1.5 s, but can be changed according to client preference using the <tt>maxdist</tt> option of the <a href="miscopt.html#tos"><tt>tos</tt></a> command. When an upstream server loses all sources, its root distance apparent to dependent clients continues to increase. The clients are not aware of this condition and continue to accept synchronization as long as the root distance is less than the select threshold.</p>
+<p>The root distance statistic is used by the select, cluster and mitigation algorithms. In this respect, it is sometimes called the <em>synchronization distance</em> often shortened simply to <em>distance</em>. The root distance is also used in the following ways.</p>
<ul>
<li>Root distance defines the maximum error of the clock offset estimate due to all causes as long as the source remains reachable..</li>
- <li>Root distance defines the upper and lower limits of the correctness interval. This interval represents the maximum clock offset for each of possibly several sources. The clock select algorithm computes the intersection of the correctness intervals to determine the truechimers from the selectable source population.</li>
- <li>Root distance is used by the clock cluster algorithm as a weight factor when pruning outlyers from the truechimer population.</li>
+ <li>Root distance defines the upper and lower limits of the correctness interval. This interval represents the maximum clock offset for each of possibly several sources. The clock select algorithm computes the intersection of the correctness intervals to determine the truechimers from the selectable source population.</li>
+ <li>Root distance is used by the clock cluster algorithm as a weight factor when pruning outliers from the truechimer population.</li>
<li>The (normalized) reciprocal of the root distance is used as a weight factor by the combine algorithm when computing the system clock offset and system jitter.</li>
- <li>Root distance is used by the mitigation algorithm to select the system peer from among the cluster algorithm survivors.</li>
+ <li>Root distance is used by the mitigation algorithm to select the system peer from among the cluster algorithm survivors.</li>
</ul>
-<p>The root distance thus functions as a metric in the selection and weighting of the various available sources. The strategy is to select the system peer as the source with the minimum root distance and thus the minimum maximum error. The reference implementation uses the Bellman-Ford algorithm described in the literature, where the goal is to minimize the root distance. The algorithm selects the <em>system peer</em>, from which the system root delay and system root dispersion are inherited.</p>
-<p>The algorithms described on the <a href="prefer.html">Mitigation Rules and the <tt>prefer</tt> Keyword</a> page deliver several important statistics. The <em>system offset</em> and <em>system jitter</em> are weighted averages computed by the clock combine algorithm. System offset is best interpreted as the maximum-likelihood estimate of the system clock offset, while system jitter, also called estimated error, is best interpreted as the expected error of this estimate. <em>System delay</em> is the root delay inherited from the system peer, while <em>s</em><em>ystem dispersion</em> is the root dispersion plus contributions due to jitter and the absolute value of the system offset.</p>
-<p>The maximum system error, or <em>system distance</em>, is computed as one-half the system delay plus the system dispersion. In order to simplify discussion, certain minor contributions to the maximum error statistic are ignored. If the precision time kernel support is available, both the estimated error and maximum error are reported to user programs via the <tt>ntp_adjtime()</tt> kernel system call. See the <a href="kern.html">Kernel Model for Precision Timekeeping</a> page for further information.</p>
+<p>The root distance thus functions as a metric in the selection and weighting of the various available sources. The strategy is to select the system peer as the source with the minimum root distance and thus the minimum maximum error. The reference implementation uses the Bellman-Ford algorithm described in the literature, where the goal is to minimize the root distance. The algorithm selects the <em>system peer</em>, from which the system root delay and system root dispersion are inherited.</p>
+<p>The algorithms described on the <a href="prefer.html">Mitigation Rules and the <tt>prefer</tt> Keyword</a> page deliver several important statistics. The <em>system offset</em> and <em>system jitter</em> are weighted averages computed by the clock combine algorithm. System offset is best interpreted as the maximum-likelihood estimate of the system clock offset, while system jitter, also called estimated error, is best interpreted as the expected error of this estimate. <em>System delay</em> is the root delay inherited from the system peer, while <em>s</em><em>ystem dispersion</em> is the root dispersion plus contributions due to jitter and the absolute value of the system offset.</p>
+<p>The maximum system error, or <em>system distance</em>, is computed as one-half the system delay plus the system dispersion. In order to simplify discussion, certain minor contributions to the maximum error statistic are ignored. If the precision time kernel support is available, both the estimated error and maximum error are reported to user programs via the <tt>ntp_adjtime()</tt> kernel system call. See the <a href="kern.html">Kernel Model for Precision Timekeeping</a> page for further information.</p>
<hr>
<script type="text/javascript" language="javascript" src="scripts/footer.txt"></script>
</body>
diff --git a/include/Makefile.am b/include/Makefile.am
index 8b063c3c66f5..f032c97e792d 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -62,6 +62,7 @@ noinst_HEADERS = \
ntpsim.h \
parse.h \
parse_conf.h \
+ rc_cmdlength.h \
recvbuff.h \
refclock_atom.h \
refidsmear.h \
diff --git a/include/Makefile.in b/include/Makefile.in
index 408118b99bde..8f0968bf77b5 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -116,6 +116,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
$(top_srcdir)/sntp/m4/ntp_locinfo.m4 \
$(top_srcdir)/sntp/m4/ntp_openssl.m4 \
$(top_srcdir)/sntp/m4/ntp_pkg_config.m4 \
+ $(top_srcdir)/sntp/m4/ntp_problemtests.m4 \
$(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \
$(top_srcdir)/sntp/m4/ntp_rlimit.m4 \
$(top_srcdir)/sntp/m4/ntp_sntp.m4 \
@@ -227,6 +228,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_THREAD = @BUILD_THREAD@
CALC_TICKADJ_DB = @CALC_TICKADJ_DB@
CALC_TICKADJ_DL = @CALC_TICKADJ_DL@
CALC_TICKADJ_DS = @CALC_TICKADJ_DS@
@@ -235,6 +237,7 @@ CALC_TICKADJ_NI = @CALC_TICKADJ_NI@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
+CFLAGS_LIBEVENT = @CFLAGS_LIBEVENT@
CFLAGS_NTP = @CFLAGS_NTP@
CHUTEST = @CHUTEST@
CONFIG_SHELL = @CONFIG_SHELL@
@@ -296,6 +299,7 @@ LIBTOOL_DEPS = @LIBTOOL_DEPS@
LIPO = @LIPO@
LN_S = @LN_S@
LSCF = @LSCF@
+LTHREAD_LIBS = @LTHREAD_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MAKE_ADJTIMED = @MAKE_ADJTIMED@
@@ -543,6 +547,7 @@ noinst_HEADERS = \
ntpsim.h \
parse.h \
parse_conf.h \
+ rc_cmdlength.h \
recvbuff.h \
refclock_atom.h \
refidsmear.h \
diff --git a/include/isc/Makefile.in b/include/isc/Makefile.in
index 7cbcae303707..5bd25d615fd0 100644
--- a/include/isc/Makefile.in
+++ b/include/isc/Makefile.in
@@ -116,6 +116,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
$(top_srcdir)/sntp/m4/ntp_locinfo.m4 \
$(top_srcdir)/sntp/m4/ntp_openssl.m4 \
$(top_srcdir)/sntp/m4/ntp_pkg_config.m4 \
+ $(top_srcdir)/sntp/m4/ntp_problemtests.m4 \
$(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \
$(top_srcdir)/sntp/m4/ntp_rlimit.m4 \
$(top_srcdir)/sntp/m4/ntp_sntp.m4 \
@@ -185,6 +186,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_THREAD = @BUILD_THREAD@
CALC_TICKADJ_DB = @CALC_TICKADJ_DB@
CALC_TICKADJ_DL = @CALC_TICKADJ_DL@
CALC_TICKADJ_DS = @CALC_TICKADJ_DS@
@@ -193,6 +195,7 @@ CALC_TICKADJ_NI = @CALC_TICKADJ_NI@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
+CFLAGS_LIBEVENT = @CFLAGS_LIBEVENT@
CFLAGS_NTP = @CFLAGS_NTP@
CHUTEST = @CHUTEST@
CONFIG_SHELL = @CONFIG_SHELL@
@@ -254,6 +257,7 @@ LIBTOOL_DEPS = @LIBTOOL_DEPS@
LIPO = @LIPO@
LN_S = @LN_S@
LSCF = @LSCF@
+LTHREAD_LIBS = @LTHREAD_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MAKE_ADJTIMED = @MAKE_ADJTIMED@
diff --git a/include/ntp_assert.h b/include/ntp_assert.h
index 2f3bbc8a0b9b..42d78acab0db 100644
--- a/include/ntp_assert.h
+++ b/include/ntp_assert.h
@@ -88,10 +88,6 @@ extern void calysto_assert(unsigned char cnd); /* check whether this holds */
* We initially used NTP_REQUIRE() instead of REQUIRE() etc, but that
* is unneccesarily verbose, as libisc use of REQUIRE() etc shows.
*/
-#define NTP_REQUIRE(x) REQUIRE(x)
-#define NTP_INSIST(x) INSIST(x)
-#define NTP_INVARIANT(x) INVARIANT(x)
-#define NTP_ENSURE(x) ENSURE(x)
# ifdef DEBUG
#define DEBUG_REQUIRE(x) REQUIRE(x)
diff --git a/include/ntp_calendar.h b/include/ntp_calendar.h
index 3afb627d2594..6f36c0777aba 100644
--- a/include/ntp_calendar.h
+++ b/include/ntp_calendar.h
@@ -157,6 +157,12 @@ ntpcal_daysplit(const vint64 *);
extern vint64
ntpcal_dayjoin(int32_t /* days */, int32_t /* seconds */);
+/* Get the number of leap years since epoch for the number of elapsed
+ * full years
+ */
+extern int32_t
+ntpcal_leapyears_in_years(int32_t /* years */);
+
/*
* Convert elapsed years in Era into elapsed days in Era.
*/
@@ -220,6 +226,9 @@ ntpcal_date_to_rd(const struct calendar * /* jt */);
*
* if 'isleapyear' is not NULL, it will receive an integer that is 0
* for regular years and a non-zero value for leap years.
+ *
+ * The input is limited to [-2^30, 2^30-1]. If the days exceed this
+ * range, errno is set to EDOM and the result is saturated.
*/
extern ntpcal_split
ntpcal_split_eradays(int32_t /* days */, int/*BOOL*/ * /* isleapyear */);
@@ -330,6 +339,10 @@ ntpcal_date_to_time(const struct calendar * /* jd */);
extern int32_t
isocal_weeks_in_years(int32_t /* years */);
+/*
+ * The input is limited to [-2^30, 2^30-1]. If the weeks exceed this
+ * range, errno is set to EDOM and the result is saturated.
+ */
extern ntpcal_split
isocal_split_eraweeks(int32_t /* weeks */);
diff --git a/include/ntp_config.h b/include/ntp_config.h
index a74cd552b85d..bd8f595d94f3 100644
--- a/include/ntp_config.h
+++ b/include/ntp_config.h
@@ -46,8 +46,8 @@
extern int cmdline_server_count;
extern char ** cmdline_servers;
-/* set to zero if admin doesn't want memory locked */
-extern int do_memlock;
+/* set to zero if we're not locking memory */
+extern int cur_memlock;
typedef struct int_range_tag {
int first;
diff --git a/include/ntp_control.h b/include/ntp_control.h
index be5b16d80ead..85f41056c7b1 100644
--- a/include/ntp_control.h
+++ b/include/ntp_control.h
@@ -104,7 +104,7 @@ struct ntp_control {
#define CTL_PST_SEL_REJECT 0 /* reject */
#define CTL_PST_SEL_SANE 1 /* x falsetick */
#define CTL_PST_SEL_CORRECT 2 /* . excess */
-#define CTL_PST_SEL_SELCAND 3 /* - outlyer */
+#define CTL_PST_SEL_SELCAND 3 /* - outlier */
#define CTL_PST_SEL_SYNCCAND 4 /* + candidate */
#define CTL_PST_SEL_EXCESS 5 /* # backup */
#define CTL_PST_SEL_SYSPEER 6 /* * sys.peer */
diff --git a/include/ntp_lists.h b/include/ntp_lists.h
index 2b6e616965a7..d741974943ef 100644
--- a/include/ntp_lists.h
+++ b/include/ntp_lists.h
@@ -215,9 +215,9 @@ do { \
\
for (pentry = (listhead); \
pentry != NULL; \
- pentry = pentry->nextlink){ \
- NTP_INSIST(pentry != pentry->nextlink); \
- NTP_INSIST((listhead) != pentry->nextlink); \
+ pentry = pentry->nextlink) { \
+ INSIST(pentry != pentry->nextlink); \
+ INSIST((listhead) != pentry->nextlink); \
} \
} while (FALSE)
diff --git a/include/ntp_stdlib.h b/include/ntp_stdlib.h
index bad2697d06fd..a2e62dabefd9 100644
--- a/include/ntp_stdlib.h
+++ b/include/ntp_stdlib.h
@@ -31,6 +31,7 @@ extern int mvsnprintf(char *, size_t, const char *, va_list)
extern int msnprintf(char *, size_t, const char *, ...)
NTP_PRINTF(3, 4);
extern void msyslog(int, const char *, ...) NTP_PRINTF(2, 3);
+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 *);
diff --git a/include/ntp_syslog.h b/include/ntp_syslog.h
index a0152b53d9ca..ecc6346796e8 100644
--- a/include/ntp_syslog.h
+++ b/include/ntp_syslog.h
@@ -9,6 +9,7 @@
#ifdef VMS
extern void msyslog();
+extern void mvsyslog();
#else
# ifndef SYS_VXWORKS
# include <syslog.h>
diff --git a/include/ntp_types.h b/include/ntp_types.h
index 1c66165b3b38..a947f30575e5 100644
--- a/include/ntp_types.h
+++ b/include/ntp_types.h
@@ -15,7 +15,8 @@
#include <sys/types.h>
#if defined(HAVE_INTTYPES_H)
# include <inttypes.h>
-#elif defined(HAVE_STDINT_H)
+#endif
+#if defined(HAVE_STDINT_H)
# include <stdint.h>
#endif
diff --git a/include/rc_cmdlength.h b/include/rc_cmdlength.h
new file mode 100644
index 000000000000..87947573d634
--- /dev/null
+++ b/include/rc_cmdlength.h
@@ -0,0 +1,2 @@
+
+extern size_t remoteconfig_cmdlength( const char *src_buf, const char *src_end );
diff --git a/kernel/Makefile.in b/kernel/Makefile.in
index d66d99438737..dd00144745df 100644
--- a/kernel/Makefile.in
+++ b/kernel/Makefile.in
@@ -115,6 +115,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
$(top_srcdir)/sntp/m4/ntp_locinfo.m4 \
$(top_srcdir)/sntp/m4/ntp_openssl.m4 \
$(top_srcdir)/sntp/m4/ntp_pkg_config.m4 \
+ $(top_srcdir)/sntp/m4/ntp_problemtests.m4 \
$(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \
$(top_srcdir)/sntp/m4/ntp_rlimit.m4 \
$(top_srcdir)/sntp/m4/ntp_sntp.m4 \
@@ -224,6 +225,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_THREAD = @BUILD_THREAD@
CALC_TICKADJ_DB = @CALC_TICKADJ_DB@
CALC_TICKADJ_DL = @CALC_TICKADJ_DL@
CALC_TICKADJ_DS = @CALC_TICKADJ_DS@
@@ -232,6 +234,7 @@ CALC_TICKADJ_NI = @CALC_TICKADJ_NI@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
+CFLAGS_LIBEVENT = @CFLAGS_LIBEVENT@
CFLAGS_NTP = @CFLAGS_NTP@
CHUTEST = @CHUTEST@
CONFIG_SHELL = @CONFIG_SHELL@
@@ -293,6 +296,7 @@ LIBTOOL_DEPS = @LIBTOOL_DEPS@
LIPO = @LIPO@
LN_S = @LN_S@
LSCF = @LSCF@
+LTHREAD_LIBS = @LTHREAD_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MAKE_ADJTIMED = @MAKE_ADJTIMED@
diff --git a/kernel/sys/Makefile.in b/kernel/sys/Makefile.in
index a9cefad760b7..58b0b6eee0f6 100644
--- a/kernel/sys/Makefile.in
+++ b/kernel/sys/Makefile.in
@@ -116,6 +116,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
$(top_srcdir)/sntp/m4/ntp_locinfo.m4 \
$(top_srcdir)/sntp/m4/ntp_openssl.m4 \
$(top_srcdir)/sntp/m4/ntp_pkg_config.m4 \
+ $(top_srcdir)/sntp/m4/ntp_problemtests.m4 \
$(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \
$(top_srcdir)/sntp/m4/ntp_rlimit.m4 \
$(top_srcdir)/sntp/m4/ntp_sntp.m4 \
@@ -185,6 +186,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_THREAD = @BUILD_THREAD@
CALC_TICKADJ_DB = @CALC_TICKADJ_DB@
CALC_TICKADJ_DL = @CALC_TICKADJ_DL@
CALC_TICKADJ_DS = @CALC_TICKADJ_DS@
@@ -193,6 +195,7 @@ CALC_TICKADJ_NI = @CALC_TICKADJ_NI@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
+CFLAGS_LIBEVENT = @CFLAGS_LIBEVENT@
CFLAGS_NTP = @CFLAGS_NTP@
CHUTEST = @CHUTEST@
CONFIG_SHELL = @CONFIG_SHELL@
@@ -254,6 +257,7 @@ LIBTOOL_DEPS = @LIBTOOL_DEPS@
LIPO = @LIPO@
LN_S = @LN_S@
LSCF = @LSCF@
+LTHREAD_LIBS = @LTHREAD_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MAKE_ADJTIMED = @MAKE_ADJTIMED@
diff --git a/libntp/Makefile.in b/libntp/Makefile.in
index 59265df2e98d..e9a90ed1c35f 100644
--- a/libntp/Makefile.in
+++ b/libntp/Makefile.in
@@ -117,6 +117,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
$(top_srcdir)/sntp/m4/ntp_locinfo.m4 \
$(top_srcdir)/sntp/m4/ntp_openssl.m4 \
$(top_srcdir)/sntp/m4/ntp_pkg_config.m4 \
+ $(top_srcdir)/sntp/m4/ntp_problemtests.m4 \
$(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \
$(top_srcdir)/sntp/m4/ntp_rlimit.m4 \
$(top_srcdir)/sntp/m4/ntp_sntp.m4 \
@@ -345,6 +346,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_THREAD = @BUILD_THREAD@
CALC_TICKADJ_DB = @CALC_TICKADJ_DB@
CALC_TICKADJ_DL = @CALC_TICKADJ_DL@
CALC_TICKADJ_DS = @CALC_TICKADJ_DS@
@@ -353,6 +355,7 @@ CALC_TICKADJ_NI = @CALC_TICKADJ_NI@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
+CFLAGS_LIBEVENT = @CFLAGS_LIBEVENT@
CFLAGS_NTP = @CFLAGS_NTP@
CHUTEST = @CHUTEST@
CONFIG_SHELL = @CONFIG_SHELL@
@@ -414,6 +417,7 @@ LIBTOOL_DEPS = @LIBTOOL_DEPS@
LIPO = @LIPO@
LN_S = @LN_S@
LSCF = @LSCF@
+LTHREAD_LIBS = @LTHREAD_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MAKE_ADJTIMED = @MAKE_ADJTIMED@
diff --git a/libntp/atolfp.c b/libntp/atolfp.c
index 3a65f6bcb2f7..9a2f6917873a 100644
--- a/libntp/atolfp.c
+++ b/libntp/atolfp.c
@@ -40,7 +40,7 @@ atolfp(
int isneg;
static const char *digits = "0123456789";
- NTP_REQUIRE(str != NULL);
+ REQUIRE(str != NULL);
isneg = 0;
dec_i = dec_f = 0;
diff --git a/libntp/audio.c b/libntp/audio.c
index 6f2262c991f3..726dfa94d819 100644
--- a/libntp/audio.c
+++ b/libntp/audio.c
@@ -377,7 +377,9 @@ audio_gain(
#ifdef PCM_STYLE_SOUND
int l, r;
- rval = 0;
+# ifdef GCC
+ rval = 0; /* GCC thinks rval is used uninitialized */
+# endif
r = l = 100 * gain / 255; /* Normalize to 0-100 */
# ifdef DEBUG
@@ -392,10 +394,11 @@ audio_gain(
if (cf_agc[0] != '\0')
rval = ioctl(ctl_fd, agc, &l);
else
- if (2 == port)
- rval = ioctl(ctl_fd, SOUND_MIXER_WRITE_LINE, &l);
- else
- rval = ioctl(ctl_fd, SOUND_MIXER_WRITE_MIC, &l);
+ rval = ioctl(ctl_fd
+ , (2 == port)
+ ? SOUND_MIXER_WRITE_LINE
+ : SOUND_MIXER_WRITE_MIC
+ , &l);
if (-1 == rval) {
printf("audio_gain: agc write: %s\n", strerror(errno));
return rval;
diff --git a/libntp/authkeys.c b/libntp/authkeys.c
index 68771ffb339f..667ca298b96f 100644
--- a/libntp/authkeys.c
+++ b/libntp/authkeys.c
@@ -534,6 +534,12 @@ MD5auth_setkey(
bucket = &key_hash[KEYHASH(keyno)];
for (sk = *bucket; sk != NULL; sk = sk->hlink) {
if (keyno == sk->keyid) {
+ /* TALOS-CAN-0054: make sure we have a new buffer! */
+ if (NULL != sk->secret) {
+ memset(sk->secret, 0, sk->secretsize);
+ free(sk->secret);
+ }
+ sk->secret = emalloc(len);
sk->type = (u_short)keytype;
secretsize = len;
sk->secretsize = (u_short)secretsize;
@@ -593,12 +599,14 @@ auth_delkeys(void)
}
/*
- * Don't lose info as to which keys are trusted.
+ * Don't lose info as to which keys are trusted. Make
+ * sure there are no dangling pointers!
*/
if (KEY_TRUSTED & sk->flags) {
if (sk->secret != NULL) {
- memset(sk->secret, '\0', sk->secretsize);
+ memset(sk->secret, 0, sk->secretsize);
free(sk->secret);
+ sk->secret = NULL; /* TALOS-CAN-0054 */
}
sk->secretsize = 0;
sk->lifetime = 0;
diff --git a/libntp/authreadkeys.c b/libntp/authreadkeys.c
index e8ddc942a665..1c4c07ca5926 100644
--- a/libntp/authreadkeys.c
+++ b/libntp/authreadkeys.c
@@ -62,6 +62,40 @@ nexttok(
}
+/* TALOS-CAN-0055: possibly DoS attack by setting the key file to the
+ * log file. This is hard to prevent (it would need to check two files
+ * to be the same on the inode level, which will not work so easily with
+ * Windows or VMS) but we can avoid the self-amplification loop: We only
+ * log the first 5 errors, silently ignore the next 10 errors, and give
+ * up when when we have found more than 15 errors.
+ *
+ * This avoids the endless file iteration we will end up with otherwise,
+ * and also avoids overflowing the log file.
+ *
+ * Nevertheless, once this happens, the keys are gone since this would
+ * require a save/swap strategy that is not easy to apply due to the
+ * data on global/static level.
+ */
+
+static const size_t nerr_loglimit = 5u;
+static const size_t nerr_maxlimit = 15;
+
+static void log_maybe(size_t*, const char*, ...) NTP_PRINTF(2, 3);
+
+static void
+log_maybe(
+ size_t *pnerr,
+ const char *fmt ,
+ ...)
+{
+ va_list ap;
+ if (++(*pnerr) <= nerr_loglimit) {
+ va_start(ap, fmt);
+ mvsyslog(LOG_ERR, fmt, ap);
+ va_end(ap);
+ }
+}
+
/*
* authreadkeys - (re)read keys from a file.
*/
@@ -79,7 +113,7 @@ authreadkeys(
u_char keystr[32]; /* Bug 2537 */
size_t len;
size_t j;
-
+ size_t nerr;
/*
* Open file. Complain and return if it can't be opened.
*/
@@ -99,7 +133,10 @@ authreadkeys(
/*
* Now read lines from the file, looking for key entries
*/
+ nerr = 0;
while ((line = fgets(buf, sizeof buf, fp)) != NULL) {
+ if (nerr > nerr_maxlimit)
+ break;
token = nexttok(&line);
if (token == NULL)
continue;
@@ -109,15 +146,16 @@ authreadkeys(
*/
keyno = atoi(token);
if (keyno == 0) {
- msyslog(LOG_ERR,
- "authreadkeys: cannot change key %s", token);
+ log_maybe(&nerr,
+ "authreadkeys: cannot change key %s",
+ token);
continue;
}
if (keyno > NTP_MAXKEY) {
- msyslog(LOG_ERR,
- "authreadkeys: key %s > %d reserved for Autokey",
- token, NTP_MAXKEY);
+ log_maybe(&nerr,
+ "authreadkeys: key %s > %d reserved for Autokey",
+ token, NTP_MAXKEY);
continue;
}
@@ -126,8 +164,9 @@ authreadkeys(
*/
token = nexttok(&line);
if (token == NULL) {
- msyslog(LOG_ERR,
- "authreadkeys: no key type for key %d", keyno);
+ log_maybe(&nerr,
+ "authreadkeys: no key type for key %d",
+ keyno);
continue;
}
#ifdef OPENSSL
@@ -139,13 +178,15 @@ authreadkeys(
*/
keytype = keytype_from_text(token, NULL);
if (keytype == 0) {
- msyslog(LOG_ERR,
- "authreadkeys: invalid type for key %d", keyno);
+ log_maybe(&nerr,
+ "authreadkeys: invalid type for key %d",
+ keyno);
continue;
}
if (EVP_get_digestbynid(keytype) == NULL) {
- msyslog(LOG_ERR,
- "authreadkeys: no algorithm for key %d", keyno);
+ log_maybe(&nerr,
+ "authreadkeys: no algorithm for key %d",
+ keyno);
continue;
}
#else /* !OPENSSL follows */
@@ -155,8 +196,9 @@ authreadkeys(
* 'm' for compatibility.
*/
if (!(*token == 'M' || *token == 'm')) {
- msyslog(LOG_ERR,
- "authreadkeys: invalid type for key %d", keyno);
+ log_maybe(&nerr,
+ "authreadkeys: invalid type for key %d",
+ keyno);
continue;
}
keytype = KEY_TYPE_MD5;
@@ -170,8 +212,8 @@ authreadkeys(
*/
token = nexttok(&line);
if (token == NULL) {
- msyslog(LOG_ERR,
- "authreadkeys: no key for key %d", keyno);
+ log_maybe(&nerr,
+ "authreadkeys: no key for key %d", keyno);
continue;
}
len = strlen(token);
@@ -195,13 +237,24 @@ authreadkeys(
keystr[j / 2] = temp << 4;
}
if (j < jlim) {
- msyslog(LOG_ERR,
- "authreadkeys: invalid hex digit for key %d", keyno);
+ log_maybe(&nerr,
+ "authreadkeys: invalid hex digit for key %d",
+ keyno);
continue;
}
MD5auth_setkey(keyno, keytype, keystr, jlim / 2);
}
}
fclose(fp);
+ if (nerr > nerr_maxlimit) {
+ msyslog(LOG_ERR,
+ "authreadkeys: emergency break after %u errors",
+ nerr);
+ return (0);
+ } else if (nerr > nerr_loglimit) {
+ msyslog(LOG_ERR,
+ "authreadkeys: found %u more error(s)",
+ nerr - nerr_loglimit);
+ }
return (1);
}
diff --git a/libntp/caljulian.c b/libntp/caljulian.c
index 6463699b152a..4a306033ad70 100644
--- a/libntp/caljulian.c
+++ b/libntp/caljulian.c
@@ -28,7 +28,7 @@ caljulian(
ntpcal_split split;
- NTP_INSIST(NULL != jt);
+ INSIST(NULL != jt);
/*
* Unfold ntp time around current time into NTP domain. Split
diff --git a/libntp/caltontp.c b/libntp/caltontp.c
index 4246a6a5431c..808c94c64afd 100644
--- a/libntp/caltontp.c
+++ b/libntp/caltontp.c
@@ -40,14 +40,14 @@ caltontp(
int32_t eraday; /* CE Rata Die number */
vint64 ntptime;/* resulting NTP time */
- NTP_INSIST(jt != NULL);
+ REQUIRE(jt != NULL);
- NTP_REQUIRE(jt->month <= 13); /* permit month 0..13! */
- NTP_REQUIRE(jt->monthday <= 32);
- NTP_REQUIRE(jt->yearday <= 366);
- NTP_REQUIRE(jt->hour <= 24);
- NTP_REQUIRE(jt->minute <= MINSPERHR);
- NTP_REQUIRE(jt->second <= SECSPERMIN);
+ REQUIRE(jt->month <= 13); /* permit month 0..13! */
+ REQUIRE(jt->monthday <= 32);
+ REQUIRE(jt->yearday <= 366);
+ REQUIRE(jt->hour <= 24);
+ REQUIRE(jt->minute <= MINSPERHR);
+ REQUIRE(jt->second <= SECSPERMIN);
/*
* First convert the date to he corresponding RataDie
diff --git a/libntp/decodenetnum.c b/libntp/decodenetnum.c
index 187d5cae7e5b..35b908f39478 100644
--- a/libntp/decodenetnum.c
+++ b/libntp/decodenetnum.c
@@ -35,8 +35,11 @@ decodenetnum(
char *np;
char name[80];
- NTP_REQUIRE(num != NULL);
- NTP_REQUIRE(strlen(num) < sizeof(name));
+ REQUIRE(num != NULL);
+
+ if (strlen(num) >= sizeof(name)) {
+ return 0;
+ }
port_str = NULL;
if ('[' != num[0]) {
@@ -72,7 +75,7 @@ decodenetnum(
err = getaddrinfo(cp, "ntp", &hints, &ai);
if (err != 0)
return 0;
- NTP_INSIST(ai->ai_addrlen <= sizeof(*netnum));
+ INSIST(ai->ai_addrlen <= sizeof(*netnum));
ZERO(*netnum);
memcpy(netnum, ai->ai_addr, ai->ai_addrlen);
freeaddrinfo(ai);
diff --git a/libntp/emalloc.c b/libntp/emalloc.c
index 95d293f1c3dc..8b7ef990c6b6 100644
--- a/libntp/emalloc.c
+++ b/libntp/emalloc.c
@@ -76,8 +76,6 @@ ereallocz(
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <stdint.h>
-
/*
* This is sqrt(SIZE_MAX+1), as s1*s2 <= SIZE_MAX
* if both s1 < MUL_NO_OVERFLOW and s2 < MUL_NO_OVERFLOW
diff --git a/libntp/icom.c b/libntp/icom.c
index 80700114255e..2e95db5eb3f4 100644
--- a/libntp/icom.c
+++ b/libntp/icom.c
@@ -6,14 +6,16 @@
* frequency. All other parameters must be manually set before use.
*/
#include <config.h>
-#include "icom.h"
+#include <ntp_stdlib.h>
+#include <ntp_tty.h>
+#include <l_stdlib.h>
+#include <icom.h>
+
#include <unistd.h>
#include <stdio.h>
#include <fcntl.h>
#include <errno.h>
-#include "ntp_tty.h"
-#include "l_stdlib.h"
#ifdef SYS_WINNT
#undef write /* ports/winnt/include/config.h: #define write _write */
@@ -60,9 +62,14 @@ static void doublefreq (double, u_char *, int);
/*
* icom_freq(fd, ident, freq) - load radio frequency
+ *
+ * returns:
+ * 0 (ok)
+ * -1 (error)
+ * 1 (short write to device)
*/
int
-icom_freq( /* returns 0 (ok), EIO (error) */
+icom_freq(
int fd, /* file descriptor */
int ident, /* ICOM radio identifier */
double freq /* frequency (MHz) */
@@ -71,6 +78,7 @@ icom_freq( /* returns 0 (ok), EIO (error) */
u_char cmd[] = {PAD, PR, PR, 0, TX, V_SFREQ, 0, 0, 0, 0, FI,
FI};
int temp;
+ int rc;
cmd[3] = (char)ident;
if (ident == IC735)
@@ -78,9 +86,17 @@ icom_freq( /* returns 0 (ok), EIO (error) */
else
temp = 5;
doublefreq(freq * 1e6, &cmd[6], temp);
- temp = write(fd, cmd, temp + 7);
+ rc = write(fd, cmd, temp + 7);
+ if (rc == -1) {
+ msyslog(LOG_ERR, "icom_freq: write() failed: %m");
+ return -1;
+ } else if (rc != temp + 7) {
+ msyslog(LOG_ERR, "icom_freq: only wrote %d of %d bytes.",
+ rc, temp+7);
+ return 1;
+ }
- return (0);
+ return 0;
}
diff --git a/libntp/machines.c b/libntp/machines.c
index 43944f9edb3f..7a29ac07ea5f 100644
--- a/libntp/machines.c
+++ b/libntp/machines.c
@@ -40,7 +40,7 @@ struct hostent *gethostbyname(char *name)
{
struct hostent *host1;
h_errno = 0; /* we are always successful!!! */
- host1 = (struct hostent *) malloc (sizeof(struct hostent));
+ host1 = (struct hostent *) emalloc (sizeof(struct hostent));
host1->h_name = name;
host1->h_addrtype = AF_INET;
host1->h_aliases = name;
@@ -54,7 +54,7 @@ struct hostent *gethostbyaddr(char *name, int size, int addr_type)
{
struct hostent *host1;
h_errno = 0; /* we are always successful!!! */
- host1 = (struct hostent *) malloc (sizeof(struct hostent));
+ host1 = (struct hostent *) emalloc (sizeof(struct hostent));
host1->h_name = name;
host1->h_addrtype = AF_INET;
host1->h_aliases = name;
@@ -66,7 +66,7 @@ struct hostent *gethostbyaddr(char *name, int size, int addr_type)
struct servent *getservbyname (char *name, char *type)
{
struct servent *serv1;
- serv1 = (struct servent *) malloc (sizeof(struct servent));
+ serv1 = (struct servent *) emalloc (sizeof(struct servent));
serv1->s_name = "ntp"; /* official service name */
serv1->s_aliases = NULL; /* alias list */
serv1->s_port = 123; /* port # */
diff --git a/libntp/msyslog.c b/libntp/msyslog.c
index 283414d74423..cc8868f8e7b8 100644
--- a/libntp/msyslog.c
+++ b/libntp/msyslog.c
@@ -38,7 +38,7 @@ char * syslog_abs_fname;
#define INIT_NTP_SYSLOGMASK ~(u_int32)0
u_int32 ntp_syslogmask = INIT_NTP_SYSLOGMASK;
-extern char * progname;
+extern char const * progname;
/* Declare the local functions */
void addto_syslog (int, const char *);
@@ -145,8 +145,8 @@ addto_syslog(
const char * msg
)
{
- static char * prevcall_progname;
- static char * prog;
+ static char const * prevcall_progname;
+ static char const * prog;
const char nl[] = "\n";
const char empty[] = "";
FILE * term_file;
@@ -357,6 +357,18 @@ msyslog(
addto_syslog(level, buf);
}
+void
+mvsyslog(
+ int level,
+ const char * fmt,
+ va_list ap
+ )
+{
+ char buf[1024];
+ mvsnprintf(buf, sizeof(buf), fmt, ap);
+ addto_syslog(level, buf);
+}
+
/*
* Initialize the logging
@@ -371,7 +383,7 @@ init_logging(
)
{
static int was_daemon;
- const char * cp;
+ char * cp;
const char * pname;
/*
@@ -402,7 +414,7 @@ init_logging(
#ifdef SYS_WINNT /* strip ".exe" */
cp = strrchr(progname, '.');
if (NULL != cp && !strcasecmp(cp, ".exe"))
- progname[cp - progname] = '\0';
+ *cp = '\0';
#endif
#if !defined(VMS)
@@ -454,7 +466,7 @@ change_logfile(
size_t octets;
#endif /* POSIX */
- NTP_REQUIRE(fname != NULL);
+ REQUIRE(fname != NULL);
log_fname = fname;
/*
diff --git a/libntp/ntp_calendar.c b/libntp/ntp_calendar.c
index ff91fcfc678d..ff6ead364e5a 100644
--- a/libntp/ntp_calendar.c
+++ b/libntp/ntp_calendar.c
@@ -3,7 +3,55 @@
*
* Written by Juergen Perlinger (perlinger@ntp.org) for the NTP project.
* The contents of 'html/copyright.html' apply.
+ *
+ * --------------------------------------------------------------------
+ * Some notes on the implementation:
+ *
+ * Calendar algorithms thrive on the division operation, which is one of
+ * the slowest numerical operations in any CPU. What saves us here from
+ * abysmal performance is the fact that all divisions are divisions by
+ * constant numbers, and most compilers can do this by a multiplication
+ * operation. But this might not work when using the div/ldiv/lldiv
+ * function family, because many compilers are not able to do inline
+ * expansion of the code with following optimisation for the
+ * constant-divider case.
+ *
+ * Also div/ldiv/lldiv are defined in terms of int/long/longlong, which
+ * are inherently target dependent. Nothing that could not be cured with
+ * autoconf, but still a mess...
+ *
+ * Furthermore, we need floor division in many places. C either leaves
+ * the division behaviour undefined (< C99) or demands truncation to
+ * zero (>= C99), so additional steps are required to make sure the
+ * algorithms work. The {l,ll}div function family is requested to
+ * truncate towards zero, which is also the wrong direction for our
+ * purpose.
+ *
+ * For all this, all divisions by constant are coded manually, even when
+ * there is a joined div/mod operation: The optimiser should sort that
+ * out, if possible. Most of the calculations are done with unsigned
+ * types, explicitely using two's complement arithmetics where
+ * necessary. This minimises the dependecies to compiler and target,
+ * while still giving reasonable to good performance.
+ *
+ * The implementation uses a few tricks that exploit properties of the
+ * two's complement: Floor division on negative dividents can be
+ * executed by using the one's complement of the divident. One's
+ * complement can be easily created using XOR and a mask.
+ *
+ * Finally, check for overflow conditions is minimal. There are only two
+ * calculation steps in the whole calendar that suffer from an internal
+ * overflow, and these conditions are checked: errno is set to EDOM and
+ * the results are clamped/saturated in this case. All other functions
+ * do not suffer from internal overflow and simply return the result
+ * truncated to 32 bits.
+ *
+ * This is a sacrifice made for execution speed. Since a 32-bit day
+ * counter covers +/- 5,879,610 years and the clamp limits the effective
+ * range to +/-2.9 million years, this should not pose a problem here.
+ *
*/
+
#include <config.h>
#include <sys/types.h>
@@ -13,6 +61,33 @@
#include "ntp_fp.h"
#include "ntp_unixtime.h"
+/* For now, let's take the conservative approach: if the target property
+ * macros are not defined, check a few well-known compiler/architecture
+ * settings. Default is to assume that the representation of signed
+ * integers is unknown and shift-arithmetic-right is not available.
+ */
+#ifndef TARGET_HAS_2CPL
+# if defined(__GNUC__)
+# if defined(__i386__) || defined(__x86_64__) || defined(__arm__)
+# define TARGET_HAS_2CPL 1
+# else
+# define TARGET_HAS_2CPL 0
+# endif
+# elif defined(_MSC_VER)
+# if defined(_M_IX86) || defined(_M_X64) || defined(_M_ARM)
+# define TARGET_HAS_2CPL 1
+# else
+# define TARGET_HAS_2CPL 0
+# endif
+# else
+# define TARGET_HAS_2CPL 0
+# endif
+#endif
+
+#ifndef TARGET_HAS_SAR
+# define TARGET_HAS_SAR 0
+#endif
+
/*
*---------------------------------------------------------------------
* replacing the 'time()' function
@@ -47,6 +122,117 @@ now(void)
/*
*---------------------------------------------------------------------
+ * Get sign extension mask and unsigned 2cpl rep for a signed integer
+ *---------------------------------------------------------------------
+ */
+
+static inline uint32_t
+int32_sflag(
+ const int32_t v)
+{
+# if TARGET_HAS_2CPL && TARGET_HAS_SAR && SIZEOF_INT >= 4
+
+ /* Let's assume that shift is the fastest way to get the sign
+ * extension of of a signed integer. This might not always be
+ * true, though -- On 8bit CPUs or machines without barrel
+ * shifter this will kill the performance. So we make sure
+ * we do this only if 'int' has at least 4 bytes.
+ */
+ return (uint32_t)(v >> 31);
+
+# else
+
+ /* This should be a rather generic approach for getting a sign
+ * extension mask...
+ */
+ return UINT32_C(0) - (uint32_t)(v < 0);
+
+# endif
+}
+
+static inline uint32_t
+int32_to_uint32_2cpl(
+ const int32_t v)
+{
+ uint32_t vu;
+
+# if TARGET_HAS_2CPL
+
+ /* Just copy through the 32 bits from the signed value if we're
+ * on a two's complement target.
+ */
+ vu = (uint32_t)v;
+
+# else
+
+ /* Convert from signed int to unsigned int two's complement. Do
+ * not make any assumptions about the representation of signed
+ * integers, but make sure signed integer overflow cannot happen
+ * here. A compiler on a two's complement target *might* find
+ * out that this is just a complicated cast (as above), but your
+ * mileage might vary.
+ */
+ if (v < 0)
+ vu = ~(uint32_t)(-(v + 1));
+ else
+ vu = (uint32_t)v;
+
+# endif
+
+ return vu;
+}
+
+static inline int32_t
+uint32_2cpl_to_int32(
+ const uint32_t vu)
+{
+ int32_t v;
+
+# if TARGET_HAS_2CPL
+
+ /* Just copy through the 32 bits from the unsigned value if
+ * we're on a two's complement target.
+ */
+ v = (int32_t)vu;
+
+# else
+
+ /* Convert to signed integer, making sure signed integer
+ * overflow cannot happen. Again, the optimiser might or might
+ * not find out that this is just a copy of 32 bits on a target
+ * with two's complement representation for signed integers.
+ */
+ if (vu > INT32_MAX)
+ v = -(int32_t)(~vu) - 1;
+ else
+ v = (int32_t)vu;
+
+# endif
+
+ return v;
+}
+
+/* Some of the calculations need to multiply the input by 4 before doing
+ * a division. This can cause overflow and strange results. Therefore we
+ * clamp / saturate the input operand. And since we do the calculations
+ * in unsigned int with an extra sign flag/mask, we only loose one bit
+ * of the input value range.
+ */
+static inline uint32_t
+uint32_saturate(
+ uint32_t vu,
+ uint32_t mu)
+{
+ static const uint32_t limit = UINT32_MAX/4u;
+ if ((mu ^ vu) > limit) {
+ vu = mu ^ limit;
+ errno = EDOM;
+ }
+ return vu;
+}
+
+/*
+ *---------------------------------------------------------------------
* Convert between 'time_t' and 'vint64'
*---------------------------------------------------------------------
*/
@@ -60,7 +246,7 @@ time_to_vint64(
tt = *ptt;
-#if SIZEOF_TIME_T <= 4
+# if SIZEOF_TIME_T <= 4
res.D_s.hi = 0;
if (tt < 0) {
@@ -70,11 +256,11 @@ time_to_vint64(
res.D_s.lo = (uint32_t)tt;
}
-#elif defined(HAVE_INT64)
+# elif defined(HAVE_INT64)
res.q_s = tt;
-#else
+# else
/*
* shifting negative signed quantities is compiler-dependent, so
* we better avoid it and do it all manually. And shifting more
@@ -90,7 +276,7 @@ time_to_vint64(
res.D_s.hi = (uint32_t)(tt >> 32);
}
-#endif
+# endif
return res;
}
@@ -103,19 +289,19 @@ vint64_to_time(
{
time_t res;
-#if SIZEOF_TIME_T <= 4
+# if SIZEOF_TIME_T <= 4
res = (time_t)tv->D_s.lo;
-#elif defined(HAVE_INT64)
+# elif defined(HAVE_INT64)
res = (time_t)tv->q_s;
-#else
+# else
res = ((time_t)tv->d_s.hi << 32) | tv->D_s.lo;
-#endif
+# endif
return res;
}
@@ -153,11 +339,11 @@ ntpcal_get_build_date(
* problem.
*
*/
-#ifdef MKREPRO_DATE
+# ifdef MKREPRO_DATE
static const char build[] = MKREPRO_TIME "/" MKREPRO_DATE;
-#else
+# else
static const char build[] = __TIME__ "/" __DATE__;
-#endif
+# endif
static const char mlist[] = "JanFebMarAprMayJunJulAugSepOctNovDec";
char monstr[4];
@@ -167,16 +353,16 @@ ntpcal_get_build_date(
* so using 'uint16_t' is contra-indicated!
*/
-#ifdef DEBUG
+# ifdef DEBUG
static int ignore = 0;
-#endif
+# endif
ZERO(*jd);
jd->year = 1970;
jd->month = 1;
jd->monthday = 1;
-#ifdef DEBUG
+# ifdef DEBUG
/* check environment if build date should be ignored */
if (0 == ignore) {
const char * envstr;
@@ -185,7 +371,7 @@ ntpcal_get_build_date(
}
if (ignore > 1)
return FALSE;
-#endif
+# endif
if (6 == sscanf(build, "%hu:%hu:%hu/%3s %hu %hu",
&hour, &minute, &second, monstr, &day, &year)) {
@@ -254,37 +440,8 @@ static const uint16_t real_month_table[2][13] = {
* (day number). This is the number of days elapsed since 0000-12-31
* in the proleptic Gregorian calendar. The begin of the Christian Era
* (0001-01-01) is RD(1).
- *
- *
- * Some notes on the implementation:
- *
- * Calendar algorithms thrive on the division operation, which is one of
- * the slowest numerical operations in any CPU. What saves us here from
- * abysmal performance is the fact that all divisions are divisions by
- * constant numbers, and most compilers can do this by a multiplication
- * operation. But this might not work when using the div/ldiv/lldiv
- * function family, because many compilers are not able to do inline
- * expansion of the code with following optimisation for the
- * constant-divider case.
- *
- * Also div/ldiv/lldiv are defined in terms of int/long/longlong, which
- * are inherently target dependent. Nothing that could not be cured with
- * autoconf, but still a mess...
- *
- * Furthermore, we need floor division while C demands truncation to
- * zero, so additional steps are required to make sure the algorithms
- * work.
- *
- * For all this, all divisions by constant are coded manually, even when
- * there is a joined div/mod operation: The optimiser should sort that
- * out, if possible.
- *
- * Finally, the functions do not check for overflow conditions. This
- * is a sacrifice made for execution speed; since a 32-bit day counter
- * covers +/- 5,879,610 years, this should not pose a problem here.
*/
-
/*
* ==================================================================
*
@@ -363,22 +520,23 @@ ntpcal_periodic_extend(
* Get absolute difference as unsigned quantity and
* the complement flag. This is done by always
* subtracting the smaller value from the bigger
- * one. This implementation works only on a two's
- * complement machine!
+ * one.
*/
if (value >= pivot) {
- diff = (uint32_t)value - (uint32_t)pivot;
+ diff = int32_to_uint32_2cpl(value)
+ - int32_to_uint32_2cpl(pivot);
} else {
- diff = (uint32_t)pivot - (uint32_t)value;
+ diff = int32_to_uint32_2cpl(pivot)
+ - int32_to_uint32_2cpl(value);
cpl ^= 1;
}
diff %= (uint32_t)cycle;
if (diff) {
if (cpl)
- diff = cycle - diff;
+ diff = (uint32_t)cycle - diff;
if (neg)
diff = ~diff + 1;
- pivot += diff;
+ pivot += uint32_2cpl_to_int32(diff);
}
}
return pivot;
@@ -405,7 +563,7 @@ ntpcal_ntp_to_time(
{
vint64 res;
-#ifdef HAVE_INT64
+# if defined(HAVE_INT64)
res.q_s = (pivot != NULL)
? *pivot
@@ -415,7 +573,7 @@ ntpcal_ntp_to_time(
ntp -= res.D_s.lo; /* cycle difference */
res.Q_s += (uint64_t)ntp; /* get expanded time */
-#else /* no 64bit scalars */
+# else /* no 64bit scalars */
time_t tmp;
@@ -428,7 +586,7 @@ ntpcal_ntp_to_time(
ntp -= res.D_s.lo; /* cycle difference */
M_ADD(res.D_s.hi, res.D_s.lo, 0, ntp);
-#endif /* no 64bit scalars */
+# endif /* no 64bit scalars */
return res;
}
@@ -454,7 +612,7 @@ ntpcal_ntp_to_ntp(
{
vint64 res;
-#ifdef HAVE_INT64
+# if defined(HAVE_INT64)
res.q_s = (pivot)
? *pivot
@@ -464,7 +622,7 @@ ntpcal_ntp_to_ntp(
ntp -= res.D_s.lo; /* cycle difference */
res.Q_s += (uint64_t)ntp; /* get expanded time */
-#else /* no 64bit scalars */
+# else /* no 64bit scalars */
time_t tmp;
@@ -477,7 +635,7 @@ ntpcal_ntp_to_ntp(
ntp -= res.D_s.lo; /* cycle difference */
M_ADD(res.D_s.hi, res.D_s.lo, 0, ntp);
-#endif /* no 64bit scalars */
+# endif /* no 64bit scalars */
return res;
}
@@ -505,78 +663,75 @@ ntpcal_daysplit(
)
{
ntpcal_split res;
+ uint32_t Q;
+
+# if defined(HAVE_INT64)
+
+ /* Manual floor division by SECSPERDAY. This uses the one's
+ * complement trick, too, but without an extra flag value: The
+ * flag would be 64bit, and that's a bit of overkill on a 32bit
+ * target that has to use a register pair for a 64bit number.
+ */
+ if (ts->q_s < 0)
+ Q = ~(uint32_t)(~ts->Q_s / SECSPERDAY);
+ else
+ Q = (uint32_t)(ts->Q_s / SECSPERDAY);
-#ifdef HAVE_INT64
+# else
- /* manual floor division by SECSPERDAY */
- res.hi = (int32_t)(ts->q_s / SECSPERDAY);
- res.lo = (int32_t)(ts->q_s % SECSPERDAY);
- if (res.lo < 0) {
- res.hi -= 1;
- res.lo += SECSPERDAY;
- }
+ uint32_t ah, al, sflag, A;
-#else
+ /* get operand into ah/al (either ts or ts' one's complement,
+ * for later floor division)
+ */
+ sflag = int32_sflag(ts->d_s.hi);
+ ah = sflag ^ ts->D_s.hi;
+ al = sflag ^ ts->D_s.lo;
+
+ /* Since 86400 == 128*675 we can drop the least 7 bits and
+ * divide by 675 instead of 86400. Then the maximum remainder
+ * after each devision step is 674, and we need 10 bits for
+ * that. So in the next step we can shift in 22 bits from the
+ * numerator.
+ *
+ * Therefore we load the accu with the top 13 bits (51..63) in
+ * the first shot. We don't have to remember the quotient -- it
+ * would be shifted out anyway.
+ */
+ A = ah >> 19;
+ if (A >= 675)
+ A = (A % 675u);
+
+ /* Now assemble the remainder with bits 29..50 from the
+ * numerator and divide. This creates the upper ten bits of the
+ * quotient. (Well, the top 22 bits of a 44bit result. But that
+ * will be truncated to 32 bits anyway.)
+ */
+ A = (A << 19) | (ah & 0x0007FFFFu);
+ A = (A << 3) | (al >> 29);
+ Q = A / 675u;
+ A = A % 675u;
- /*
- * since we do not have 64bit ops, we have to this by hand.
- * Luckily SECSPERDAY is 86400 is 675*128, so we do the division
- * using chained 32/16 bit divisions and shifts.
+ /* Now assemble the remainder with bits 7..28 from the numerator
+ * and do a final division step.
*/
- vint64 op;
- uint32_t q, r, a;
- int isneg;
+ A = (A << 22) | ((al >> 7) & 0x003FFFFFu);
+ Q = (Q << 22) | (A / 675u);
- memcpy(&op, ts, sizeof(op));
- /* fix sign */
- isneg = M_ISNEG(op.D_s.hi);
- if (isneg)
- M_NEG(op.D_s.hi, op.D_s.lo);
-
- /* save remainder of DIV 128, shift for divide */
- r = op.D_s.lo & 127; /* save remainder bits */
- op.D_s.lo = (op.D_s.lo >> 7) | (op.D_s.hi << 25);
- op.D_s.hi = (op.D_s.hi >> 7);
-
- /* now do a mnual division, trying to remove as many ops as
- * possible -- division is always slow! An since we do not have
- * the advantage of a specific 64/32 bit or even a specific 32/16
- * bit division op, but must use the general 32/32bit division
- * even if we *know* the divider fits into unsigned 16 bits, the
- * exra code pathes should pay off.
+ /* The last 7 bits get simply dropped, as they have no affect on
+ * the quotient when dividing by 86400.
*/
- a = op.D_s.hi;
- if (a > 675u)
- a = a % 675u;
- if (a) {
- a = (a << 16) | op.W_s.lh;
- q = a / 675u;
- a = a % 675u;
-
- a = (a << 16) | op.W_s.ll;
- q = (q << 16) | (a / 675u);
- } else {
- a = op.D_s.lo;
- q = a / 675u;
- }
- a = a % 675u;
-
- /* assemble remainder */
- r |= a << 7;
-
- /* fix sign of result */
- if (isneg) {
- if (r) {
- r = SECSPERDAY - r;
- q = ~q;
- } else
- q = ~q + 1;
- }
- res.hi = q;
- res.lo = r;
+ /* apply sign correction and calculate the true floor
+ * remainder.
+ */
+ Q ^= sflag;
+
+# endif
+
+ res.hi = uint32_2cpl_to_int32(Q);
+ res.lo = ts->D_s.lo - Q * SECSPERDAY;
-#endif
return res;
}
@@ -593,25 +748,28 @@ priv_timesplit(
int32_t ts
)
{
- int32_t days = 0;
-
- /* make sure we have a positive offset into a day */
- if (ts < 0 || ts >= SECSPERDAY) {
- days = ts / SECSPERDAY;
- ts = ts % SECSPERDAY;
- if (ts < 0) {
- days -= 1;
- ts += SECSPERDAY;
- }
- }
+ /* Do 3 chained floor divisions by positive constants, using the
+ * one's complement trick and factoring out the intermediate XOR
+ * ops to reduce the number of operations.
+ */
+ uint32_t us, um, uh, ud, sflag;
- /* get secs, mins, hours */
- split[2] = (uint8_t)(ts % SECSPERMIN);
- ts /= SECSPERMIN;
- split[1] = (uint8_t)(ts % MINSPERHR);
- split[0] = (uint8_t)(ts / MINSPERHR);
+ sflag = int32_sflag(ts);
+ us = int32_to_uint32_2cpl(ts);
- return days;
+ um = (sflag ^ us) / SECSPERMIN;
+ uh = um / MINSPERHR;
+ ud = uh / HRSPERDAY;
+
+ um ^= sflag;
+ uh ^= sflag;
+ ud ^= sflag;
+
+ split[0] = (int32_t)(uh - ud * HRSPERDAY );
+ split[1] = (int32_t)(um - uh * MINSPERHR );
+ split[2] = (int32_t)(us - um * SECSPERMIN);
+
+ return uint32_2cpl_to_int32(ud);
}
/*
@@ -630,46 +788,45 @@ ntpcal_split_eradays(
int *isleapyear
)
{
- ntpcal_split res;
- int32_t n400, n100, n004, n001, yday; /* calendar year cycles */
-
- /*
- * Split off calendar cycles, using floor division in the first
- * step. After that first step, simple division does it because
- * all operands are positive; alas, we have to be aware of the
- * possibe cycle overflows for 100 years and 1 year, caused by
- * the additional leap day.
+ /* Use the fast cyclesplit algorithm here, to calculate the
+ * centuries and years in a century with one division each. This
+ * reduces the number of division operations to two, but is
+ * susceptible to internal range overflow. We make sure the
+ * input operands are in the safe range; this still gives us
+ * approx +/-2.9 million years.
*/
- n400 = days / GREGORIAN_CYCLE_DAYS;
- yday = days % GREGORIAN_CYCLE_DAYS;
- if (yday < 0) {
- n400 -= 1;
- yday += GREGORIAN_CYCLE_DAYS;
- }
- n100 = yday / GREGORIAN_NORMAL_CENTURY_DAYS;
- yday = yday % GREGORIAN_NORMAL_CENTURY_DAYS;
- n004 = yday / GREGORIAN_NORMAL_LEAP_CYCLE_DAYS;
- yday = yday % GREGORIAN_NORMAL_LEAP_CYCLE_DAYS;
- n001 = yday / DAYSPERYEAR;
- yday = yday % DAYSPERYEAR;
-
- /*
- * check for leap cycle overflows and calculate the leap flag
- * if needed
+ ntpcal_split res;
+ int32_t n100, n001; /* calendar year cycles */
+ uint32_t uday, Q, sflag;
+
+ /* split off centuries first */
+ sflag = int32_sflag(days);
+ uday = uint32_saturate(int32_to_uint32_2cpl(days), sflag);
+ uday = (4u * uday) | 3u;
+ Q = sflag ^ ((sflag ^ uday) / GREGORIAN_CYCLE_DAYS);
+ uday = uday - Q * GREGORIAN_CYCLE_DAYS;
+ n100 = uint32_2cpl_to_int32(Q);
+
+ /* Split off years in century -- days >= 0 here, and we're far
+ * away from integer overflow trouble now. */
+ uday |= 3;
+ n001 = uday / GREGORIAN_NORMAL_LEAP_CYCLE_DAYS;
+ uday = uday % GREGORIAN_NORMAL_LEAP_CYCLE_DAYS;
+
+ /* Assemble the year and day in year */
+ res.hi = n100 * 100 + n001;
+ res.lo = uday / 4u;
+
+ /* Eventually set the leap year flag. Note: 0 <= n001 <= 99 and
+ * Q is still the two's complement representation of the
+ * centuries: The modulo 4 ops can be done with masking here.
+ * We also shift the year and the century by one, so the tests
+ * can be done against zero instead of 3.
*/
- if ((n001 | n100) > 3) {
- /* hit last day of leap year */
- n001 -= 1;
- yday += DAYSPERYEAR;
- if (isleapyear)
- *isleapyear = 1;
- } else if (isleapyear)
- *isleapyear = (n001 == 3) && ((n004 != 24) || (n100 == 3));
-
- /* now merge the cycles to elapsed years, using horner scheme */
- res.hi = ((4*n400 + n100)*25 + n004)*4 + n001;
- res.lo = yday;
-
+ if (isleapyear)
+ *isleapyear = !((n001+1) & 3)
+ && ((n001 != 99) || !((Q+1) & 3));
+
return res;
}
@@ -719,11 +876,9 @@ ntpcal_rd_to_date(
)
{
ntpcal_split split;
- int leaps;
- int retv;
+ int leapy;
+ u_int ymask;
- leaps = 0;
- retv = 0;
/* Get day-of-week first. Since rd is signed, the remainder can
* be in the range [-6..+6], but the assignment to an unsigned
* variable maps the negative values to positive values >=7.
@@ -731,26 +886,28 @@ ntpcal_rd_to_date(
* causes the needed wrap-around into the desired value range of
* zero to six, both inclusive.
*/
- jd->weekday = rd % 7;
- if (jd->weekday >= 7) /* unsigned! */
- jd->weekday += 7;
-
- split = ntpcal_split_eradays(rd - 1, &leaps);
- retv = leaps;
- /* get year and day-of-year */
- jd->year = (uint16_t)split.hi + 1;
- if (jd->year != split.hi + 1) {
- jd->year = 0;
- retv = -1; /* bletch. overflow trouble. */
- }
+ jd->weekday = rd % DAYSPERWEEK;
+ if (jd->weekday >= DAYSPERWEEK) /* weekday is unsigned! */
+ jd->weekday += DAYSPERWEEK;
+
+ split = ntpcal_split_eradays(rd - 1, &leapy);
+ /* Get year and day-of-year, with overflow check. If any of the
+ * upper 16 bits is set after shifting to unity-based years, we
+ * will have an overflow when converting to an unsigned 16bit
+ * year. Shifting to the right is OK here, since it does not
+ * matter if the shift is logic or arithmetic.
+ */
+ split.hi += 1;
+ ymask = 0u - ((split.hi >> 16) == 0);
+ jd->year = (uint16_t)(split.hi & ymask);
jd->yearday = (uint16_t)split.lo + 1;
/* convert to month and mday */
- split = ntpcal_split_yeardays(split.lo, leaps);
+ split = ntpcal_split_yeardays(split.lo, leapy);
jd->month = (uint8_t)split.hi + 1;
jd->monthday = (uint8_t)split.lo + 1;
- return retv ? retv : leaps;
+ return ymask ? leapy : -1;
}
/*
@@ -765,25 +922,24 @@ ntpcal_rd_to_tm(
)
{
ntpcal_split split;
- int leaps;
+ int leapy;
- leaps = 0;
/* get day-of-week first */
- utm->tm_wday = rd % 7;
+ utm->tm_wday = rd % DAYSPERWEEK;
if (utm->tm_wday < 0)
- utm->tm_wday += 7;
+ utm->tm_wday += DAYSPERWEEK;
/* get year and day-of-year */
- split = ntpcal_split_eradays(rd - 1, &leaps);
+ split = ntpcal_split_eradays(rd - 1, &leapy);
utm->tm_year = split.hi - 1899;
utm->tm_yday = split.lo; /* 0-based */
/* convert to month and mday */
- split = ntpcal_split_yeardays(split.lo, leaps);
+ split = ntpcal_split_yeardays(split.lo, leapy);
utm->tm_mon = split.hi; /* 0-based */
utm->tm_mday = split.lo + 1; /* 1-based */
- return leaps;
+ return leapy;
}
/*
@@ -918,13 +1074,13 @@ ntpcal_dayjoin(
{
vint64 res;
-#ifdef HAVE_INT64
+# if defined(HAVE_INT64)
res.q_s = days;
res.q_s *= SECSPERDAY;
res.q_s += secs;
-#else
+# else
uint32_t p1, p2;
int isneg;
@@ -963,47 +1119,57 @@ ntpcal_dayjoin(
}
M_ADD(res.D_s.hi, res.D_s.lo, p2, p1);
-#endif
+# endif
return res;
}
/*
*---------------------------------------------------------------------
- * Convert elapsed years in Era into elapsed days in Era.
- *
- * To accomodate for negative values of years, floor division would be
- * required for all division operations. This can be eased by first
- * splitting the years into full 400-year cycles and years in the
- * cycle. Only this operation must be coded as a full floor division; as
- * the years in the cycle is a non-negative number, all other divisions
- * can be regular truncated divisions.
+ * get leap years since epoch in elapsed years
*---------------------------------------------------------------------
*/
int32_t
-ntpcal_days_in_years(
+ntpcal_leapyears_in_years(
int32_t years
)
{
- int32_t cycle; /* full gregorian cycle */
-
- /* split off full calendar cycles, using floor division */
- cycle = years / 400;
- years = years % 400;
- if (years < 0) {
- cycle -= 1;
- years += 400;
- }
+ /* We use the in-out-in algorithm here, using the one's
+ * complement division trick for negative numbers. The chained
+ * division sequence by 4/25/4 gives the compiler the chance to
+ * get away with only one true division and doing shifts otherwise.
+ */
- /*
- * Calculate days in cycle. years now is a non-negative number,
- * holding the number of years in the 400-year cycle.
+ uint32_t sflag, sum, uyear;
+
+ sflag = int32_sflag(years);
+ uyear = int32_to_uint32_2cpl(years);
+ uyear ^= sflag;
+
+ sum = (uyear /= 4u); /* 4yr rule --> IN */
+ sum -= (uyear /= 25u); /* 100yr rule --> OUT */
+ sum += (uyear /= 4u); /* 400yr rule --> IN */
+
+ /* Thanks to the alternation of IN/OUT/IN we can do the sum
+ * directly and have a single one's complement operation
+ * here. (Only if the years are negative, of course.) Otherwise
+ * the one's complement would have to be done when
+ * adding/subtracting the terms.
*/
- return cycle * GREGORIAN_CYCLE_DAYS
- + years * DAYSPERYEAR /* days inregular years */
- + years / 4 /* 4 year leap rule */
- - years / 100; /* 100 year leap rule */
- /* the 400-year rule does not apply due to full-cycle split-off */
+ return uint32_2cpl_to_int32(sflag ^ sum);
+}
+
+/*
+ *---------------------------------------------------------------------
+ * Convert elapsed years in Era into elapsed days in Era.
+ *---------------------------------------------------------------------
+ */
+int32_t
+ntpcal_days_in_years(
+ int32_t years
+ )
+{
+ return years * DAYSPERYEAR + ntpcal_leapyears_in_years(years);
}
/*
@@ -1029,26 +1195,22 @@ ntpcal_days_in_months(
{
ntpcal_split res;
- /* normalize month into range */
- res.hi = 0;
- res.lo = m;
- if (res.lo < 0 || res.lo >= 12) {
- res.hi = res.lo / 12;
- res.lo = res.lo % 12;
- if (res.lo < 0) {
- res.hi -= 1;
- res.lo += 12;
- }
- }
+ /* Add ten months and correct if needed. (It likely is...) */
+ res.lo = m + 10;
+ res.hi = (res.lo >= 12);
+ if (res.hi)
+ res.lo -= 12;
- /* add 10 month for year starting with march */
- if (res.lo < 2)
- res.lo += 10;
- else {
- res.hi += 1;
- res.lo -= 2;
+ /* if still out of range, normalise by floor division ... */
+ if (res.lo < 0 || res.lo >= 12) {
+ uint32_t mu, Q, sflag;
+ sflag = int32_sflag(res.lo);
+ mu = int32_to_uint32_2cpl(res.lo);
+ Q = sflag ^ ((sflag ^ mu) / 12u);
+ res.hi += uint32_2cpl_to_int32(Q);
+ res.lo = mu - Q * 12u;
}
-
+
/* get cummulated days in year with unshift */
res.lo = shift_month_table[res.lo] - 306;
@@ -1451,37 +1613,42 @@ int32_t
isocal_weeks_in_years(
int32_t years
)
-{
+{
/*
* use: w = (y * 53431 + b[c]) / 1024 as interpolation
*/
- static const int32_t bctab[4] = { 449, 157, 889, 597 };
- int32_t cycle; /* full gregorian cycle */
- int32_t cents; /* full centuries */
- int32_t weeks; /* accumulated weeks */
-
- /* split off full calendar cycles, using floor division */
- cycle = years / 400;
- years = years % 400;
- if (years < 0) {
- cycle -= 1;
- years += 400;
- }
-
- /* split off full centuries */
- cents = years / 100;
- years = years % 100;
-
- /*
- * calculate elapsed weeks, taking into account that the
- * first, third and fourth century have 5218 weeks but the
- * second century falls short by one week.
+ static const uint16_t bctab[4] = { 157, 449, 597, 889 };
+
+ int32_t cs, cw;
+ uint32_t cc, ci, yu, sflag;
+
+ sflag = int32_sflag(years);
+ yu = int32_to_uint32_2cpl(years);
+
+ /* split off centuries, using floor division */
+ cc = sflag ^ ((sflag ^ yu) / 100u);
+ yu -= cc * 100u;
+
+ /* calculate century cycles shift and cycle index:
+ * Assuming a century is 5217 weeks, we have to add a cycle
+ * shift that is 3 for every 4 centuries, because 3 of the four
+ * centuries have 5218 weeks. So '(cc*3 + 1) / 4' is the actual
+ * correction, and the second century is the defective one.
+ *
+ * Needs floor division by 4, which is done with masking and
+ * shifting.
+ */
+ ci = cc * 3u + 1;
+ cs = uint32_2cpl_to_int32(sflag ^ ((sflag ^ ci) / 4u));
+ ci = ci % 4u;
+
+ /* Get weeks in century. Can use plain division here as all ops
+ * are >= 0, and let the compiler sort out the possible
+ * optimisations.
*/
- weeks = (years * 53431 + bctab[cents]) / 1024;
+ cw = (yu * 53431u + bctab[ci]) / 1024u;
- return cycle * GREGORIAN_CYCLE_WEEKS
- + cents * 5218 - (cents > 1)
- + weeks;
+ return uint32_2cpl_to_int32(cc) * 5217 + cs + cw;
}
/*
@@ -1498,35 +1665,41 @@ isocal_split_eraweeks(
/*
* use: y = (w * 157 + b[c]) / 8192 as interpolation
*/
- static const int32_t bctab[4] = { 85, 131, 17, 62 };
+
+ static const uint16_t bctab[4] = { 85, 130, 17, 62 };
+
ntpcal_split res;
- int32_t cents;
+ int32_t cc, ci;
+ uint32_t sw, cy, Q, sflag;
- /*
- * split off 400-year cycles, using the fact that a 400-year
- * cycle has 146097 days, which is exactly 20871 weeks.
+ /* Use two fast cycle-split divisions here. This is again
+ * susceptible to internal overflow, so we check the range. This
+ * still permits more than +/-20 million years, so this is
+ * likely a pure academical problem.
+ *
+ * We want to execute '(weeks * 4 + 2) /% 20871' under floor
+ * division rules in the first step.
*/
- res.hi = weeks / GREGORIAN_CYCLE_WEEKS;
- res.lo = weeks % GREGORIAN_CYCLE_WEEKS;
- if (res.lo < 0) {
- res.hi -= 1;
- res.lo += GREGORIAN_CYCLE_WEEKS;
- }
- res.hi *= 400;
-
- /*
- * split off centuries, taking into account that the first,
- * third and fourth century have 5218 weeks but that the
- * second century falls short by one week.
+ sflag = int32_sflag(weeks);
+ sw = uint32_saturate(int32_to_uint32_2cpl(weeks), sflag);
+ sw = 4u * sw + 2;
+ Q = sflag ^ ((sflag ^ sw) / GREGORIAN_CYCLE_WEEKS);
+ sw -= Q * GREGORIAN_CYCLE_WEEKS;
+ ci = Q % 4u;
+ cc = uint32_2cpl_to_int32(Q);
+
+ /* Split off years; sw >= 0 here! The scaled weeks in the years
+ * are scaled up by 157 afterwards.
+ */
+ sw = (sw / 4u) * 157u + bctab[ci];
+ cy = sw / 8192u; /* ws >> 13 , let the compiler sort it out */
+ sw = sw % 8192u; /* ws & 8191, let the compiler sort it out */
+
+ /* assemble elapsed years and downscale the elapsed weeks in
+ * the year.
*/
- res.lo += (res.lo >= 10435);
- cents = res.lo / 5218;
- res.lo %= 5218; /* res.lo is weeks in century now */
-
- /* convert elapsed weeks in century to elapsed years and weeks */
- res.lo = res.lo * 157 + bctab[cents];
- res.hi += cents * 100 + res.lo / 8192;
- res.lo = (res.lo % 8192) / 157;
+ res.hi = 100*cc + cy;
+ res.lo = sw / 157u;
return res;
}
@@ -1544,6 +1717,7 @@ isocal_ntp64_to_date(
{
ntpcal_split ds;
int32_t ts[3];
+ uint32_t uw, ud, sflag;
/*
* Split NTP time into days and seconds, shift days into CE
@@ -1557,16 +1731,18 @@ isocal_ntp64_to_date(
id->minute = (uint8_t)ts[1];
id->second = (uint8_t)ts[2];
- /* split date part */
- ds.lo = ds.hi + DAY_NTP_STARTS - 1; /* elapsed era days */
- ds.hi = ds.lo / 7; /* elapsed era weeks */
- ds.lo = ds.lo % 7; /* elapsed week days */
- if (ds.lo < 0) { /* floor division! */
- ds.hi -= 1;
- ds.lo += 7;
- }
+ /* split days into days and weeks, using floor division in unsigned */
+ ds.hi += DAY_NTP_STARTS - 1; /* shift from NTP to RDN */
+ sflag = int32_sflag(ds.hi);
+ ud = int32_to_uint32_2cpl(ds.hi);
+ uw = sflag ^ ((sflag ^ ud) / DAYSPERWEEK);
+ ud -= uw * DAYSPERWEEK;
+ ds.hi = uint32_2cpl_to_int32(uw);
+ ds.lo = ud;
+
id->weekday = (uint8_t)ds.lo + 1; /* weekday result */
+ /* get year and week in year */
ds = isocal_split_eraweeks(ds.hi); /* elapsed years&week*/
id->year = (uint16_t)ds.hi + 1; /* shift to current */
id->week = (uint8_t )ds.lo + 1;
diff --git a/libntp/ntp_intres.c b/libntp/ntp_intres.c
index eea88a127378..b0f562036a00 100644
--- a/libntp/ntp_intres.c
+++ b/libntp/ntp_intres.c
@@ -249,12 +249,12 @@ getaddrinfo_sometime(
size_t servsize;
time_t now;
- NTP_REQUIRE(NULL != node);
+ REQUIRE(NULL != node);
if (NULL != hints) {
- NTP_REQUIRE(0 == hints->ai_addrlen);
- NTP_REQUIRE(NULL == hints->ai_addr);
- NTP_REQUIRE(NULL == hints->ai_canonname);
- NTP_REQUIRE(NULL == hints->ai_next);
+ REQUIRE(0 == hints->ai_addrlen);
+ REQUIRE(NULL == hints->ai_addr);
+ REQUIRE(NULL == hints->ai_canonname);
+ REQUIRE(NULL == hints->ai_next);
}
idx = get_dnschild_ctx();
@@ -420,7 +420,7 @@ blocking_getaddrinfo(
ai = ai_res;
while (NULL != ai) {
- NTP_INSIST(ai->ai_addrlen <= sizeof(sockaddr_u));
+ INSIST(ai->ai_addrlen <= sizeof(sockaddr_u));
memcpy(cp, ai->ai_addr, ai->ai_addrlen);
cp += sizeof(sockaddr_u);
@@ -568,7 +568,7 @@ getaddrinfo_sometime_complete(
ai[i].ai_canonname += (size_t)canon_start;
}
- NTP_ENSURE((char *)psau == canon_start);
+ ENSURE((char *)psau == canon_start);
if (!gai_resp->ai_count)
ai = NULL;
@@ -634,8 +634,8 @@ getnameinfo_sometime(
dnschild_ctx * child_ctx;
time_t time_now;
- NTP_REQUIRE(hostoctets);
- NTP_REQUIRE(hostoctets + servoctets < 1024);
+ REQUIRE(hostoctets);
+ REQUIRE(hostoctets + servoctets < 1024);
idx = get_dnschild_ctx();
child_ctx = dnschild_contexts[idx];
@@ -699,7 +699,7 @@ blocking_getnameinfo(
* large allocations. We only need room for the host
* and service names.
*/
- NTP_REQUIRE(octets < sizeof(host));
+ REQUIRE(octets < sizeof(host));
service = host + gni_req->hostoctets;
worker_ctx = get_worker_context(c, gni_req->dns_idx);
@@ -775,8 +775,8 @@ blocking_getnameinfo(
cp += gni_resp->servoctets;
}
- NTP_INSIST((size_t)(cp - (char *)resp) == resp_octets);
- NTP_INSIST(resp_octets - sizeof(*resp) == gni_resp->octets);
+ INSIST((size_t)(cp - (char *)resp) == resp_octets);
+ INSIST(resp_octets - sizeof(*resp) == gni_resp->octets);
rc = queue_blocking_response(c, resp, resp_octets, req);
if (rc)
diff --git a/libntp/ntp_lineedit.c b/libntp/ntp_lineedit.c
index e3bc0022a292..a2b2d2934705 100644
--- a/libntp/ntp_lineedit.c
+++ b/libntp/ntp_lineedit.c
@@ -36,7 +36,7 @@
* external references
*/
-extern char * progname;
+extern char const * progname;
/*
* globals, private prototypes
diff --git a/libntp/ntp_rfc2553.c b/libntp/ntp_rfc2553.c
index f267999c5e3f..a9ebb4b35363 100644
--- a/libntp/ntp_rfc2553.c
+++ b/libntp/ntp_rfc2553.c
@@ -221,7 +221,7 @@ copy_addrinfo_common(
}
++ai_cpy;
}
- NTP_ENSURE(pcanon == ((char *)dst + octets));
+ ENSURE(pcanon == ((char *)dst + octets));
return dst;
}
diff --git a/libntp/ntp_worker.c b/libntp/ntp_worker.c
index bb1cb87e44a0..32970da0d124 100644
--- a/libntp/ntp_worker.c
+++ b/libntp/ntp_worker.c
@@ -278,7 +278,7 @@ blocking_child_common(
req = receive_blocking_req_internal(c);
if (NULL == req) {
say_bye = TRUE;
- break;
+ continue;
}
DEBUG_REQUIRE(BLOCKING_REQ_MAGIC == req->magic_sig);
diff --git a/libntp/prettydate.c b/libntp/prettydate.c
index 5da5ecc50a69..25b085ef28fb 100644
--- a/libntp/prettydate.c
+++ b/libntp/prettydate.c
@@ -141,7 +141,7 @@ get_struct_tm(
return NULL; /* That's truly pathological! */
/* 'tm' surely not NULL here! */
- NTP_INSIST(tm != NULL);
+ INSIST(tm != NULL);
if (folds != 0) {
tm->tm_year += folds * SOLAR_CYCLE_YEARS;
if (tm->tm_year <= 0 || tm->tm_year >= 200)
diff --git a/libntp/recvbuff.c b/libntp/recvbuff.c
index 83a9ee193a3b..73ebe886d9a7 100644
--- a/libntp/recvbuff.c
+++ b/libntp/recvbuff.c
@@ -216,7 +216,7 @@ get_free_recv_buffer_alloc(void)
create_buffers(RECV_INC);
buffer = get_free_recv_buffer();
}
- NTP_ENSURE(buffer != NULL);
+ ENSURE(buffer != NULL);
return (buffer);
}
#endif
diff --git a/libntp/socket.c b/libntp/socket.c
index de678c6340b4..11fb004690c4 100644
--- a/libntp/socket.c
+++ b/libntp/socket.c
@@ -78,7 +78,7 @@ move_fd(
static SOCKET socket_boundary = -1;
SOCKET newfd;
- NTP_REQUIRE((int)fd >= 0);
+ REQUIRE((int)fd >= 0);
/*
* check whether boundary has be set up
@@ -115,7 +115,7 @@ move_fd(
socket_boundary));
} while (socket_boundary > 0);
#else
- NTP_REQUIRE((int)fd >= 0);
+ ENSURE((int)fd >= 0);
#endif /* !defined(SYS_WINNT) && defined(F_DUPFD) */
return fd;
}
diff --git a/libntp/socktohost.c b/libntp/socktohost.c
index c61e57148a65..3d9ab960e8a1 100644
--- a/libntp/socktohost.c
+++ b/libntp/socktohost.c
@@ -79,7 +79,7 @@ socktohost(
if (a_info)
goto forward_fail;
- NTP_INSIST(alist != NULL);
+ INSIST(alist != NULL);
for (ai = alist; ai != NULL; ai = ai->ai_next) {
/*
diff --git a/libntp/statestr.c b/libntp/statestr.c
index cd98eb3951a3..313cd46bebfe 100644
--- a/libntp/statestr.c
+++ b/libntp/statestr.c
@@ -60,7 +60,7 @@ static const struct codestring select_codes[] = {
{ CTL_PST_SEL_REJECT, "sel_reject" },
{ CTL_PST_SEL_SANE, "sel_falsetick" },
{ CTL_PST_SEL_CORRECT, "sel_excess" },
- { CTL_PST_SEL_SELCAND, "sel_outlyer" },
+ { CTL_PST_SEL_SELCAND, "sel_outlier" },
{ CTL_PST_SEL_SYNCCAND, "sel_candidate" },
{ CTL_PST_SEL_EXCESS, "sel_backup" },
{ CTL_PST_SEL_SYSPEER, "sel_sys.peer" },
diff --git a/libparse/Makefile.in b/libparse/Makefile.in
index d8875d512137..d845e2b63e84 100644
--- a/libparse/Makefile.in
+++ b/libparse/Makefile.in
@@ -118,6 +118,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
$(top_srcdir)/sntp/m4/ntp_locinfo.m4 \
$(top_srcdir)/sntp/m4/ntp_openssl.m4 \
$(top_srcdir)/sntp/m4/ntp_pkg_config.m4 \
+ $(top_srcdir)/sntp/m4/ntp_problemtests.m4 \
$(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \
$(top_srcdir)/sntp/m4/ntp_rlimit.m4 \
$(top_srcdir)/sntp/m4/ntp_sntp.m4 \
@@ -252,6 +253,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_THREAD = @BUILD_THREAD@
CALC_TICKADJ_DB = @CALC_TICKADJ_DB@
CALC_TICKADJ_DL = @CALC_TICKADJ_DL@
CALC_TICKADJ_DS = @CALC_TICKADJ_DS@
@@ -260,6 +262,7 @@ CALC_TICKADJ_NI = @CALC_TICKADJ_NI@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
+CFLAGS_LIBEVENT = @CFLAGS_LIBEVENT@
CFLAGS_NTP = @CFLAGS_NTP@
CHUTEST = @CHUTEST@
CONFIG_SHELL = @CONFIG_SHELL@
@@ -321,6 +324,7 @@ LIBTOOL_DEPS = @LIBTOOL_DEPS@
LIPO = @LIPO@
LN_S = @LN_S@
LSCF = @LSCF@
+LTHREAD_LIBS = @LTHREAD_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MAKE_ADJTIMED = @MAKE_ADJTIMED@
diff --git a/ntpd/Makefile.am b/ntpd/Makefile.am
index c94f7c09edf6..a5690b70d391 100644
--- a/ntpd/Makefile.am
+++ b/ntpd/Makefile.am
@@ -432,6 +432,9 @@ version.c: $(ntpd_OBJECTS) ../libntp/libntp.a @LIBPARSE@ Makefile $(top_srcdir)/
version.o: version.c
env CCACHE_DISABLE=1 $(COMPILE) -c version.c -o version.o
+$(srcdir)/Makefile.am:
+ @: do-nothing
+
include $(top_srcdir)/bincheck.mf
include $(top_srcdir)/check-libopts.mf
include $(top_srcdir)/sntp/check-libntp.mf
diff --git a/ntpd/Makefile.in b/ntpd/Makefile.in
index 47c59c695794..07655e4fcd84 100644
--- a/ntpd/Makefile.in
+++ b/ntpd/Makefile.in
@@ -125,6 +125,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
$(top_srcdir)/sntp/m4/ntp_locinfo.m4 \
$(top_srcdir)/sntp/m4/ntp_openssl.m4 \
$(top_srcdir)/sntp/m4/ntp_pkg_config.m4 \
+ $(top_srcdir)/sntp/m4/ntp_problemtests.m4 \
$(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \
$(top_srcdir)/sntp/m4/ntp_rlimit.m4 \
$(top_srcdir)/sntp/m4/ntp_sntp.m4 \
@@ -343,6 +344,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_THREAD = @BUILD_THREAD@
CALC_TICKADJ_DB = @CALC_TICKADJ_DB@
CALC_TICKADJ_DL = @CALC_TICKADJ_DL@
CALC_TICKADJ_DS = @CALC_TICKADJ_DS@
@@ -351,6 +353,7 @@ CALC_TICKADJ_NI = @CALC_TICKADJ_NI@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
+CFLAGS_LIBEVENT = @CFLAGS_LIBEVENT@
CFLAGS_NTP = @CFLAGS_NTP@
CHUTEST = @CHUTEST@
CONFIG_SHELL = @CONFIG_SHELL@
@@ -412,6 +415,7 @@ LIBTOOL_DEPS = @LIBTOOL_DEPS@
LIPO = @LIPO@
LN_S = @LN_S@
LSCF = @LSCF@
+LTHREAD_LIBS = @LTHREAD_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MAKE_ADJTIMED = @MAKE_ADJTIMED@
@@ -1827,6 +1831,9 @@ version.c: $(ntpd_OBJECTS) ../libntp/libntp.a @LIBPARSE@ Makefile $(top_srcdir)/
version.o: version.c
env CCACHE_DISABLE=1 $(COMPILE) -c version.c -o version.o
+$(srcdir)/Makefile.am:
+ @: do-nothing
+
install-exec-hook:
@test -z "${bin_PROGRAMS}${bin_SCRIPTS}" \
|| for i in ${bin_PROGRAMS} ${bin_SCRIPTS} " "; do \
diff --git a/ntpd/invoke-ntp.conf.texi b/ntpd/invoke-ntp.conf.texi
index d7a9d13a2d99..37427d679d45 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 June 29, 2015 at 04:30:28 PM by AutoGen 5.18.5
+# It has been AutoGen-ed October 21, 2015 at 12:38:16 PM by AutoGen 5.18.5
# From the definitions ntp.conf.def
# and the template file agtexi-file.tpl
@end ignore
@@ -1837,7 +1837,7 @@ re-associate accordingly.
Some administrators prefer to avoid running
@code{ntpd(1ntpdmdoc)}
continuously and run either
-@code{ntpdate(8)}
+@code{sntp(1sntpmdoc)}
or
@code{ntpd(1ntpdmdoc)}
@code{-q}
@@ -1921,7 +1921,7 @@ peers remaining.
This value defaults to 1, but can be changed
to any number from 1 to 15.
@item @code{minclock} @kbd{minclock}
-The clustering algorithm repeatedly casts out outlyer
+The clustering algorithm repeatedly casts out outlier
associations until no more than
@code{minclock}
associations remain.
@@ -2578,12 +2578,15 @@ pulses will not be suppressed.
@item @code{rlimit} @code{[@code{memlock} @kbd{Nmegabytes} | @code{stacksize} @kbd{N4kPages} @code{filenum} @kbd{Nfiledescriptors}]}
@table @asis
@item @code{memlock} @kbd{Nmegabytes}
-Specify the number of megabytes of memory that can be allocated.
-Probably only available under Linux, this option is useful
+Specify the number of megabytes of memory that should be
+allocated and locked.
+Probably only available under Linux, this option may be useful
when dropping root (the
@code{-i}
option).
-The default is 32 megabytes. Setting this to zero will prevent any attemp to lock memory.
+The default is 32 megabytes on non-Linux machines, and -1 under Linux.
+-1 means "do not lock the process into memory".
+0 means "lock whatever memory the process wants into memory".
@item @code{stacksize} @kbd{N4kPages}
Specifies the maximum size of the process stack on systems with the
@code{mlockall()}
diff --git a/ntpd/invoke-ntp.keys.texi b/ntpd/invoke-ntp.keys.texi
index 622c4ffe03c2..33fdb8938ed6 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 June 29, 2015 at 04:30:31 PM by AutoGen 5.18.5
+# It has been AutoGen-ed October 21, 2015 at 12:38:19 PM by AutoGen 5.18.5
# 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 6936dda91f04..a781b26681f8 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 June 29, 2015 at 04:30:33 PM by AutoGen 5.18.5
+# It has been AutoGen-ed October 21, 2015 at 12:38:21 PM by AutoGen 5.18.5
# 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.8p3
+ntpd - NTP daemon program - Ver. 4.2.8p4
Usage: ntpd [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... \
[ <server1> ... <serverN> ]
Flg Arg Option-Name Description
diff --git a/ntpd/ntp.conf.5man b/ntpd/ntp.conf.5man
index 14438bdc7da1..ee457df4c8bb 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 "29 Jun 2015" "4.2.8p3" "File Formats"
+.TH ntp.conf 5man "21 Oct 2015" "4.2.8p4" "File Formats"
.\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-R0aO7B/ag-30aG6B)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-9oaqYI/ag-OpaiXI)
.\"
-.\" It has been AutoGen-ed June 29, 2015 at 04:30:16 PM by AutoGen 5.18.5
+.\" It has been AutoGen-ed October 21, 2015 at 12:38:01 PM by AutoGen 5.18.5
.\" From the definitions ntp.conf.def
.\" and the template file agman-cmd.tpl
.SH NAME
@@ -2080,7 +2080,7 @@ re-associate accordingly.
Some administrators prefer to avoid running
\fCntpd\f[]\fR(1ntpdmdoc)\f[]
continuously and run either
-\fCntpdate\f[]\fR(8)\f[]
+\fCsntp\f[]\fR(1sntpmdoc)\f[]
or
\fCntpd\f[]\fR(1ntpdmdoc)\f[]
\f\*[B-Font]\-q\f[]
@@ -2170,7 +2170,7 @@ This value defaults to 1, but can be changed
to any number from 1 to 15.
.TP 7
.NOP \f\*[B-Font]minclock\f[] \f\*[I-Font]minclock\f[]
-The clustering algorithm repeatedly casts out outlyer
+The clustering algorithm repeatedly casts out outlier
associations until no more than
\f\*[B-Font]minclock\f[]
associations remain.
@@ -2897,12 +2897,15 @@ pulses will not be suppressed.
.RS
.TP 7
.NOP \f\*[B-Font]memlock\f[] \f\*[I-Font]Nmegabytes\f[]
-Specify the number of megabytes of memory that can be allocated.
-Probably only available under Linux, this option is useful
+Specify the number of megabytes of memory that should be
+allocated and locked.
+Probably only available under Linux, this option may be useful
when dropping root (the
\f\*[B-Font]\-i\f[]
option).
-The default is 32 megabytes. Setting this to zero will prevent any attemp to lock memory.
+The default is 32 megabytes on non-Linux machines, and \-1 under Linux.
+-1 means "do not lock the process into memory".
+0 means "lock whatever memory the process wants into memory".
.TP 7
.NOP \f\*[B-Font]stacksize\f[] \f\*[I-Font]N4kPages\f[]
Specifies the maximum size of the process stack on systems with the
diff --git a/ntpd/ntp.conf.5mdoc b/ntpd/ntp.conf.5mdoc
index 938acf6d6a13..a883aabaa8cb 100644
--- a/ntpd/ntp.conf.5mdoc
+++ b/ntpd/ntp.conf.5mdoc
@@ -1,9 +1,9 @@
-.Dd June 29 2015
+.Dd October 21 2015
.Dt NTP_CONF 5mdoc File Formats
.Os
.\" EDIT THIS FILE WITH CAUTION (ntp.mdoc)
.\"
-.\" It has been AutoGen-ed June 29, 2015 at 04:30:36 PM by AutoGen 5.18.5
+.\" It has been AutoGen-ed October 21, 2015 at 12:38:24 PM by AutoGen 5.18.5
.\" From the definitions ntp.conf.def
.\" and the template file agmdoc-cmd.tpl
.Sh NAME
@@ -1903,7 +1903,7 @@ re\-associate accordingly.
Some administrators prefer to avoid running
.Xr ntpd 1ntpdmdoc
continuously and run either
-.Xr ntpdate 8
+.Xr sntp 1sntpmdoc
or
.Xr ntpd 1ntpdmdoc
.Fl q
@@ -1995,7 +1995,7 @@ peers remaining.
This value defaults to 1, but can be changed
to any number from 1 to 15.
.It Cm minclock Ar minclock
-The clustering algorithm repeatedly casts out outlyer
+The clustering algorithm repeatedly casts out outlier
associations until no more than
.Cm minclock
associations remain.
@@ -2725,12 +2725,15 @@ pulses will not be suppressed.
.Xc
.Bl -tag -width indent
.It Cm memlock Ar Nmegabytes
-Specify the number of megabytes of memory that can be allocated.
-Probably only available under Linux, this option is useful
+Specify the number of megabytes of memory that should be
+allocated and locked.
+Probably only available under Linux, this option may be useful
when dropping root (the
.Fl i
option).
-The default is 32 megabytes. Setting this to zero will prevent any attemp to lock memory.
+The default is 32 megabytes on non\-Linux machines, and \-1 under Linux.
+-1 means "do not lock the process into memory".
+0 means "lock whatever memory the process wants into memory".
.It Cm stacksize Ar N4kPages
Specifies the maximum size of the process stack on systems with the
.Fn mlockall
diff --git a/ntpd/ntp.conf.def b/ntpd/ntp.conf.def
index 7e09c0306946..43835bc7632e 100644
--- a/ntpd/ntp.conf.def
+++ b/ntpd/ntp.conf.def
@@ -1905,7 +1905,7 @@ re-associate accordingly.
Some administrators prefer to avoid running
.Xr ntpd 1ntpdmdoc
continuously and run either
-.Xr ntpdate 8
+.Xr sntp 1sntpmdoc
or
.Xr ntpd 1ntpdmdoc
.Fl q
@@ -1997,7 +1997,7 @@ peers remaining.
This value defaults to 1, but can be changed
to any number from 1 to 15.
.It Cm minclock Ar minclock
-The clustering algorithm repeatedly casts out outlyer
+The clustering algorithm repeatedly casts out outlier
associations until no more than
.Cm minclock
associations remain.
@@ -2727,12 +2727,15 @@ pulses will not be suppressed.
.Xc
.Bl -tag -width indent
.It Cm memlock Ar Nmegabytes
-Specify the number of megabytes of memory that can be allocated.
-Probably only available under Linux, this option is useful
+Specify the number of megabytes of memory that should be
+allocated and locked.
+Probably only available under Linux, this option may be useful
when dropping root (the
.Fl i
option).
-The default is 32 megabytes. Setting this to zero will prevent any attemp to lock memory.
+The default is 32 megabytes on non-Linux machines, and -1 under Linux.
+-1 means "do not lock the process into memory".
+0 means "lock whatever memory the process wants into memory".
.It Cm stacksize Ar N4kPages
Specifies the maximum size of the process stack on systems with the
.Fn mlockall
diff --git a/ntpd/ntp.conf.html b/ntpd/ntp.conf.html
index ad643556ea1f..1f0c81908a05 100644
--- a/ntpd/ntp.conf.html
+++ b/ntpd/ntp.conf.html
@@ -33,7 +33,7 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#dir">(dir)</a>
<p>This document describes the configuration file for the NTP Project's
<code>ntpd</code> program.
- <p>This document applies to version 4.2.8p3 of <code>ntp.conf</code>.
+ <p>This document applies to version 4.2.8p4 of <code>ntp.conf</code>.
<div class="shortcontents">
<h2>Short Contents</h2>
@@ -1839,7 +1839,7 @@ re-associate accordingly.
<p>Some administrators prefer to avoid running
<code>ntpd(1ntpdmdoc)</code>
continuously and run either
-<code>ntpdate(8)</code>
+<code>sntp(1sntpmdoc)</code>
or
<code>ntpd(1ntpdmdoc)</code>
<code>-q</code>
@@ -1922,7 +1922,7 @@ will be discarded if there are at least
peers remaining.
This value defaults to 1, but can be changed
to any number from 1 to 15.
-<br><dt><code>minclock</code> <kbd>minclock</kbd><dd>The clustering algorithm repeatedly casts out outlyer
+<br><dt><code>minclock</code> <kbd>minclock</kbd><dd>The clustering algorithm repeatedly casts out outlier
associations until no more than
<code>minclock</code>
associations remain.
@@ -2546,12 +2546,15 @@ pulses will not be suppressed.
</dl>
<br><dt><code>rlimit</code> <code>[memlock </code><kbd>Nmegabytes</kbd><code> | stacksize </code><kbd>N4kPages</kbd><code> filenum </code><kbd>Nfiledescriptors</kbd><code>]</code><dd>
<dl>
-<dt><code>memlock</code> <kbd>Nmegabytes</kbd><dd>Specify the number of megabytes of memory that can be allocated.
-Probably only available under Linux, this option is useful
+<dt><code>memlock</code> <kbd>Nmegabytes</kbd><dd>Specify the number of megabytes of memory that should be
+allocated and locked.
+Probably only available under Linux, this option may be useful
when dropping root (the
<code>-i</code>
option).
-The default is 32 megabytes. Setting this to zero will prevent any attemp to lock memory.
+The default is 32 megabytes on non-Linux machines, and -1 under Linux.
+-1 means "do not lock the process into memory".
+0 means "lock whatever memory the process wants into memory".
<br><dt><code>stacksize</code> <kbd>N4kPages</kbd><dd>Specifies the maximum size of the process stack on systems with the
<code>mlockall()</code>
function.
diff --git a/ntpd/ntp.conf.man.in b/ntpd/ntp.conf.man.in
index ef9e14dfe770..7c8a39f46588 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 "29 Jun 2015" "4.2.8p3" "File Formats"
+.TH ntp.conf 5 "21 Oct 2015" "4.2.8p4" "File Formats"
.\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-R0aO7B/ag-30aG6B)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-9oaqYI/ag-OpaiXI)
.\"
-.\" It has been AutoGen-ed June 29, 2015 at 04:30:16 PM by AutoGen 5.18.5
+.\" It has been AutoGen-ed October 21, 2015 at 12:38:01 PM by AutoGen 5.18.5
.\" From the definitions ntp.conf.def
.\" and the template file agman-cmd.tpl
.SH NAME
@@ -2080,7 +2080,7 @@ re-associate accordingly.
Some administrators prefer to avoid running
\fCntpd\f[]\fR(@NTPD_MS@)\f[]
continuously and run either
-\fCntpdate\f[]\fR(8)\f[]
+\fCsntp\f[]\fR(@SNTP_MS@)\f[]
or
\fCntpd\f[]\fR(@NTPD_MS@)\f[]
\f\*[B-Font]\-q\f[]
@@ -2170,7 +2170,7 @@ This value defaults to 1, but can be changed
to any number from 1 to 15.
.TP 7
.NOP \f\*[B-Font]minclock\f[] \f\*[I-Font]minclock\f[]
-The clustering algorithm repeatedly casts out outlyer
+The clustering algorithm repeatedly casts out outlier
associations until no more than
\f\*[B-Font]minclock\f[]
associations remain.
@@ -2897,12 +2897,15 @@ pulses will not be suppressed.
.RS
.TP 7
.NOP \f\*[B-Font]memlock\f[] \f\*[I-Font]Nmegabytes\f[]
-Specify the number of megabytes of memory that can be allocated.
-Probably only available under Linux, this option is useful
+Specify the number of megabytes of memory that should be
+allocated and locked.
+Probably only available under Linux, this option may be useful
when dropping root (the
\f\*[B-Font]\-i\f[]
option).
-The default is 32 megabytes. Setting this to zero will prevent any attemp to lock memory.
+The default is 32 megabytes on non-Linux machines, and \-1 under Linux.
+-1 means "do not lock the process into memory".
+0 means "lock whatever memory the process wants into memory".
.TP 7
.NOP \f\*[B-Font]stacksize\f[] \f\*[I-Font]N4kPages\f[]
Specifies the maximum size of the process stack on systems with the
diff --git a/ntpd/ntp.conf.mdoc.in b/ntpd/ntp.conf.mdoc.in
index 93c638d6edff..613ee7a84aed 100644
--- a/ntpd/ntp.conf.mdoc.in
+++ b/ntpd/ntp.conf.mdoc.in
@@ -1,9 +1,9 @@
-.Dd June 29 2015
+.Dd October 21 2015
.Dt NTP_CONF 5 File Formats
.Os
.\" EDIT THIS FILE WITH CAUTION (ntp.mdoc)
.\"
-.\" It has been AutoGen-ed June 29, 2015 at 04:30:36 PM by AutoGen 5.18.5
+.\" It has been AutoGen-ed October 21, 2015 at 12:38:24 PM by AutoGen 5.18.5
.\" From the definitions ntp.conf.def
.\" and the template file agmdoc-cmd.tpl
.Sh NAME
@@ -1903,7 +1903,7 @@ re\-associate accordingly.
Some administrators prefer to avoid running
.Xr ntpd @NTPD_MS@
continuously and run either
-.Xr ntpdate 8
+.Xr sntp @SNTP_MS@
or
.Xr ntpd @NTPD_MS@
.Fl q
@@ -1995,7 +1995,7 @@ peers remaining.
This value defaults to 1, but can be changed
to any number from 1 to 15.
.It Cm minclock Ar minclock
-The clustering algorithm repeatedly casts out outlyer
+The clustering algorithm repeatedly casts out outlier
associations until no more than
.Cm minclock
associations remain.
@@ -2725,12 +2725,15 @@ pulses will not be suppressed.
.Xc
.Bl -tag -width indent
.It Cm memlock Ar Nmegabytes
-Specify the number of megabytes of memory that can be allocated.
-Probably only available under Linux, this option is useful
+Specify the number of megabytes of memory that should be
+allocated and locked.
+Probably only available under Linux, this option may be useful
when dropping root (the
.Fl i
option).
-The default is 32 megabytes. Setting this to zero will prevent any attemp to lock memory.
+The default is 32 megabytes on non\-Linux machines, and \-1 under Linux.
+-1 means "do not lock the process into memory".
+0 means "lock whatever memory the process wants into memory".
.It Cm stacksize Ar N4kPages
Specifies the maximum size of the process stack on systems with the
.Fn mlockall
diff --git a/ntpd/ntp.keys.5man b/ntpd/ntp.keys.5man
index 63d4553852ae..3e5cb54d91a6 100644
--- a/ntpd/ntp.keys.5man
+++ b/ntpd/ntp.keys.5man
@@ -1,8 +1,8 @@
-.TH ntp.keys 5man "29 Jun 2015" "4.2.8p3" "File Formats"
+.TH ntp.keys 5man "21 Oct 2015" "4.2.8p4" "File Formats"
.\"
.\" EDIT THIS FILE WITH CAUTION (ntp.man)
.\"
-.\" It has been AutoGen-ed June 29, 2015 at 04:30:21 PM by AutoGen 5.18.5
+.\" It has been AutoGen-ed October 21, 2015 at 12:38:08 PM by AutoGen 5.18.5
.\" 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 47e5f81d258a..6355a39ca016 100644
--- a/ntpd/ntp.keys.5mdoc
+++ b/ntpd/ntp.keys.5mdoc
@@ -1,9 +1,9 @@
-.Dd June 29 2015
+.Dd October 21 2015
.Dt NTP_KEYS 5mdoc File Formats
.Os SunOS 5.10
.\" EDIT THIS FILE WITH CAUTION (ntp.mdoc)
.\"
-.\" It has been AutoGen-ed June 29, 2015 at 04:30:39 PM by AutoGen 5.18.5
+.\" It has been AutoGen-ed October 21, 2015 at 12:38:28 PM by AutoGen 5.18.5
.\" 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 f096f63fc837..3671aaaace7a 100644
--- a/ntpd/ntp.keys.html
+++ b/ntpd/ntp.keys.html
@@ -33,7 +33,7 @@ Up:&nbsp;<a rel="up" accesskey="u" href="#dir">(dir)</a>
<p>This document describes the symmetric key file for the NTP Project's
<code>ntpd</code> program.
- <p>This document applies to version 4.2.8p3 of <code>ntp.keys</code>.
+ <p>This document applies to version 4.2.8p4 of <code>ntp.keys</code>.
<div class="shortcontents">
<h2>Short Contents</h2>
diff --git a/ntpd/ntp.keys.man.in b/ntpd/ntp.keys.man.in
index 1080b91bf0ed..bd64756a01c0 100644
--- a/ntpd/ntp.keys.man.in
+++ b/ntpd/ntp.keys.man.in
@@ -1,8 +1,8 @@
-.TH ntp.keys 5 "29 Jun 2015" "4.2.8p3" "File Formats"
+.TH ntp.keys 5 "21 Oct 2015" "4.2.8p4" "File Formats"
.\"
.\" EDIT THIS FILE WITH CAUTION (ntp.man)
.\"
-.\" It has been AutoGen-ed June 29, 2015 at 04:30:21 PM by AutoGen 5.18.5
+.\" It has been AutoGen-ed October 21, 2015 at 12:38:08 PM by AutoGen 5.18.5
.\" 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 6bd1c0987c2c..6600d57d5ea4 100644
--- a/ntpd/ntp.keys.mdoc.in
+++ b/ntpd/ntp.keys.mdoc.in
@@ -1,9 +1,9 @@
-.Dd June 29 2015
+.Dd October 21 2015
.Dt NTP_KEYS 5 File Formats
.Os SunOS 5.10
.\" EDIT THIS FILE WITH CAUTION (ntp.mdoc)
.\"
-.\" It has been AutoGen-ed June 29, 2015 at 04:30:39 PM by AutoGen 5.18.5
+.\" It has been AutoGen-ed October 21, 2015 at 12:38:28 PM by AutoGen 5.18.5
.\" 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 300773240c74..1c754bd1613d 100644
--- a/ntpd/ntp_config.c
+++ b/ntpd/ntp_config.c
@@ -53,13 +53,21 @@
#include "ntp_parser.h"
#include "ntpd-opts.h"
+/* Bug 2817 */
+#if defined(HAVE_SYS_MMAN_H)
+# include <sys/mman.h>
+#endif
/* list of servers from command line for config_peers() */
int cmdline_server_count;
char ** cmdline_servers;
-/* set to zero if admin doesn't want memory locked */
-int do_memlock = 1;
+/* Current state of memory locking:
+ * -1: default
+ * 0: memory locking disabled
+ * 1: Memory locking enabled
+ */
+int cur_memlock = -1;
/*
* "logconfig" building blocks
@@ -1152,9 +1160,8 @@ create_address_node(
{
address_node *my_node;
- NTP_REQUIRE(NULL != addr);
- NTP_REQUIRE(AF_INET == type ||
- AF_INET6 == type || AF_UNSPEC == type);
+ REQUIRE(NULL != addr);
+ REQUIRE(AF_INET == type || AF_INET6 == type || AF_UNSPEC == type);
my_node = emalloc_zero(sizeof(*my_node));
my_node->address = addr;
my_node->type = (u_short)type;
@@ -1170,7 +1177,7 @@ destroy_address_node(
{
if (NULL == my_node)
return;
- NTP_REQUIRE(NULL != my_node->address);
+ REQUIRE(NULL != my_node->address);
free(my_node->address);
free(my_node);
@@ -1567,7 +1574,7 @@ create_nic_rule_node(
{
nic_rule_node *my_node;
- NTP_REQUIRE(match_class != 0 || if_name != NULL);
+ REQUIRE(match_class != 0 || if_name != NULL);
my_node = emalloc_zero(sizeof(*my_node));
my_node->match_class = match_class;
@@ -1826,7 +1833,9 @@ config_auth(
/* Crypto Command */
#ifdef AUTOKEY
+# ifdef __GNUC__
item = -1; /* quiet warning */
+# endif
my_val = HEAD_PFIFO(ptree->auth.crypto_cmd_list);
for (; my_val != NULL; my_val = my_val->link) {
switch (my_val->attr) {
@@ -1979,7 +1988,9 @@ config_tos(
int item;
double val;
+#ifdef __GNUC__
item = -1; /* quiet warning */
+#endif
tos = HEAD_PFIFO(ptree->orphan_cmds);
for (; tos != NULL; tos = tos->link) {
val = tos->value.d;
@@ -2610,18 +2621,36 @@ config_rlimit(
break;
case T_Memlock:
- if (rlimit_av->value.i != 0) {
+ /* What if we HAVE_OPT(SAVECONFIGQUIT) ? */
+ if (rlimit_av->value.i == -1) {
+# if defined(HAVE_MLOCKALL)
+ if (cur_memlock != 0) {
+ if (-1 == munlockall()) {
+ msyslog(LOG_ERR, "munlockall() failed: %m");
+ }
+ }
+ cur_memlock = 0;
+# endif /* HAVE_MLOCKALL */
+ } else if (rlimit_av->value.i >= 0) {
#if defined(RLIMIT_MEMLOCK)
+# if defined(HAVE_MLOCKALL)
+ if (cur_memlock != 1) {
+ if (-1 == mlockall(MCL_CURRENT|MCL_FUTURE)) {
+ msyslog(LOG_ERR, "mlockall() failed: %m");
+ }
+ }
+# endif /* HAVE_MLOCKALL */
ntp_rlimit(RLIMIT_MEMLOCK,
(rlim_t)(rlimit_av->value.i * 1024 * 1024),
1024 * 1024,
"MB");
+ cur_memlock = 1;
#else
/* STDERR as well would be fine... */
msyslog(LOG_WARNING, "'rlimit memlock' specified but is not available on this system.");
#endif /* RLIMIT_MEMLOCK */
} else {
- do_memlock = 0;
+ msyslog(LOG_WARNING, "'rlimit memlock' value of %d is unexpected!", rlimit_av->value.i);
}
break;
@@ -2662,7 +2691,9 @@ config_tinker(
attr_val * tinker;
int item;
+#ifdef __GNUC__
item = -1; /* quiet warning */
+#endif
tinker = HEAD_PFIFO(ptree->tinker);
for (; tinker != NULL; tinker = tinker->link) {
switch (tinker->attr) {
@@ -2776,12 +2807,14 @@ config_nic_rules(
switch (curr_node->match_class) {
default:
+#ifdef __GNUC__
/*
* this assignment quiets a gcc "may be used
* uninitialized" warning and is here for no
* other reason.
*/
match_type = MATCH_ALL;
+#endif
INSIST(FALSE);
break;
@@ -2834,12 +2867,14 @@ config_nic_rules(
switch (curr_node->action) {
default:
+#ifdef __GNUC__
/*
* this assignment quiets a gcc "may be used
* uninitialized" warning and is here for no
* other reason.
*/
action = ACTION_LISTEN;
+#endif
INSIST(FALSE);
break;
@@ -4880,9 +4915,9 @@ getnetnum(
enum gnn_type a_type /* ignored */
)
{
- NTP_REQUIRE(AF_UNSPEC == AF(addr) ||
- AF_INET == AF(addr) ||
- AF_INET6 == AF(addr));
+ REQUIRE(AF_UNSPEC == AF(addr) ||
+ AF_INET == AF(addr) ||
+ AF_INET6 == AF(addr));
if (!is_ip_address(num, AF(addr), addr))
return 0;
diff --git a/ntpd/ntp_control.c b/ntpd/ntp_control.c
index 89c2f00c11b4..77363117bda4 100644
--- a/ntpd/ntp_control.c
+++ b/ntpd/ntp_control.c
@@ -28,11 +28,11 @@
#include "ntp_leapsec.h"
#include "ntp_md5.h" /* provides OpenSSL digest API */
#include "lib_strbuf.h"
+#include <rc_cmdlength.h>
#ifdef KERNEL_PLL
# include "ntp_syscall.h"
#endif
-extern size_t remoteconfig_cmdlength( const char *src_buf, const char *src_end );
/*
* Structure to hold request procedure information
@@ -420,10 +420,10 @@ static const struct ctl_var sys_var[] = {
{ CS_TIMER_XMTS, RO, "timer_xmts" }, /* 87 */
{ CS_FUZZ, RO, "fuzz" }, /* 88 */
{ CS_WANDER_THRESH, RO, "clk_wander_threshold" }, /* 89 */
-#ifdef LEAP_SMEAR
+
{ CS_LEAPSMEARINTV, RO, "leapsmearinterval" }, /* 90 */
{ CS_LEAPSMEAROFFS, RO, "leapsmearoffset" }, /* 91 */
-#endif /* LEAP_SMEAR */
+
#ifdef AUTOKEY
{ CS_FLAGS, RO, "flags" }, /* 1 + CS_MAX_NOAUTOKEY */
{ CS_HOST, RO, "host" }, /* 2 + CS_MAX_NOAUTOKEY */
@@ -884,6 +884,28 @@ save_config(
int restrict_mask
)
{
+ /* block directory traversal by searching for characters that
+ * indicate directory components in a file path.
+ *
+ * Conceptually we should be searching for DIRSEP in filename,
+ * however Windows actually recognizes both forward and
+ * backslashes as equivalent directory separators at the API
+ * level. On POSIX systems we could allow '\\' but such
+ * filenames are tricky to manipulate from a shell, so just
+ * reject both types of slashes on all platforms.
+ */
+ /* TALOS-CAN-0062: block directory traversal for VMS, too */
+ static const char * illegal_in_filename =
+#if defined(VMS)
+ ":[]" /* do not allow drive and path components here */
+#elif defined(SYS_WINNT)
+ ":\\/" /* path and drive separators */
+#else
+ "\\/" /* separator and critical char for POSIX */
+#endif
+ ;
+
+
char reply[128];
#ifdef SAVECONFIG
char filespec[128];
@@ -938,15 +960,9 @@ save_config(
localtime(&now)))
strlcpy(filename, filespec, sizeof(filename));
- /*
- * Conceptually we should be searching for DIRSEP in filename,
- * however Windows actually recognizes both forward and
- * backslashes as equivalent directory separators at the API
- * level. On POSIX systems we could allow '\\' but such
- * filenames are tricky to manipulate from a shell, so just
- * reject both types of slashes on all platforms.
- */
- if (strchr(filename, '\\') || strchr(filename, '/')) {
+ /* block directory/drive traversal */
+ /* TALOS-CAN-0062: block directory traversal for VMS, too */
+ if (NULL != strpbrk(filename, illegal_in_filename)) {
snprintf(reply, sizeof(reply),
"saveconfig does not allow directory in filename");
ctl_putdata(reply, strlen(reply), 0);
@@ -1401,7 +1417,7 @@ ctl_putstr(
memcpy(buffer, tag, tl);
cp = buffer + tl;
if (len > 0) {
- NTP_INSIST(tl + 3 + len <= sizeof(buffer));
+ INSIST(tl + 3 + len <= sizeof(buffer));
*cp++ = '=';
*cp++ = '"';
memcpy(cp, data, len);
@@ -1436,7 +1452,7 @@ ctl_putunqstr(
memcpy(buffer, tag, tl);
cp = buffer + tl;
if (len > 0) {
- NTP_INSIST(tl + 1 + len <= sizeof(buffer));
+ INSIST(tl + 1 + len <= sizeof(buffer));
*cp++ = '=';
memcpy(cp, data, len);
cp += len;
@@ -1465,7 +1481,7 @@ ctl_putdblf(
while (*cq != '\0')
*cp++ = *cq++;
*cp++ = '=';
- NTP_INSIST((size_t)(cp - buffer) < sizeof(buffer));
+ INSIST((size_t)(cp - buffer) < sizeof(buffer));
snprintf(cp, sizeof(buffer) - (cp - buffer), use_f ? "%.*f" : "%.*g",
precision, d);
cp += strlen(cp);
@@ -1491,7 +1507,7 @@ ctl_putuint(
*cp++ = *cq++;
*cp++ = '=';
- NTP_INSIST((cp - buffer) < (int)sizeof(buffer));
+ INSIST((cp - buffer) < (int)sizeof(buffer));
snprintf(cp, sizeof(buffer) - (cp - buffer), "%lu", uval);
cp += strlen(cp);
ctl_putdata(buffer, (unsigned)( cp - buffer ), 0);
@@ -1518,7 +1534,7 @@ ctl_putcal(
pcal->hour,
pcal->minute
);
- NTP_INSIST(numch < sizeof(buffer));
+ INSIST(numch < sizeof(buffer));
ctl_putdata(buffer, numch, 0);
return;
@@ -1549,7 +1565,7 @@ ctl_putfs(
tm = gmtime(&fstamp);
if (NULL == tm)
return;
- NTP_INSIST((cp - buffer) < (int)sizeof(buffer));
+ INSIST((cp - buffer) < (int)sizeof(buffer));
snprintf(cp, sizeof(buffer) - (cp - buffer),
"%04d%02d%02d%02d%02d", tm->tm_year + 1900,
tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min);
@@ -1578,7 +1594,7 @@ ctl_puthex(
*cp++ = *cq++;
*cp++ = '=';
- NTP_INSIST((cp - buffer) < (int)sizeof(buffer));
+ INSIST((cp - buffer) < (int)sizeof(buffer));
snprintf(cp, sizeof(buffer) - (cp - buffer), "0x%lx", uval);
cp += strlen(cp);
ctl_putdata(buffer,(unsigned)( cp - buffer ), 0);
@@ -1604,7 +1620,7 @@ ctl_putint(
*cp++ = *cq++;
*cp++ = '=';
- NTP_INSIST((cp - buffer) < (int)sizeof(buffer));
+ INSIST((cp - buffer) < (int)sizeof(buffer));
snprintf(cp, sizeof(buffer) - (cp - buffer), "%ld", ival);
cp += strlen(cp);
ctl_putdata(buffer, (unsigned)( cp - buffer ), 0);
@@ -1630,7 +1646,7 @@ ctl_putts(
*cp++ = *cq++;
*cp++ = '=';
- NTP_INSIST((size_t)(cp - buffer) < sizeof(buffer));
+ INSIST((size_t)(cp - buffer) < sizeof(buffer));
snprintf(cp, sizeof(buffer) - (cp - buffer), "0x%08x.%08x",
(u_int)ts->l_ui, (u_int)ts->l_uf);
cp += strlen(cp);
@@ -1662,7 +1678,7 @@ ctl_putadr(
cq = numtoa(addr32);
else
cq = stoa(addr);
- NTP_INSIST((cp - buffer) < (int)sizeof(buffer));
+ INSIST((cp - buffer) < (int)sizeof(buffer));
snprintf(cp, sizeof(buffer) - (cp - buffer), "%s", cq);
cp += strlen(cp);
ctl_putdata(buffer, (unsigned)(cp - buffer), 0);
@@ -1733,7 +1749,7 @@ ctl_putarray(
if (i == 0)
i = NTP_SHIFT;
i--;
- NTP_INSIST((cp - buffer) < (int)sizeof(buffer));
+ INSIST((cp - buffer) < (int)sizeof(buffer));
snprintf(cp, sizeof(buffer) - (cp - buffer),
" %.2f", arr[i] * 1e3);
cp += strlen(cp);
@@ -2402,6 +2418,9 @@ ctl_putsys(
ntohl(hostval.tstamp));
break;
#endif /* AUTOKEY */
+
+ default:
+ break;
}
}
@@ -2925,7 +2944,6 @@ ctl_getitem(
* Look for a first character match on the tag. If we find
* one, see if it is a full match.
*/
- v = var_list;
cp = reqpt;
for (v = var_list; !(EOV & v->flags); v++) {
if (!(PADDING & v->flags) && *cp == *(v->text)) {
@@ -3107,7 +3125,7 @@ read_peervars(void)
ctl_error(CERR_UNKNOWNVAR);
return;
}
- NTP_INSIST(v->code < COUNTOF(wants));
+ INSIST(v->code < COUNTOF(wants));
wants[v->code] = 1;
gotvar = 1;
}
@@ -3150,19 +3168,19 @@ read_sysvars(void)
gotvar = 0;
while (NULL != (v = ctl_getitem(sys_var, &valuep))) {
if (!(EOV & v->flags)) {
- NTP_INSIST(v->code < wants_count);
+ INSIST(v->code < wants_count);
wants[v->code] = 1;
gotvar = 1;
} else {
v = ctl_getitem(ext_sys_var, &valuep);
- NTP_INSIST(v != NULL);
+ INSIST(v != NULL);
if (EOV & v->flags) {
ctl_error(CERR_UNKNOWNVAR);
free(wants);
return;
}
n = v->code + CS_MAXCODE + 1;
- NTP_INSIST(n < wants_count);
+ INSIST(n < wants_count);
wants[n] = 1;
gotvar = 1;
}
@@ -4396,7 +4414,7 @@ read_clockstatus(
gotvar = TRUE;
} else {
v = ctl_getitem(kv, &valuep);
- NTP_INSIST(NULL != v);
+ INSIST(NULL != v);
if (EOV & v->flags) {
ctl_error(CERR_UNKNOWNVAR);
free(wants);
@@ -4792,7 +4810,7 @@ report_event(
for (i = 1; i <= CS_VARLIST; i++)
ctl_putsys(i);
} else {
- NTP_INSIST(peer != NULL);
+ INSIST(peer != NULL);
rpkt.associd = htons(peer->associd);
rpkt.status = htons(ctlpeerstatus(peer));
@@ -4897,7 +4915,7 @@ count_var(
while (!(EOV & (k++)->flags))
c++;
- NTP_ENSURE(c <= USHRT_MAX);
+ ENSURE(c <= USHRT_MAX);
return (u_short)c;
}
diff --git a/ntpd/ntp_crypto.c b/ntpd/ntp_crypto.c
index 45b2cdd00d31..7ce7ccd26e79 100644
--- a/ntpd/ntp_crypto.c
+++ b/ntpd/ntp_crypto.c
@@ -202,6 +202,7 @@ static void cert_free (struct cert_info *);
static struct pkey_info *crypto_key (char *, char *, sockaddr_u *);
static void bighash (BIGNUM *, BIGNUM *);
static struct cert_info *crypto_cert (char *);
+static u_int exten_payload_size(const struct exten *);
#ifdef SYS_WINNT
int
@@ -380,7 +381,7 @@ make_keylist(
EVP_SignUpdate(&ctx, (u_char *)vp, 12);
EVP_SignUpdate(&ctx, vp->ptr, sizeof(struct autokey));
if (EVP_SignFinal(&ctx, vp->sig, &len, sign_pkey)) {
- NTP_INSIST(len <= sign_siglen);
+ INSIST(len <= sign_siglen);
vp->siglen = htonl(len);
peer->flags |= FLAG_ASSOC;
}
@@ -419,7 +420,7 @@ crypto_recv(
struct autokey *ap, *bp; /* autokey pointer */
struct exten *ep, *fp; /* extension pointers */
struct cert_info *xinfo; /* certificate info pointer */
- int has_mac; /* length of MAC field */
+ int macbytes; /* length of MAC field, signed by intention */
int authlen; /* offset of MAC field */
associd_t associd; /* association ID */
tstamp_t fstamp = 0; /* filestamp */
@@ -446,7 +447,11 @@ crypto_recv(
*/
authlen = LEN_PKT_NOMAC;
hismode = (int)PKT_MODE((&rbufp->recv_pkt)->li_vn_mode);
- while ((has_mac = rbufp->recv_length - authlen) > (int)MAX_MAC_LEN) {
+ while ((macbytes = rbufp->recv_length - authlen) > (int)MAX_MAC_LEN) {
+ /* We can be reasonably sure that we can read at least
+ * the opcode and the size field here. More stringent
+ * checks follow up shortly.
+ */
pkt = (u_int32 *)&rbufp->recv_pkt + authlen / 4;
ep = (struct exten *)pkt;
code = ntohl(ep->opcode) & 0xffff0000;
@@ -467,6 +472,18 @@ crypto_recv(
code |= CRYPTO_ERROR;
}
+ /* Check if the declared size fits into the remaining
+ * buffer.
+ */
+ if (len > macbytes) {
+ DPRINTF(1, ("crypto_recv: possible attack detected, associd %d\n",
+ associd));
+ return XEVNT_LEN;
+ }
+
+ /* Check if the paylod of the extension fits into the
+ * declared frame.
+ */
if (len >= VALUE_LEN) {
fstamp = ntohl(ep->fstamp);
vallen = ntohl(ep->vallen);
@@ -508,6 +525,7 @@ crypto_recv(
rval = XEVNT_ERR;
break;
}
+ free(peer->cmmd); /* will be set again! */
}
fp = emalloc(len);
memcpy(fp, ep, len);
@@ -1153,9 +1171,8 @@ crypto_xmit(
* choice.
*/
case CRYPTO_CERT | CRYPTO_RESP:
- vallen = ntohl(ep->vallen); /* Must be <64k */
- if (vallen == 0 || vallen > MAXHOSTNAME ||
- len - VALUE_LEN < vallen) {
+ vallen = exten_payload_size(ep); /* Must be <64k */
+ if (vallen == 0 || vallen >= sizeof(certname) ) {
rval = XEVNT_LEN;
break;
}
@@ -1591,7 +1608,7 @@ crypto_encrypt(
EVP_SignUpdate(&ctx, (u_char *)&vp->tstamp, 12);
EVP_SignUpdate(&ctx, vp->ptr, vallen);
if (EVP_SignFinal(&ctx, vp->sig, &vallen, sign_pkey)) {
- NTP_INSIST(vallen <= sign_siglen);
+ INSIST(vallen <= sign_siglen);
vp->siglen = htonl(vallen);
}
return (XEVNT_OK);
@@ -1770,7 +1787,7 @@ crypto_send(
if (j * 4 < siglen)
ep->pkt[i + j++] = 0;
memcpy(&ep->pkt[i], vp->sig, siglen);
- i += j;
+ /* i += j; */ /* We don't use i after this */
}
opcode = ntohl(ep->opcode);
ep->opcode = htonl((opcode & 0xffff0000) | len);
@@ -1825,7 +1842,7 @@ crypto_update(void)
EVP_SignUpdate(&ctx, (u_char *)&pubkey, 12);
EVP_SignUpdate(&ctx, pubkey.ptr, ntohl(pubkey.vallen));
if (EVP_SignFinal(&ctx, pubkey.sig, &len, sign_pkey)) {
- NTP_INSIST(len <= sign_siglen);
+ INSIST(len <= sign_siglen);
pubkey.siglen = htonl(len);
}
}
@@ -1846,7 +1863,7 @@ crypto_update(void)
EVP_SignUpdate(&ctx, cp->cert.ptr,
ntohl(cp->cert.vallen));
if (EVP_SignFinal(&ctx, cp->cert.sig, &len, sign_pkey)) {
- NTP_INSIST(len <= sign_siglen);
+ INSIST(len <= sign_siglen);
cp->cert.siglen = htonl(len);
}
}
@@ -1896,7 +1913,7 @@ crypto_update(void)
EVP_SignUpdate(&ctx, (u_char *)&tai_leap, 12);
EVP_SignUpdate(&ctx, tai_leap.ptr, len);
if (EVP_SignFinal(&ctx, tai_leap.sig, &len, sign_pkey)) {
- NTP_INSIST(len <= sign_siglen);
+ INSIST(len <= sign_siglen);
tai_leap.siglen = htonl(len);
}
crypto_flags |= CRYPTO_FLAG_TAI;
@@ -1997,9 +2014,9 @@ asn_to_calendar (
* 100. Dontcha love ASN.1? Better than MIL-188.
*/
len = asn1time->length;
- NTP_REQUIRE(len < sizeof(v));
+ REQUIRE(len < sizeof(v));
(void)strncpy(v, (char *)(asn1time->data), len);
- NTP_REQUIRE(len >= 13);
+ REQUIRE(len >= 13);
temp = strtoul(v+len-3, NULL, 10);
pjd->second = temp;
v[len-3] = '\0';
@@ -2169,7 +2186,7 @@ crypto_alice(
EVP_SignUpdate(&ctx, (u_char *)&vp->tstamp, 12);
EVP_SignUpdate(&ctx, vp->ptr, len);
if (EVP_SignFinal(&ctx, vp->sig, &len, sign_pkey)) {
- NTP_INSIST(len <= sign_siglen);
+ INSIST(len <= sign_siglen);
vp->siglen = htonl(len);
}
return (XEVNT_OK);
@@ -2197,8 +2214,7 @@ crypto_bob(
tstamp_t tstamp; /* NTP timestamp */
BIGNUM *bn, *bk, *r;
u_char *ptr;
- u_int len; /* extension field length */
- u_int vallen = 0; /* value length */
+ u_int len; /* extension field value length */
/*
* If the IFF parameters are not valid, something awful
@@ -2213,11 +2229,10 @@ crypto_bob(
/*
* Extract r from the challenge.
*/
- vallen = ntohl(ep->vallen);
- len = ntohl(ep->opcode) & 0x0000ffff;
- if (vallen == 0 || len < VALUE_LEN || len - VALUE_LEN < vallen)
- return XEVNT_LEN;
- if ((r = BN_bin2bn((u_char *)ep->pkt, vallen, NULL)) == NULL) {
+ len = exten_payload_size(ep);
+ if (len == 0 || len > MAX_VALLEN)
+ return (XEVNT_LEN);
+ if ((r = BN_bin2bn((u_char *)ep->pkt, len, NULL)) == NULL) {
msyslog(LOG_ERR, "crypto_bob: %s",
ERR_error_string(ERR_get_error(), NULL));
return (XEVNT_ERR);
@@ -2229,7 +2244,7 @@ crypto_bob(
*/
bctx = BN_CTX_new(); bk = BN_new(); bn = BN_new();
sdsa = DSA_SIG_new();
- BN_rand(bk, vallen * 8, -1, 1); /* k */
+ BN_rand(bk, len * 8, -1, 1); /* k */
BN_mod_mul(bn, dsa->priv_key, r, dsa->q, bctx); /* b r mod q */
BN_add(bn, bn, bk);
BN_mod(bn, bn, dsa->q, bctx); /* k + b r mod q */
@@ -2248,16 +2263,16 @@ crypto_bob(
* Encode the values in ASN.1 and sign. The filestamp is from
* the local file.
*/
- vallen = i2d_DSA_SIG(sdsa, NULL);
- if (vallen == 0) {
+ len = i2d_DSA_SIG(sdsa, NULL);
+ if (len == 0) {
msyslog(LOG_ERR, "crypto_bob: %s",
ERR_error_string(ERR_get_error(), NULL));
DSA_SIG_free(sdsa);
return (XEVNT_ERR);
}
- if (vallen > MAX_VALLEN) {
- msyslog(LOG_ERR, "crypto_bob: signature is too big: %d",
- vallen);
+ if (len > MAX_VALLEN) {
+ msyslog(LOG_ERR, "crypto_bob: signature is too big: %u",
+ len);
DSA_SIG_free(sdsa);
return (XEVNT_LEN);
}
@@ -2265,8 +2280,8 @@ crypto_bob(
tstamp = crypto_time();
vp->tstamp = htonl(tstamp);
vp->fstamp = htonl(iffkey_info->fstamp);
- vp->vallen = htonl(vallen);
- ptr = emalloc(vallen);
+ vp->vallen = htonl(len);
+ ptr = emalloc(len);
vp->ptr = ptr;
i2d_DSA_SIG(sdsa, &ptr);
DSA_SIG_free(sdsa);
@@ -2277,10 +2292,10 @@ crypto_bob(
vp->sig = emalloc(sign_siglen);
EVP_SignInit(&ctx, sign_digest);
EVP_SignUpdate(&ctx, (u_char *)&vp->tstamp, 12);
- EVP_SignUpdate(&ctx, vp->ptr, vallen);
- if (EVP_SignFinal(&ctx, vp->sig, &vallen, sign_pkey)) {
- NTP_INSIST(vallen <= sign_siglen);
- vp->siglen = htonl(vallen);
+ EVP_SignUpdate(&ctx, vp->ptr, len);
+ if (EVP_SignFinal(&ctx, vp->sig, &len, sign_pkey)) {
+ INSIST(len <= sign_siglen);
+ vp->siglen = htonl(len);
}
return (XEVNT_OK);
}
@@ -2486,7 +2501,7 @@ crypto_alice2(
EVP_SignUpdate(&ctx, (u_char *)&vp->tstamp, 12);
EVP_SignUpdate(&ctx, vp->ptr, len);
if (EVP_SignFinal(&ctx, vp->sig, &len, sign_pkey)) {
- NTP_INSIST(len <= sign_siglen);
+ INSIST(len <= sign_siglen);
vp->siglen = htonl(len);
}
return (XEVNT_OK);
@@ -2530,7 +2545,9 @@ crypto_bob2(
/*
* Extract r from the challenge.
*/
- len = ntohl(ep->vallen);
+ len = exten_payload_size(ep);
+ if (len == 0 || len > MAX_VALLEN)
+ return (XEVNT_LEN);
if ((r = BN_bin2bn((u_char *)ep->pkt, len, NULL)) == NULL) {
msyslog(LOG_ERR, "crypto_bob2: %s",
ERR_error_string(ERR_get_error(), NULL));
@@ -2586,7 +2603,7 @@ crypto_bob2(
EVP_SignUpdate(&ctx, (u_char *)&vp->tstamp, 12);
EVP_SignUpdate(&ctx, vp->ptr, len);
if (EVP_SignFinal(&ctx, vp->sig, &len, sign_pkey)) {
- NTP_INSIST(len <= sign_siglen);
+ INSIST(len <= sign_siglen);
vp->siglen = htonl(len);
}
return (XEVNT_OK);
@@ -2817,7 +2834,7 @@ crypto_alice3(
EVP_SignUpdate(&ctx, (u_char *)&vp->tstamp, 12);
EVP_SignUpdate(&ctx, vp->ptr, len);
if (EVP_SignFinal(&ctx, vp->sig, &len, sign_pkey)) {
- NTP_INSIST(len <= sign_siglen);
+ INSIST(len <= sign_siglen);
vp->siglen = htonl(len);
}
return (XEVNT_OK);
@@ -2859,7 +2876,9 @@ crypto_bob3(
/*
* Extract r from the challenge.
*/
- len = ntohl(ep->vallen);
+ len = exten_payload_size(ep);
+ if (len == 0 || len > MAX_VALLEN)
+ return (XEVNT_LEN);
if ((r = BN_bin2bn((u_char *)ep->pkt, len, NULL)) == NULL) {
msyslog(LOG_ERR, "crypto_bob3: %s",
ERR_error_string(ERR_get_error(), NULL));
@@ -2919,7 +2938,7 @@ crypto_bob3(
EVP_SignUpdate(&ctx, (u_char *)&vp->tstamp, 12);
EVP_SignUpdate(&ctx, vp->ptr, len);
if (EVP_SignFinal(&ctx, vp->sig, &len, sign_pkey)) {
- NTP_INSIST(len <= sign_siglen);
+ INSIST(len <= sign_siglen);
vp->siglen = htonl(len);
}
return (XEVNT_OK);
@@ -3078,8 +3097,11 @@ cert_sign(
if (tstamp == 0)
return (XEVNT_TSP);
+ len = exten_payload_size(ep);
+ if (len == 0 || len > MAX_VALLEN)
+ return (XEVNT_LEN);
cptr = (void *)ep->pkt;
- if ((req = d2i_X509(NULL, &cptr, ntohl(ep->vallen))) == NULL) {
+ if ((req = d2i_X509(NULL, &cptr, len)) == NULL) {
msyslog(LOG_ERR, "cert_sign: %s",
ERR_error_string(ERR_get_error(), NULL));
return (XEVNT_CRT);
@@ -3158,7 +3180,7 @@ cert_sign(
EVP_SignUpdate(&ctx, (u_char *)vp, 12);
EVP_SignUpdate(&ctx, vp->ptr, len);
if (EVP_SignFinal(&ctx, vp->sig, &len, sign_pkey)) {
- NTP_INSIST(len <= sign_siglen);
+ INSIST(len <= sign_siglen);
vp->siglen = htonl(len);
}
}
@@ -4028,6 +4050,36 @@ crypto_config(
break;
}
}
+
+/*
+ * Get the payload size (internal value length) of an extension packet.
+ * If the inner value size does not match the outer packet size (that
+ * is, the value would end behind the frame given by the opcode/size
+ * field) the function will effectively return UINT_MAX. If the frame is
+ * too short to hold a variable-sized value, the return value is zero.
+ */
+static u_int
+exten_payload_size(
+ const struct exten * ep)
+{
+ typedef const u_char *BPTR;
+
+ size_t extn_size;
+ size_t data_size;
+ size_t head_size;
+
+ data_size = 0;
+ if (NULL != ep) {
+ head_size = (BPTR)(&ep->vallen + 1) - (BPTR)ep;
+ extn_size = (uint16_t)(ntohl(ep->opcode) & 0x0000ffff);
+ if (extn_size >= head_size) {
+ data_size = (uint32_t)ntohl(ep->vallen);
+ if (data_size > extn_size - head_size)
+ data_size = ~(size_t)0u;
+ }
+ }
+ return (u_int)data_size;
+}
# else /* !AUTOKEY follows */
int ntp_crypto_bs_pubkey;
# endif /* !AUTOKEY */
diff --git a/ntpd/ntp_io.c b/ntpd/ntp_io.c
index a93733f824a2..5fc6ed52acae 100644
--- a/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@ -371,7 +371,7 @@ maintain_activefds(
maxactivefd = i;
break;
}
- NTP_INSIST(fd != maxactivefd);
+ INSIST(fd != maxactivefd);
}
}
}
@@ -687,8 +687,8 @@ addr_samesubnet(
const u_int32 * pm;
size_t loops;
- NTP_REQUIRE(AF(a) == AF(a_mask));
- NTP_REQUIRE(AF(b) == AF(b_mask));
+ REQUIRE(AF(a) == AF(a_mask));
+ REQUIRE(AF(b) == AF(b_mask));
/*
* With address and mask families verified to match, comparing
* the masks also validates the address's families match.
@@ -735,8 +735,8 @@ is_ip_address(
char tmpbuf[128];
char *pch;
- NTP_REQUIRE(host != NULL);
- NTP_REQUIRE(addr != NULL);
+ REQUIRE(host != NULL);
+ REQUIRE(addr != NULL);
ZERO_SOCK(addr);
@@ -1250,15 +1250,15 @@ add_nic_rule(
rule->action = action;
if (MATCH_IFNAME == match_type) {
- NTP_REQUIRE(NULL != if_name);
+ REQUIRE(NULL != if_name);
rule->if_name = estrdup(if_name);
} else if (MATCH_IFADDR == match_type) {
- NTP_REQUIRE(NULL != if_name);
+ REQUIRE(NULL != if_name);
/* set rule->addr */
is_ip = is_ip_address(if_name, AF_UNSPEC, &rule->addr);
- NTP_REQUIRE(is_ip);
+ REQUIRE(is_ip);
} else
- NTP_REQUIRE(NULL == if_name);
+ REQUIRE(NULL == if_name);
LINK_SLIST(nic_rule_list, rule, next);
}
@@ -1278,7 +1278,7 @@ action_text(
t = "ERROR"; /* quiet uninit warning */
DPRINTF(1, ("fatal: unknown nic_rule_action %d\n",
action));
- NTP_ENSURE(0);
+ ENSURE(0);
break;
case ACTION_LISTEN:
@@ -2022,6 +2022,7 @@ update_interfaces(
if (sys_bclient)
io_setbclient();
+#ifdef MCAST
/*
* Check multicast interfaces and try to join multicast groups if
* not joined yet.
@@ -2047,6 +2048,7 @@ update_interfaces(
}
}
}
+#endif /* MCAST */
return new_interface_found;
}
@@ -2397,7 +2399,7 @@ enable_multicast_if(
u_int off6 = 0;
#endif
- NTP_REQUIRE(AF(maddr) == AF(&iface->sin));
+ REQUIRE(AF(maddr) == AF(&iface->sin));
switch (AF(&iface->sin)) {
@@ -2457,9 +2459,9 @@ socket_multicast_enable(
)
{
struct ip_mreq mreq;
-#ifdef INCLUDE_IPV6_MULTICAST_SUPPORT
+# ifdef INCLUDE_IPV6_MULTICAST_SUPPORT
struct ipv6_mreq mreq6;
-#endif
+# endif
switch (AF(maddr)) {
case AF_INET:
@@ -2486,7 +2488,7 @@ socket_multicast_enable(
break;
case AF_INET6:
-#ifdef INCLUDE_IPV6_MULTICAST_SUPPORT
+# ifdef INCLUDE_IPV6_MULTICAST_SUPPORT
/*
* Enable reception of multicast packets.
* If the address is link-local we can get the
@@ -2510,9 +2512,9 @@ socket_multicast_enable(
DPRINTF(4, ("Added IPv6 multicast group on socket %d, addr %s for interface %u (%s)\n",
iface->fd, stoa(&iface->sin),
mreq6.ipv6mr_interface, stoa(maddr)));
-#else
+# else
return ISC_FALSE;
-#endif /* INCLUDE_IPV6_MULTICAST_SUPPORT */
+# endif /* INCLUDE_IPV6_MULTICAST_SUPPORT */
}
iface->flags |= INT_MCASTOPEN;
iface->num_mcast++;
@@ -2534,9 +2536,9 @@ socket_multicast_disable(
sockaddr_u * maddr
)
{
-#ifdef INCLUDE_IPV6_MULTICAST_SUPPORT
+# ifdef INCLUDE_IPV6_MULTICAST_SUPPORT
struct ipv6_mreq mreq6;
-#endif
+# endif
struct ip_mreq mreq;
ZERO(mreq);
@@ -2565,7 +2567,7 @@ socket_multicast_disable(
}
break;
case AF_INET6:
-#ifdef INCLUDE_IPV6_MULTICAST_SUPPORT
+# ifdef INCLUDE_IPV6_MULTICAST_SUPPORT
/*
* Disable reception of multicast packets
* If the address is link-local we can get the
@@ -2587,9 +2589,9 @@ socket_multicast_disable(
return ISC_FALSE;
}
break;
-#else
+# else
return ISC_FALSE;
-#endif /* INCLUDE_IPV6_MULTICAST_SUPPORT */
+# endif /* INCLUDE_IPV6_MULTICAST_SUPPORT */
}
iface->num_mcast--;
@@ -2629,7 +2631,7 @@ io_setbclient(void)
continue;
/* Only IPv4 addresses are valid for broadcast */
- NTP_REQUIRE(IS_IPV4(&interf->sin));
+ REQUIRE(IS_IPV4(&interf->sin));
/* Do we already have the broadcast address open? */
if (interf->flags & INT_BCASTOPEN) {
@@ -2735,7 +2737,7 @@ io_multicast_add(
return;
}
-#ifndef MULTICAST_NONEWSOCKET
+# ifndef MULTICAST_NONEWSOCKET
ep = new_interface(NULL);
/*
@@ -2785,7 +2787,7 @@ io_multicast_add(
}
{ /* in place of the { following for in #else clause */
one_ep = ep;
-#else /* MULTICAST_NONEWSOCKET follows */
+# else /* MULTICAST_NONEWSOCKET follows */
/*
* For the case where we can't use a separate socket (Windows)
* join each applicable endpoint socket to the group address.
@@ -2800,7 +2802,7 @@ io_multicast_add(
(INT_LOOPBACK | INT_WILDCARD) & ep->flags)
continue;
one_ep = ep;
-#endif /* MULTICAST_NONEWSOCKET */
+# endif /* MULTICAST_NONEWSOCKET */
if (socket_multicast_enable(ep, addr))
msyslog(LOG_INFO,
"Joined %s socket to multicast group %s",
@@ -3240,7 +3242,7 @@ read_refclock_packet(
l_fp ts
)
{
- int i;
+ u_int read_count;
int buflen;
int saved_errno;
int consumed;
@@ -3259,12 +3261,15 @@ read_refclock_packet(
return (buflen);
}
- i = (rp->datalen == 0
- || rp->datalen > (int)sizeof(rb->recv_space))
- ? (int)sizeof(rb->recv_space)
- : rp->datalen;
+ /* TALOS-CAN-0064: avoid signed/unsigned clashes that can lead
+ * to buffer overrun and memory corruption
+ */
+ if (rp->datalen <= 0 || rp->datalen > sizeof(rb->recv_space))
+ read_count = sizeof(rb->recv_space);
+ else
+ read_count = (u_int)rp->datalen;
do {
- buflen = read(fd, (char *)&rb->recv_space, (u_int)i);
+ buflen = read(fd, (char *)&rb->recv_space, read_count);
} while (buflen < 0 && EINTR == errno);
if (buflen <= 0) {
@@ -4079,7 +4084,7 @@ calc_addr_distance(
int a1_greater;
int i;
- NTP_REQUIRE(AF(a1) == AF(a2));
+ REQUIRE(AF(a1) == AF(a2));
ZERO_SOCK(dist);
AF(dist) = AF(a1);
@@ -4130,7 +4135,7 @@ cmp_addr_distance(
{
int i;
- NTP_REQUIRE(AF(d1) == AF(d2));
+ REQUIRE(AF(d1) == AF(d2));
if (IS_IPV4(d1)) {
if (SRCADR(d1) < SRCADR(d2))
@@ -4622,10 +4627,15 @@ process_routing_msgs(struct asyncio_reader *reader)
cnt = read(reader->fd, buffer, sizeof(buffer));
if (cnt < 0) {
- msyslog(LOG_ERR,
- "i/o error on routing socket %m - disabling");
- remove_asyncio_reader(reader);
- delete_asyncio_reader(reader);
+ if (errno == ENOBUFS) {
+ msyslog(LOG_ERR,
+ "routing socket reports: %m");
+ } else {
+ msyslog(LOG_ERR,
+ "routing socket reports: %m - disabling");
+ remove_asyncio_reader(reader);
+ delete_asyncio_reader(reader);
+ }
return;
}
diff --git a/ntpd/ntp_loopfilter.c b/ntpd/ntp_loopfilter.c
index cb183b934fc8..42c30de5679f 100644
--- a/ntpd/ntp_loopfilter.c
+++ b/ntpd/ntp_loopfilter.c
@@ -577,7 +577,7 @@ local_clock(
switch (state) {
/*
- * In SYNC state we ignore the first outlyer and switch
+ * In SYNC state we ignore the first outlier and switch
* to SPIK state.
*/
case EVNT_SYNC:
@@ -588,8 +588,8 @@ local_clock(
return (0);
/*
- * In FREQ state we ignore outlyers and inlyers. At the
- * first outlyer after the stepout threshold, compute
+ * In FREQ state we ignore outliers and inlyers. At the
+ * first outlier after the stepout threshold, compute
* the apparent frequency correction and step the phase.
*/
case EVNT_FREQ:
@@ -601,7 +601,7 @@ local_clock(
/* fall through to EVNT_SPIK */
/*
- * In SPIK state we ignore succeeding outlyers until
+ * In SPIK state we ignore succeeding outliers until
* either an inlyer is found or the stepout threshold is
* exceeded.
*/
diff --git a/ntpd/ntp_monitor.c b/ntpd/ntp_monitor.c
index 02fd757307da..a07a1aaef196 100644
--- a/ntpd/ntp_monitor.c
+++ b/ntpd/ntp_monitor.c
@@ -133,7 +133,7 @@ remove_from_hash(
hash = MON_HASH(&mon->rmtadr);
UNLINK_SLIST(punlinked, mon_hash[hash], mon, hash_next,
mon_entry);
- NTP_ENSURE(punlinked == mon);
+ ENSURE(punlinked == mon);
}
@@ -325,6 +325,8 @@ ntp_monitor(
int leak; /* new headway */
int limit; /* average threshold */
+ REQUIRE(rbufp != NULL);
+
if (mon_enabled == MON_OFF)
return ~(RES_LIMITED | RES_KOD) & flags;
@@ -466,6 +468,8 @@ ntp_monitor(
}
}
+ INSIST(mon != NULL);
+
/*
* Got one, initialize it
*/
diff --git a/ntpd/ntp_parser.c b/ntpd/ntp_parser.c
index d76ac3374386..6235033feffb 100644
--- a/ntpd/ntp_parser.c
+++ b/ntpd/ntp_parser.c
@@ -1,19 +1,19 @@
-/* A Bison parser, made by GNU Bison 2.7.12-4996. */
+/* A Bison parser, made by GNU Bison 3.0.2. */
/* Bison implementation for Yacc-like parsers in C
-
- Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
-
+
+ Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
@@ -26,7 +26,7 @@
special exception, which will cause the skeleton and the resulting
Bison output files to be licensed under the GNU General Public
License without this special exception.
-
+
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
@@ -44,7 +44,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "2.7.12-4996"
+#define YYBISON_VERSION "3.0.2"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -62,8 +62,7 @@
/* Copy the first part of user declarations. */
-/* Line 371 of yacc.c */
-#line 11 "../../ntpd/ntp_parser.y"
+#line 11 "../../ntpd/ntp_parser.y" /* yacc.c:339 */
#ifdef HAVE_CONFIG_H
# include <config.h>
@@ -97,14 +96,13 @@
# define ONLY_SIM(a) NULL
#endif
-/* Line 371 of yacc.c */
-#line 102 "ntp_parser.c"
+#line 100 "../../ntpd/ntp_parser.c" /* yacc.c:339 */
-# ifndef YY_NULL
+# ifndef YY_NULLPTR
# if defined __cplusplus && 201103L <= __cplusplus
-# define YY_NULL nullptr
+# define YY_NULLPTR nullptr
# else
-# define YY_NULL 0
+# define YY_NULLPTR 0
# endif
# endif
@@ -118,9 +116,9 @@
/* In a future release of Bison, this section will be replaced
by #include "y.tab.h". */
-#ifndef YY_YY_NTP_PARSER_H_INCLUDED
-# define YY_YY_NTP_PARSER_H_INCLUDED
-/* Enabling traces. */
+#ifndef YY_YY__NTPD_NTP_PARSER_H_INCLUDED
+# define YY_YY__NTPD_NTP_PARSER_H_INCLUDED
+/* Debug traces. */
#ifndef YYDEBUG
# define YYDEBUG 1
#endif
@@ -128,204 +126,203 @@
extern int yydebug;
#endif
-/* Tokens. */
+/* Token type. */
#ifndef YYTOKENTYPE
# define YYTOKENTYPE
- /* Put the tokens into the symbol table, so that GDB and other debuggers
- know about them. */
- enum yytokentype {
- T_Abbrev = 258,
- T_Age = 259,
- T_All = 260,
- T_Allan = 261,
- T_Allpeers = 262,
- T_Auth = 263,
- T_Autokey = 264,
- T_Automax = 265,
- T_Average = 266,
- T_Bclient = 267,
- T_Beacon = 268,
- T_Broadcast = 269,
- T_Broadcastclient = 270,
- T_Broadcastdelay = 271,
- T_Burst = 272,
- T_Calibrate = 273,
- T_Ceiling = 274,
- T_Clockstats = 275,
- T_Cohort = 276,
- T_ControlKey = 277,
- T_Crypto = 278,
- T_Cryptostats = 279,
- T_Ctl = 280,
- T_Day = 281,
- T_Default = 282,
- T_Digest = 283,
- T_Disable = 284,
- T_Discard = 285,
- T_Dispersion = 286,
- T_Double = 287,
- T_Driftfile = 288,
- T_Drop = 289,
- T_Dscp = 290,
- T_Ellipsis = 291,
- T_Enable = 292,
- T_End = 293,
- T_False = 294,
- T_File = 295,
- T_Filegen = 296,
- T_Filenum = 297,
- T_Flag1 = 298,
- T_Flag2 = 299,
- T_Flag3 = 300,
- T_Flag4 = 301,
- T_Flake = 302,
- T_Floor = 303,
- T_Freq = 304,
- T_Fudge = 305,
- T_Host = 306,
- T_Huffpuff = 307,
- T_Iburst = 308,
- T_Ident = 309,
- T_Ignore = 310,
- T_Incalloc = 311,
- T_Incmem = 312,
- T_Initalloc = 313,
- T_Initmem = 314,
- T_Includefile = 315,
- T_Integer = 316,
- T_Interface = 317,
- T_Intrange = 318,
- T_Io = 319,
- T_Ipv4 = 320,
- T_Ipv4_flag = 321,
- T_Ipv6 = 322,
- T_Ipv6_flag = 323,
- T_Kernel = 324,
- T_Key = 325,
- T_Keys = 326,
- T_Keysdir = 327,
- T_Kod = 328,
- T_Mssntp = 329,
- T_Leapfile = 330,
- T_Leapsmearinterval = 331,
- T_Limited = 332,
- T_Link = 333,
- T_Listen = 334,
- T_Logconfig = 335,
- T_Logfile = 336,
- T_Loopstats = 337,
- T_Lowpriotrap = 338,
- T_Manycastclient = 339,
- T_Manycastserver = 340,
- T_Mask = 341,
- T_Maxage = 342,
- T_Maxclock = 343,
- T_Maxdepth = 344,
- T_Maxdist = 345,
- T_Maxmem = 346,
- T_Maxpoll = 347,
- T_Mdnstries = 348,
- T_Mem = 349,
- T_Memlock = 350,
- T_Minclock = 351,
- T_Mindepth = 352,
- T_Mindist = 353,
- T_Minimum = 354,
- T_Minpoll = 355,
- T_Minsane = 356,
- T_Mode = 357,
- T_Mode7 = 358,
- T_Monitor = 359,
- T_Month = 360,
- T_Mru = 361,
- T_Multicastclient = 362,
- T_Nic = 363,
- T_Nolink = 364,
- T_Nomodify = 365,
- T_Nomrulist = 366,
- T_None = 367,
- T_Nonvolatile = 368,
- T_Nopeer = 369,
- T_Noquery = 370,
- T_Noselect = 371,
- T_Noserve = 372,
- T_Notrap = 373,
- T_Notrust = 374,
- T_Ntp = 375,
- T_Ntpport = 376,
- T_NtpSignDsocket = 377,
- T_Orphan = 378,
- T_Orphanwait = 379,
- T_Panic = 380,
- T_Peer = 381,
- T_Peerstats = 382,
- T_Phone = 383,
- T_Pid = 384,
- T_Pidfile = 385,
- T_Pool = 386,
- T_Port = 387,
- T_Preempt = 388,
- T_Prefer = 389,
- T_Protostats = 390,
- T_Pw = 391,
- T_Randfile = 392,
- T_Rawstats = 393,
- T_Refid = 394,
- T_Requestkey = 395,
- T_Reset = 396,
- T_Restrict = 397,
- T_Revoke = 398,
- T_Rlimit = 399,
- T_Saveconfigdir = 400,
- T_Server = 401,
- T_Setvar = 402,
- T_Source = 403,
- T_Stacksize = 404,
- T_Statistics = 405,
- T_Stats = 406,
- T_Statsdir = 407,
- T_Step = 408,
- T_Stepback = 409,
- T_Stepfwd = 410,
- T_Stepout = 411,
- T_Stratum = 412,
- T_String = 413,
- T_Sys = 414,
- T_Sysstats = 415,
- T_Tick = 416,
- T_Time1 = 417,
- T_Time2 = 418,
- T_Timer = 419,
- T_Timingstats = 420,
- T_Tinker = 421,
- T_Tos = 422,
- T_Trap = 423,
- T_True = 424,
- T_Trustedkey = 425,
- T_Ttl = 426,
- T_Type = 427,
- T_U_int = 428,
- T_Unconfig = 429,
- T_Unpeer = 430,
- T_Version = 431,
- T_WanderThreshold = 432,
- T_Week = 433,
- T_Wildcard = 434,
- T_Xleave = 435,
- T_Year = 436,
- T_Flag = 437,
- T_EOC = 438,
- T_Simulate = 439,
- T_Beep_Delay = 440,
- T_Sim_Duration = 441,
- T_Server_Offset = 442,
- T_Duration = 443,
- T_Freq_Offset = 444,
- T_Wander = 445,
- T_Jitter = 446,
- T_Prop_Delay = 447,
- T_Proc_Delay = 448
- };
+ enum yytokentype
+ {
+ T_Abbrev = 258,
+ T_Age = 259,
+ T_All = 260,
+ T_Allan = 261,
+ T_Allpeers = 262,
+ T_Auth = 263,
+ T_Autokey = 264,
+ T_Automax = 265,
+ T_Average = 266,
+ T_Bclient = 267,
+ T_Beacon = 268,
+ T_Broadcast = 269,
+ T_Broadcastclient = 270,
+ T_Broadcastdelay = 271,
+ T_Burst = 272,
+ T_Calibrate = 273,
+ T_Ceiling = 274,
+ T_Clockstats = 275,
+ T_Cohort = 276,
+ T_ControlKey = 277,
+ T_Crypto = 278,
+ T_Cryptostats = 279,
+ T_Ctl = 280,
+ T_Day = 281,
+ T_Default = 282,
+ T_Digest = 283,
+ T_Disable = 284,
+ T_Discard = 285,
+ T_Dispersion = 286,
+ T_Double = 287,
+ T_Driftfile = 288,
+ T_Drop = 289,
+ T_Dscp = 290,
+ T_Ellipsis = 291,
+ T_Enable = 292,
+ T_End = 293,
+ T_False = 294,
+ T_File = 295,
+ T_Filegen = 296,
+ T_Filenum = 297,
+ T_Flag1 = 298,
+ T_Flag2 = 299,
+ T_Flag3 = 300,
+ T_Flag4 = 301,
+ T_Flake = 302,
+ T_Floor = 303,
+ T_Freq = 304,
+ T_Fudge = 305,
+ T_Host = 306,
+ T_Huffpuff = 307,
+ T_Iburst = 308,
+ T_Ident = 309,
+ T_Ignore = 310,
+ T_Incalloc = 311,
+ T_Incmem = 312,
+ T_Initalloc = 313,
+ T_Initmem = 314,
+ T_Includefile = 315,
+ T_Integer = 316,
+ T_Interface = 317,
+ T_Intrange = 318,
+ T_Io = 319,
+ T_Ipv4 = 320,
+ T_Ipv4_flag = 321,
+ T_Ipv6 = 322,
+ T_Ipv6_flag = 323,
+ T_Kernel = 324,
+ T_Key = 325,
+ T_Keys = 326,
+ T_Keysdir = 327,
+ T_Kod = 328,
+ T_Mssntp = 329,
+ T_Leapfile = 330,
+ T_Leapsmearinterval = 331,
+ T_Limited = 332,
+ T_Link = 333,
+ T_Listen = 334,
+ T_Logconfig = 335,
+ T_Logfile = 336,
+ T_Loopstats = 337,
+ T_Lowpriotrap = 338,
+ T_Manycastclient = 339,
+ T_Manycastserver = 340,
+ T_Mask = 341,
+ T_Maxage = 342,
+ T_Maxclock = 343,
+ T_Maxdepth = 344,
+ T_Maxdist = 345,
+ T_Maxmem = 346,
+ T_Maxpoll = 347,
+ T_Mdnstries = 348,
+ T_Mem = 349,
+ T_Memlock = 350,
+ T_Minclock = 351,
+ T_Mindepth = 352,
+ T_Mindist = 353,
+ T_Minimum = 354,
+ T_Minpoll = 355,
+ T_Minsane = 356,
+ T_Mode = 357,
+ T_Mode7 = 358,
+ T_Monitor = 359,
+ T_Month = 360,
+ T_Mru = 361,
+ T_Multicastclient = 362,
+ T_Nic = 363,
+ T_Nolink = 364,
+ T_Nomodify = 365,
+ T_Nomrulist = 366,
+ T_None = 367,
+ T_Nonvolatile = 368,
+ T_Nopeer = 369,
+ T_Noquery = 370,
+ T_Noselect = 371,
+ T_Noserve = 372,
+ T_Notrap = 373,
+ T_Notrust = 374,
+ T_Ntp = 375,
+ T_Ntpport = 376,
+ T_NtpSignDsocket = 377,
+ T_Orphan = 378,
+ T_Orphanwait = 379,
+ T_Panic = 380,
+ T_Peer = 381,
+ T_Peerstats = 382,
+ T_Phone = 383,
+ T_Pid = 384,
+ T_Pidfile = 385,
+ T_Pool = 386,
+ T_Port = 387,
+ T_Preempt = 388,
+ T_Prefer = 389,
+ T_Protostats = 390,
+ T_Pw = 391,
+ T_Randfile = 392,
+ T_Rawstats = 393,
+ T_Refid = 394,
+ T_Requestkey = 395,
+ T_Reset = 396,
+ T_Restrict = 397,
+ T_Revoke = 398,
+ T_Rlimit = 399,
+ T_Saveconfigdir = 400,
+ T_Server = 401,
+ T_Setvar = 402,
+ T_Source = 403,
+ T_Stacksize = 404,
+ T_Statistics = 405,
+ T_Stats = 406,
+ T_Statsdir = 407,
+ T_Step = 408,
+ T_Stepback = 409,
+ T_Stepfwd = 410,
+ T_Stepout = 411,
+ T_Stratum = 412,
+ T_String = 413,
+ T_Sys = 414,
+ T_Sysstats = 415,
+ T_Tick = 416,
+ T_Time1 = 417,
+ T_Time2 = 418,
+ T_Timer = 419,
+ T_Timingstats = 420,
+ T_Tinker = 421,
+ T_Tos = 422,
+ T_Trap = 423,
+ T_True = 424,
+ T_Trustedkey = 425,
+ T_Ttl = 426,
+ T_Type = 427,
+ T_U_int = 428,
+ T_Unconfig = 429,
+ T_Unpeer = 430,
+ T_Version = 431,
+ T_WanderThreshold = 432,
+ T_Week = 433,
+ T_Wildcard = 434,
+ T_Xleave = 435,
+ T_Year = 436,
+ T_Flag = 437,
+ T_EOC = 438,
+ T_Simulate = 439,
+ T_Beep_Delay = 440,
+ T_Sim_Duration = 441,
+ T_Server_Offset = 442,
+ T_Duration = 443,
+ T_Freq_Offset = 444,
+ T_Wander = 445,
+ T_Jitter = 446,
+ T_Prop_Delay = 447,
+ T_Proc_Delay = 448
+ };
#endif
/* Tokens. */
#define T_Abbrev 258
@@ -520,13 +517,12 @@ extern int yydebug;
#define T_Prop_Delay 447
#define T_Proc_Delay 448
-
-
+/* Value type. */
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
+typedef union YYSTYPE YYSTYPE;
+union YYSTYPE
{
-/* Line 387 of yacc.c */
-#line 51 "../../ntpd/ntp_parser.y"
+#line 51 "../../ntpd/ntp_parser.y" /* yacc.c:355 */
char * String;
double Double;
@@ -545,37 +541,22 @@ typedef union YYSTYPE
script_info * Sim_script;
script_info_fifo * Sim_script_fifo;
-
-/* Line 387 of yacc.c */
-#line 551 "ntp_parser.c"
-} YYSTYPE;
+#line 545 "../../ntpd/ntp_parser.c" /* yacc.c:355 */
+};
# define YYSTYPE_IS_TRIVIAL 1
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
#endif
+
extern YYSTYPE yylval;
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void *YYPARSE_PARAM);
-#else
-int yyparse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
int yyparse (void);
-#else
-int yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
-#endif /* !YY_YY_NTP_PARSER_H_INCLUDED */
+#endif /* !YY_YY__NTPD_NTP_PARSER_H_INCLUDED */
/* Copy the second part of user declarations. */
-/* Line 390 of yacc.c */
-#line 579 "ntp_parser.c"
+#line 560 "../../ntpd/ntp_parser.c" /* yacc.c:358 */
#ifdef short
# undef short
@@ -589,11 +570,8 @@ typedef unsigned char yytype_uint8;
#ifdef YYTYPE_INT8
typedef YYTYPE_INT8 yytype_int8;
-#elif (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-typedef signed char yytype_int8;
#else
-typedef short int yytype_int8;
+typedef signed char yytype_int8;
#endif
#ifdef YYTYPE_UINT16
@@ -613,8 +591,7 @@ typedef short int yytype_int16;
# define YYSIZE_T __SIZE_TYPE__
# elif defined size_t
# define YYSIZE_T size_t
-# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
+# elif ! defined YYSIZE_T
# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
# define YYSIZE_T size_t
# else
@@ -636,11 +613,30 @@ typedef short int yytype_int16;
# endif
#endif
-#ifndef __attribute__
-/* This feature is available in gcc versions 2.5 and later. */
-# if (! defined __GNUC__ || __GNUC__ < 2 \
- || (__GNUC__ == 2 && __GNUC_MINOR__ < 5))
-# define __attribute__(Spec) /* empty */
+#ifndef YY_ATTRIBUTE
+# if (defined __GNUC__ \
+ && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__))) \
+ || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
+# define YY_ATTRIBUTE(Spec) __attribute__(Spec)
+# else
+# define YY_ATTRIBUTE(Spec) /* empty */
+# endif
+#endif
+
+#ifndef YY_ATTRIBUTE_PURE
+# define YY_ATTRIBUTE_PURE YY_ATTRIBUTE ((__pure__))
+#endif
+
+#ifndef YY_ATTRIBUTE_UNUSED
+# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
+#endif
+
+#if !defined _Noreturn \
+ && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
+# if defined _MSC_VER && 1200 <= _MSC_VER
+# define _Noreturn __declspec (noreturn)
+# else
+# define _Noreturn YY_ATTRIBUTE ((__noreturn__))
# endif
#endif
@@ -651,25 +647,26 @@ typedef short int yytype_int16;
# define YYUSE(E) /* empty */
#endif
-
-/* Identity function, used to suppress warnings about constant conditions. */
-#ifndef lint
-# define YYID(N) (N)
-#else
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-static int
-YYID (int yyi)
+#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+/* Suppress an incorrect diagnostic about yylval being uninitialized. */
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
+ _Pragma ("GCC diagnostic push") \
+ _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
+ _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
+ _Pragma ("GCC diagnostic pop")
#else
-static int
-YYID (yyi)
- int yyi;
+# define YY_INITIAL_VALUE(Value) Value
#endif
-{
- return yyi;
-}
+#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END
+#endif
+#ifndef YY_INITIAL_VALUE
+# define YY_INITIAL_VALUE(Value) /* Nothing. */
#endif
+
#if ! defined yyoverflow || YYERROR_VERBOSE
/* The parser invokes alloca or malloc; define the necessary symbols. */
@@ -687,8 +684,7 @@ YYID (yyi)
# define alloca _alloca
# else
# define YYSTACK_ALLOC alloca
-# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
+# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
/* Use EXIT_SUCCESS as a witness for stdlib.h. */
# ifndef EXIT_SUCCESS
@@ -700,8 +696,8 @@ YYID (yyi)
# endif
# ifdef YYSTACK_ALLOC
- /* Pacify GCC's `empty if-body' warning. */
-# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
+ /* Pacify GCC's 'empty if-body' warning. */
+# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
# ifndef YYSTACK_ALLOC_MAXIMUM
/* The OS might guarantee only one guard page at the bottom of the stack,
and a page size can be as small as 4096 bytes. So we cannot safely
@@ -717,7 +713,7 @@ YYID (yyi)
# endif
# if (defined __cplusplus && ! defined EXIT_SUCCESS \
&& ! ((defined YYMALLOC || defined malloc) \
- && (defined YYFREE || defined free)))
+ && (defined YYFREE || defined free)))
# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
# ifndef EXIT_SUCCESS
# define EXIT_SUCCESS 0
@@ -725,15 +721,13 @@ YYID (yyi)
# endif
# ifndef YYMALLOC
# define YYMALLOC malloc
-# if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
+# if ! defined malloc && ! defined EXIT_SUCCESS
void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
# endif
# endif
# ifndef YYFREE
# define YYFREE free
-# if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
+# if ! defined free && ! defined EXIT_SUCCESS
void free (void *); /* INFRINGES ON USER NAME SPACE */
# endif
# endif
@@ -743,7 +737,7 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
#if (! defined yyoverflow \
&& (! defined __cplusplus \
- || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+ || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
/* A type that is properly aligned for any stack member. */
union yyalloc
@@ -768,16 +762,16 @@ union yyalloc
elements in the stack, and YYPTR gives the new location of the
stack. Advance YYPTR to a properly aligned location for the next
stack. */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack) \
- do \
- { \
- YYSIZE_T yynewbytes; \
- YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \
- Stack = &yyptr->Stack_alloc; \
- yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
- yyptr += yynewbytes / sizeof (*yyptr); \
- } \
- while (YYID (0))
+# define YYSTACK_RELOCATE(Stack_alloc, Stack) \
+ do \
+ { \
+ YYSIZE_T yynewbytes; \
+ YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \
+ Stack = &yyptr->Stack_alloc; \
+ yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+ yyptr += yynewbytes / sizeof (*yyptr); \
+ } \
+ while (0)
#endif
@@ -796,7 +790,7 @@ union yyalloc
for (yyi = 0; yyi < (Count); yyi++) \
(Dst)[yyi] = (Src)[yyi]; \
} \
- while (YYID (0))
+ while (0)
# endif
# endif
#endif /* !YYCOPY_NEEDED */
@@ -812,17 +806,19 @@ union yyalloc
#define YYNNTS 105
/* YYNRULES -- Number of rules. */
#define YYNRULES 313
-/* YYNRULES -- Number of states. */
+/* YYNSTATES -- Number of states. */
#define YYNSTATES 419
-/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
+/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
+ by yylex, with out-of-bounds checking. */
#define YYUNDEFTOK 2
#define YYMAXUTOK 448
-#define YYTRANSLATE(YYX) \
+#define YYTRANSLATE(YYX) \
((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
-/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */
+/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
+ as returned by yylex, without out-of-bounds checking. */
static const yytype_uint8 yytranslate[] =
{
0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -873,127 +869,7 @@ static const yytype_uint8 yytranslate[] =
};
#if YYDEBUG
-/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
- YYRHS. */
-static const yytype_uint16 yyprhs[] =
-{
- 0, 0, 3, 5, 9, 12, 15, 16, 18, 20,
- 22, 24, 26, 28, 30, 32, 34, 36, 38, 40,
- 42, 46, 48, 50, 52, 54, 56, 58, 61, 63,
- 65, 67, 68, 71, 73, 75, 77, 79, 81, 83,
- 85, 87, 89, 91, 93, 95, 98, 101, 103, 105,
- 107, 109, 111, 113, 116, 118, 121, 123, 125, 127,
- 130, 133, 136, 139, 142, 145, 148, 151, 154, 157,
- 160, 163, 164, 167, 170, 173, 175, 177, 179, 181,
- 183, 186, 189, 191, 194, 197, 200, 202, 204, 206,
- 208, 210, 212, 214, 216, 218, 220, 223, 226, 230,
- 233, 235, 237, 239, 241, 243, 245, 247, 249, 251,
- 252, 255, 258, 261, 263, 265, 267, 269, 271, 273,
- 275, 277, 279, 281, 283, 285, 287, 290, 293, 297,
- 303, 307, 312, 317, 321, 322, 325, 327, 329, 331,
- 333, 335, 337, 339, 341, 343, 345, 347, 349, 351,
- 353, 355, 358, 360, 363, 365, 367, 369, 372, 374,
- 377, 379, 381, 383, 385, 387, 389, 391, 393, 397,
- 400, 402, 405, 408, 411, 414, 417, 419, 421, 423,
- 425, 427, 429, 432, 435, 437, 440, 442, 444, 446,
- 449, 452, 455, 457, 459, 461, 463, 465, 467, 469,
- 471, 473, 475, 477, 480, 483, 485, 488, 490, 492,
- 494, 496, 498, 500, 502, 504, 506, 508, 510, 512,
- 515, 518, 521, 524, 528, 530, 533, 536, 539, 542,
- 546, 549, 551, 553, 555, 557, 559, 561, 563, 565,
- 567, 569, 571, 574, 575, 580, 582, 583, 584, 587,
- 590, 593, 596, 598, 600, 604, 608, 610, 612, 614,
- 616, 618, 620, 622, 624, 626, 629, 632, 634, 636,
- 638, 640, 642, 644, 646, 648, 651, 653, 656, 658,
- 660, 662, 668, 671, 673, 676, 678, 680, 682, 684,
- 686, 688, 694, 696, 700, 703, 707, 709, 711, 714,
- 716, 722, 727, 731, 734, 736, 743, 747, 750, 754,
- 756, 758, 760, 762
-};
-
-/* YYRHS -- A `-1'-separated list of the rules' RHS. */
-static const yytype_int16 yyrhs[] =
-{
- 200, 0, -1, 201, -1, 201, 202, 183, -1, 202,
- 183, -1, 1, 183, -1, -1, 203, -1, 216, -1,
- 218, -1, 219, -1, 228, -1, 236, -1, 223, -1,
- 245, -1, 250, -1, 254, -1, 259, -1, 263, -1,
- 290, -1, 204, 205, 208, -1, 146, -1, 131, -1,
- 126, -1, 14, -1, 84, -1, 206, -1, 207, 158,
- -1, 158, -1, 66, -1, 68, -1, -1, 208, 209,
- -1, 210, -1, 212, -1, 214, -1, 211, -1, 9,
- -1, 17, -1, 53, -1, 116, -1, 133, -1, 134,
- -1, 169, -1, 180, -1, 213, 61, -1, 213, 173,
- -1, 70, -1, 100, -1, 92, -1, 171, -1, 102,
- -1, 176, -1, 215, 158, -1, 54, -1, 217, 205,
- -1, 174, -1, 175, -1, 15, -1, 85, 287, -1,
- 107, 287, -1, 93, 61, -1, 10, 61, -1, 22,
- 61, -1, 23, 220, -1, 71, 158, -1, 72, 158,
- -1, 140, 61, -1, 143, 61, -1, 170, 283, -1,
- 122, 158, -1, -1, 220, 221, -1, 222, 158, -1,
- 143, 61, -1, 51, -1, 54, -1, 136, -1, 137,
- -1, 28, -1, 167, 224, -1, 224, 225, -1, 225,
- -1, 226, 61, -1, 227, 289, -1, 21, 288, -1,
- 19, -1, 48, -1, 123, -1, 124, -1, 101, -1,
- 13, -1, 98, -1, 90, -1, 96, -1, 88, -1,
- 150, 229, -1, 152, 158, -1, 41, 230, 231, -1,
- 229, 230, -1, 230, -1, 20, -1, 24, -1, 82,
- -1, 127, -1, 138, -1, 160, -1, 165, -1, 135,
- -1, -1, 231, 232, -1, 40, 158, -1, 172, 235,
- -1, 233, -1, 234, -1, 78, -1, 109, -1, 37,
- -1, 29, -1, 112, -1, 129, -1, 26, -1, 178,
- -1, 105, -1, 181, -1, 4, -1, 30, 239, -1,
- 106, 242, -1, 142, 205, 237, -1, 142, 206, 86,
- 206, 237, -1, 142, 27, 237, -1, 142, 66, 27,
- 237, -1, 142, 68, 27, 237, -1, 142, 148, 237,
- -1, -1, 237, 238, -1, 47, -1, 55, -1, 73,
- -1, 74, -1, 77, -1, 83, -1, 110, -1, 111,
- -1, 114, -1, 115, -1, 117, -1, 118, -1, 119,
- -1, 121, -1, 176, -1, 239, 240, -1, 240, -1,
- 241, 61, -1, 11, -1, 99, -1, 104, -1, 242,
- 243, -1, 243, -1, 244, 61, -1, 56, -1, 57,
- -1, 58, -1, 59, -1, 87, -1, 89, -1, 91,
- -1, 97, -1, 50, 205, 246, -1, 246, 247, -1,
- 247, -1, 248, 289, -1, 249, 288, -1, 157, 61,
- -1, 3, 158, -1, 139, 158, -1, 162, -1, 163,
- -1, 43, -1, 44, -1, 45, -1, 46, -1, 144,
- 251, -1, 251, 252, -1, 252, -1, 253, 61, -1,
- 95, -1, 149, -1, 42, -1, 37, 255, -1, 29,
- 255, -1, 255, 256, -1, 256, -1, 257, -1, 258,
- -1, 8, -1, 12, -1, 18, -1, 69, -1, 104,
- -1, 120, -1, 103, -1, 151, -1, 166, 260, -1,
- 260, 261, -1, 261, -1, 262, 289, -1, 6, -1,
- 31, -1, 49, -1, 52, -1, 125, -1, 153, -1,
- 154, -1, 155, -1, 156, -1, 161, -1, 275, -1,
- 279, -1, 264, 289, -1, 265, 61, -1, 266, 158,
- -1, 267, 158, -1, 60, 158, 202, -1, 38, -1,
- 33, 268, -1, 80, 273, -1, 128, 286, -1, 147,
- 269, -1, 168, 206, 271, -1, 171, 282, -1, 16,
- -1, 113, -1, 161, -1, 35, -1, 76, -1, 54,
- -1, 75, -1, 130, -1, 81, -1, 145, -1, 158,
- -1, 158, 32, -1, -1, 158, 194, 158, 270, -1,
- 27, -1, -1, -1, 271, 272, -1, 132, 61, -1,
- 62, 206, -1, 273, 274, -1, 274, -1, 158, -1,
- 276, 278, 277, -1, 276, 278, 158, -1, 62, -1,
- 108, -1, 5, -1, 65, -1, 67, -1, 179, -1,
- 79, -1, 55, -1, 34, -1, 141, 280, -1, 280,
- 281, -1, 281, -1, 7, -1, 8, -1, 25, -1,
- 64, -1, 94, -1, 159, -1, 164, -1, 282, 61,
- -1, 61, -1, 283, 284, -1, 284, -1, 61, -1,
- 285, -1, 195, 61, 36, 61, 196, -1, 286, 158,
- -1, 158, -1, 287, 205, -1, 205, -1, 61, -1,
- 169, -1, 39, -1, 61, -1, 32, -1, 291, 197,
- 292, 295, 198, -1, 184, -1, 292, 293, 183, -1,
- 293, 183, -1, 294, 194, 289, -1, 185, -1, 186,
- -1, 295, 296, -1, 296, -1, 298, 197, 297, 299,
- 198, -1, 187, 194, 289, 183, -1, 146, 194, 205,
- -1, 299, 300, -1, 300, -1, 188, 194, 289, 197,
- 301, 198, -1, 301, 302, 183, -1, 302, 183, -1,
- 303, 194, 289, -1, 189, -1, 190, -1, 191, -1,
- 192, -1, 193, -1
-};
-
-/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
+ /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
0, 366, 366, 370, 371, 372, 387, 388, 389, 390,
@@ -1019,15 +895,15 @@ static const yytype_uint16 yyrline[] =
1073, 1077, 1078, 1086, 1091, 1096, 1104, 1109, 1110, 1111,
1112, 1113, 1114, 1115, 1116, 1117, 1118, 1127, 1128, 1129,
1136, 1143, 1150, 1166, 1185, 1187, 1189, 1191, 1193, 1195,
- 1202, 1207, 1208, 1209, 1213, 1217, 1226, 1227, 1228, 1232,
- 1233, 1237, 1244, 1254, 1263, 1268, 1270, 1275, 1276, 1284,
- 1286, 1294, 1299, 1307, 1332, 1339, 1349, 1350, 1354, 1355,
- 1356, 1357, 1361, 1362, 1363, 1367, 1372, 1377, 1385, 1386,
- 1387, 1388, 1389, 1390, 1391, 1401, 1406, 1414, 1419, 1427,
- 1429, 1433, 1438, 1443, 1451, 1456, 1464, 1473, 1474, 1478,
- 1479, 1488, 1506, 1510, 1515, 1523, 1528, 1529, 1533, 1538,
- 1546, 1551, 1556, 1561, 1566, 1574, 1579, 1584, 1592, 1597,
- 1598, 1599, 1600, 1601
+ 1202, 1207, 1208, 1209, 1213, 1217, 1226, 1227, 1231, 1232,
+ 1233, 1237, 1248, 1262, 1274, 1279, 1281, 1286, 1287, 1295,
+ 1297, 1305, 1310, 1318, 1343, 1350, 1360, 1361, 1365, 1366,
+ 1367, 1368, 1372, 1373, 1374, 1378, 1383, 1388, 1396, 1397,
+ 1398, 1399, 1400, 1401, 1402, 1412, 1417, 1425, 1430, 1438,
+ 1440, 1444, 1449, 1454, 1462, 1467, 1475, 1484, 1485, 1489,
+ 1490, 1499, 1517, 1521, 1526, 1534, 1539, 1540, 1544, 1549,
+ 1557, 1562, 1567, 1572, 1577, 1585, 1590, 1595, 1603, 1608,
+ 1609, 1610, 1611, 1612
};
#endif
@@ -1105,13 +981,13 @@ static const char *const yytname[] =
"sim_init_statement_list", "sim_init_statement", "sim_init_keyword",
"sim_server_list", "sim_server", "sim_server_offset", "sim_server_name",
"sim_act_list", "sim_act", "sim_act_stmt_list", "sim_act_stmt",
- "sim_act_keyword", YY_NULL
+ "sim_act_keyword", YY_NULLPTR
};
#endif
# ifdef YYPRINT
-/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
- token YYLEX-NUM. */
+/* YYTOKNUM[NUM] -- (External) token number corresponding to the
+ (internal) symbol number NUM (which must be that of a token). */
static const yytype_uint16 yytoknum[] =
{
0, 256, 257, 258, 259, 260, 261, 262, 263, 264,
@@ -1137,148 +1013,18 @@ static const yytype_uint16 yytoknum[] =
};
# endif
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
-static const yytype_uint16 yyr1[] =
-{
- 0, 199, 200, 201, 201, 201, 202, 202, 202, 202,
- 202, 202, 202, 202, 202, 202, 202, 202, 202, 202,
- 203, 204, 204, 204, 204, 204, 205, 205, 206, 207,
- 207, 208, 208, 209, 209, 209, 210, 211, 211, 211,
- 211, 211, 211, 211, 211, 212, 212, 213, 213, 213,
- 213, 213, 213, 214, 215, 216, 217, 217, 218, 218,
- 218, 218, 219, 219, 219, 219, 219, 219, 219, 219,
- 219, 220, 220, 221, 221, 222, 222, 222, 222, 222,
- 223, 224, 224, 225, 225, 225, 226, 226, 226, 226,
- 226, 226, 227, 227, 227, 227, 228, 228, 228, 229,
- 229, 230, 230, 230, 230, 230, 230, 230, 230, 231,
- 231, 232, 232, 232, 232, 233, 233, 234, 234, 235,
- 235, 235, 235, 235, 235, 235, 236, 236, 236, 236,
- 236, 236, 236, 236, 237, 237, 238, 238, 238, 238,
- 238, 238, 238, 238, 238, 238, 238, 238, 238, 238,
- 238, 239, 239, 240, 241, 241, 241, 242, 242, 243,
- 244, 244, 244, 244, 244, 244, 244, 244, 245, 246,
- 246, 247, 247, 247, 247, 247, 248, 248, 249, 249,
- 249, 249, 250, 251, 251, 252, 253, 253, 253, 254,
- 254, 255, 255, 256, 256, 257, 257, 257, 257, 257,
- 257, 258, 258, 259, 260, 260, 261, 262, 262, 262,
- 262, 262, 262, 262, 262, 262, 262, 263, 263, 263,
- 263, 263, 263, 263, 263, 263, 263, 263, 263, 263,
- 263, 264, 264, 264, 265, 265, 266, 266, 266, 267,
- 267, 268, 268, 268, 269, 270, 270, 271, 271, 272,
- 272, 273, 273, 274, 275, 275, 276, 276, 277, 277,
- 277, 277, 278, 278, 278, 279, 280, 280, 281, 281,
- 281, 281, 281, 281, 281, 282, 282, 283, 283, 284,
- 284, 285, 286, 286, 287, 287, 288, 288, 288, 289,
- 289, 290, 291, 292, 292, 293, 294, 294, 295, 295,
- 296, 297, 298, 299, 299, 300, 301, 301, 302, 303,
- 303, 303, 303, 303
-};
+#define YYPACT_NINF -185
-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
-static const yytype_uint8 yyr2[] =
-{
- 0, 2, 1, 3, 2, 2, 0, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 3, 1, 1, 1, 1, 1, 1, 2, 1, 1,
- 1, 0, 2, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 2, 2, 1, 1, 1,
- 1, 1, 1, 2, 1, 2, 1, 1, 1, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 0, 2, 2, 2, 1, 1, 1, 1, 1,
- 2, 2, 1, 2, 2, 2, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 2, 2, 3, 2,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
- 2, 2, 2, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 2, 2, 3, 5,
- 3, 4, 4, 3, 0, 2, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 2, 1, 2, 1, 1, 1, 2, 1, 2,
- 1, 1, 1, 1, 1, 1, 1, 1, 3, 2,
- 1, 2, 2, 2, 2, 2, 1, 1, 1, 1,
- 1, 1, 2, 2, 1, 2, 1, 1, 1, 2,
- 2, 2, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 2, 2, 1, 2, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 2,
- 2, 2, 2, 3, 1, 2, 2, 2, 2, 3,
- 2, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 2, 0, 4, 1, 0, 0, 2, 2,
- 2, 2, 1, 1, 3, 3, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 2, 2, 1, 1, 1,
- 1, 1, 1, 1, 1, 2, 1, 2, 1, 1,
- 1, 5, 2, 1, 2, 1, 1, 1, 1, 1,
- 1, 5, 1, 3, 2, 3, 1, 1, 2, 1,
- 5, 4, 3, 2, 1, 6, 3, 2, 3, 1,
- 1, 1, 1, 1
-};
+#define yypact_value_is_default(Yystate) \
+ (!!((Yystate) == (-185)))
-/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
- Performed when YYTABLE doesn't specify something else to do. Zero
- means the default is an error. */
-static const yytype_uint16 yydefact[] =
-{
- 0, 0, 0, 24, 58, 231, 0, 71, 0, 0,
- 243, 234, 0, 224, 0, 0, 236, 0, 256, 0,
- 0, 237, 235, 0, 239, 25, 0, 0, 0, 0,
- 257, 232, 0, 23, 0, 238, 22, 0, 0, 0,
- 0, 0, 240, 21, 0, 0, 0, 233, 0, 0,
- 0, 0, 0, 56, 57, 292, 0, 2, 0, 7,
- 0, 8, 0, 9, 10, 13, 11, 12, 14, 15,
- 16, 17, 18, 0, 0, 0, 0, 217, 0, 218,
- 19, 0, 5, 62, 63, 64, 195, 196, 197, 198,
- 201, 199, 200, 202, 190, 192, 193, 194, 154, 155,
- 156, 126, 152, 0, 241, 225, 189, 101, 102, 103,
- 104, 108, 105, 106, 107, 109, 29, 30, 28, 0,
- 26, 0, 6, 65, 66, 253, 226, 252, 285, 59,
- 61, 160, 161, 162, 163, 164, 165, 166, 167, 127,
- 158, 0, 60, 70, 283, 227, 67, 268, 269, 270,
- 271, 272, 273, 274, 265, 267, 134, 29, 30, 134,
- 134, 26, 68, 188, 186, 187, 182, 184, 0, 0,
- 228, 96, 100, 97, 207, 208, 209, 210, 211, 212,
- 213, 214, 215, 216, 203, 205, 0, 91, 86, 0,
- 87, 95, 93, 94, 92, 90, 88, 89, 80, 82,
- 0, 0, 247, 279, 0, 69, 278, 280, 276, 230,
- 1, 0, 4, 31, 55, 290, 289, 219, 220, 221,
- 222, 264, 263, 262, 0, 0, 79, 75, 76, 77,
- 78, 0, 72, 0, 191, 151, 153, 242, 98, 0,
- 178, 179, 180, 181, 0, 0, 176, 177, 168, 170,
- 0, 0, 27, 223, 251, 284, 157, 159, 282, 266,
- 130, 134, 134, 133, 128, 0, 183, 185, 0, 99,
- 204, 206, 288, 286, 287, 85, 81, 83, 84, 229,
- 0, 277, 275, 3, 20, 258, 259, 260, 255, 261,
- 254, 296, 297, 0, 0, 0, 74, 73, 118, 117,
- 0, 115, 116, 0, 110, 113, 114, 174, 175, 173,
- 169, 171, 172, 136, 137, 138, 139, 140, 141, 142,
- 143, 144, 145, 146, 147, 148, 149, 150, 135, 131,
- 132, 134, 246, 0, 0, 248, 0, 37, 38, 39,
- 54, 47, 49, 48, 51, 40, 41, 42, 43, 50,
- 52, 44, 32, 33, 36, 34, 0, 35, 0, 0,
- 0, 0, 299, 0, 294, 0, 111, 125, 121, 123,
- 119, 120, 122, 124, 112, 129, 245, 244, 250, 249,
- 0, 45, 46, 53, 0, 293, 291, 298, 0, 295,
- 281, 302, 0, 0, 0, 0, 0, 304, 0, 0,
- 300, 303, 301, 0, 0, 309, 310, 311, 312, 313,
- 0, 0, 0, 305, 0, 307, 0, 306, 308
-};
+#define YYTABLE_NINF -7
-/* YYDEFGOTO[NTERM-NUM]. */
-static const yytype_int16 yydefgoto[] =
-{
- -1, 56, 57, 58, 59, 60, 128, 120, 121, 284,
- 352, 353, 354, 355, 356, 357, 358, 61, 62, 63,
- 64, 85, 232, 233, 65, 198, 199, 200, 201, 66,
- 171, 115, 238, 304, 305, 306, 374, 67, 260, 328,
- 101, 102, 103, 139, 140, 141, 68, 248, 249, 250,
- 251, 69, 166, 167, 168, 70, 94, 95, 96, 97,
- 71, 184, 185, 186, 72, 73, 74, 75, 76, 105,
- 170, 377, 279, 335, 126, 127, 77, 78, 290, 224,
- 79, 154, 155, 209, 205, 206, 207, 145, 129, 275,
- 217, 80, 81, 293, 294, 295, 361, 362, 393, 363,
- 396, 397, 410, 411, 412
-};
+#define yytable_value_is_error(Yytable_value) \
+ 0
-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
- STATE-NUM. */
-#define YYPACT_NINF -185
+ /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+ STATE-NUM. */
static const yytype_int16 yypact[] =
{
78, -169, -34, -185, -185, -185, -29, -185, 17, 43,
@@ -1325,7 +1071,56 @@ static const yytype_int16 yypact[] =
98, 57, 47, -185, 60, -185, -12, -185, -185
};
-/* YYPGOTO[NTERM-NUM]. */
+ /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
+ Performed when YYTABLE does not specify something else to do. Zero
+ means the default is an error. */
+static const yytype_uint16 yydefact[] =
+{
+ 0, 0, 0, 24, 58, 231, 0, 71, 0, 0,
+ 243, 234, 0, 224, 0, 0, 236, 0, 256, 0,
+ 0, 237, 235, 0, 238, 25, 0, 0, 0, 0,
+ 257, 232, 0, 23, 0, 239, 22, 0, 0, 0,
+ 0, 0, 240, 21, 0, 0, 0, 233, 0, 0,
+ 0, 0, 0, 56, 57, 292, 0, 2, 0, 7,
+ 0, 8, 0, 9, 10, 13, 11, 12, 14, 15,
+ 16, 17, 18, 0, 0, 0, 0, 217, 0, 218,
+ 19, 0, 5, 62, 63, 64, 195, 196, 197, 198,
+ 201, 199, 200, 202, 190, 192, 193, 194, 154, 155,
+ 156, 126, 152, 0, 241, 225, 189, 101, 102, 103,
+ 104, 108, 105, 106, 107, 109, 29, 30, 28, 0,
+ 26, 0, 6, 65, 66, 253, 226, 252, 285, 59,
+ 61, 160, 161, 162, 163, 164, 165, 166, 167, 127,
+ 158, 0, 60, 70, 283, 227, 67, 268, 269, 270,
+ 271, 272, 273, 274, 265, 267, 134, 29, 30, 134,
+ 134, 26, 68, 188, 186, 187, 182, 184, 0, 0,
+ 228, 96, 100, 97, 207, 208, 209, 210, 211, 212,
+ 213, 214, 215, 216, 203, 205, 0, 91, 86, 0,
+ 87, 95, 93, 94, 92, 90, 88, 89, 80, 82,
+ 0, 0, 247, 279, 0, 69, 278, 280, 276, 230,
+ 1, 0, 4, 31, 55, 290, 289, 219, 220, 221,
+ 222, 264, 263, 262, 0, 0, 79, 75, 76, 77,
+ 78, 0, 72, 0, 191, 151, 153, 242, 98, 0,
+ 178, 179, 180, 181, 0, 0, 176, 177, 168, 170,
+ 0, 0, 27, 223, 251, 284, 157, 159, 282, 266,
+ 130, 134, 134, 133, 128, 0, 183, 185, 0, 99,
+ 204, 206, 288, 286, 287, 85, 81, 83, 84, 229,
+ 0, 277, 275, 3, 20, 258, 259, 260, 255, 261,
+ 254, 296, 297, 0, 0, 0, 74, 73, 118, 117,
+ 0, 115, 116, 0, 110, 113, 114, 174, 175, 173,
+ 169, 171, 172, 136, 137, 138, 139, 140, 141, 142,
+ 143, 144, 145, 146, 147, 148, 149, 150, 135, 131,
+ 132, 134, 246, 0, 0, 248, 0, 37, 38, 39,
+ 54, 47, 49, 48, 51, 40, 41, 42, 43, 50,
+ 52, 44, 32, 33, 36, 34, 0, 35, 0, 0,
+ 0, 0, 299, 0, 294, 0, 111, 125, 121, 123,
+ 119, 120, 122, 124, 112, 129, 245, 244, 250, 249,
+ 0, 45, 46, 53, 0, 293, 291, 298, 0, 295,
+ 281, 302, 0, 0, 0, 0, 0, 304, 0, 0,
+ 300, 303, 301, 0, 0, 309, 310, 311, 312, 313,
+ 0, 0, 0, 305, 0, 307, 0, 306, 308
+};
+
+ /* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
-185, -185, -185, -44, -185, -185, -15, -38, -185, -185,
@@ -1341,10 +1136,25 @@ static const yytype_int16 yypgoto[] =
-185, -113, -185, -126, -185
};
-/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
- positive, shift that token. If negative, reduce the rule which
- number is the opposite. If YYTABLE_NINF, syntax error. */
-#define YYTABLE_NINF -7
+ /* YYDEFGOTO[NTERM-NUM]. */
+static const yytype_int16 yydefgoto[] =
+{
+ -1, 56, 57, 58, 59, 60, 128, 120, 121, 284,
+ 352, 353, 354, 355, 356, 357, 358, 61, 62, 63,
+ 64, 85, 232, 233, 65, 198, 199, 200, 201, 66,
+ 171, 115, 238, 304, 305, 306, 374, 67, 260, 328,
+ 101, 102, 103, 139, 140, 141, 68, 248, 249, 250,
+ 251, 69, 166, 167, 168, 70, 94, 95, 96, 97,
+ 71, 184, 185, 186, 72, 73, 74, 75, 76, 105,
+ 170, 377, 279, 335, 126, 127, 77, 78, 290, 224,
+ 79, 154, 155, 209, 205, 206, 207, 145, 129, 275,
+ 217, 80, 81, 293, 294, 295, 361, 362, 393, 363,
+ 396, 397, 410, 411, 412
+};
+
+ /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If
+ positive, shift that token. If negative, reduce the rule whose
+ number is the opposite. If YYTABLE_NINF, syntax error. */
static const yytype_int16 yytable[] =
{
119, 161, 271, 285, 272, 203, 381, 263, 264, 172,
@@ -1414,12 +1224,6 @@ static const yytype_int16 yytable[] =
350, 0, 0, 0, 351, 0, 196, 197
};
-#define yypact_value_is_default(Yystate) \
- (!!((Yystate) == (-185)))
-
-#define yytable_value_is_error(Yytable_value) \
- YYID (0)
-
static const yytype_int16 yycheck[] =
{
15, 39, 186, 5, 39, 61, 61, 159, 160, 45,
@@ -1489,8 +1293,8 @@ static const yytype_int16 yycheck[] =
176, -1, -1, -1, 180, -1, 123, 124
};
-/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
- symbol of state STATE-NUM. */
+ /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+ symbol of state STATE-NUM. */
static const yytype_uint16 yystos[] =
{
0, 1, 10, 14, 15, 16, 22, 23, 29, 30,
@@ -1537,30 +1341,90 @@ static const yytype_uint16 yystos[] =
301, 302, 303, 198, 302, 183, 194, 183, 289
};
-#define yyerrok (yyerrstatus = 0)
-#define yyclearin (yychar = YYEMPTY)
-#define YYEMPTY (-2)
-#define YYEOF 0
-
-#define YYACCEPT goto yyacceptlab
-#define YYABORT goto yyabortlab
-#define YYERROR goto yyerrorlab
-
-
-/* Like YYERROR except do call yyerror. This remains here temporarily
- to ease the transition to the new meaning of YYERROR, for GCC.
- Once GCC version 2 has supplanted version 1, this can go. However,
- YYFAIL appears to be in use. Nevertheless, it is formally deprecated
- in Bison 2.4.2's NEWS entry, where a plan to phase it out is
- discussed. */
-
-#define YYFAIL goto yyerrlab
-#if defined YYFAIL
- /* This is here to suppress warnings from the GCC cpp's
- -Wunused-macros. Normally we don't worry about that warning, but
- some users do, and we want to make it easy for users to remove
- YYFAIL uses, which will produce warnings from Bison 2.5. */
-#endif
+ /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
+static const yytype_uint16 yyr1[] =
+{
+ 0, 199, 200, 201, 201, 201, 202, 202, 202, 202,
+ 202, 202, 202, 202, 202, 202, 202, 202, 202, 202,
+ 203, 204, 204, 204, 204, 204, 205, 205, 206, 207,
+ 207, 208, 208, 209, 209, 209, 210, 211, 211, 211,
+ 211, 211, 211, 211, 211, 212, 212, 213, 213, 213,
+ 213, 213, 213, 214, 215, 216, 217, 217, 218, 218,
+ 218, 218, 219, 219, 219, 219, 219, 219, 219, 219,
+ 219, 220, 220, 221, 221, 222, 222, 222, 222, 222,
+ 223, 224, 224, 225, 225, 225, 226, 226, 226, 226,
+ 226, 226, 227, 227, 227, 227, 228, 228, 228, 229,
+ 229, 230, 230, 230, 230, 230, 230, 230, 230, 231,
+ 231, 232, 232, 232, 232, 233, 233, 234, 234, 235,
+ 235, 235, 235, 235, 235, 235, 236, 236, 236, 236,
+ 236, 236, 236, 236, 237, 237, 238, 238, 238, 238,
+ 238, 238, 238, 238, 238, 238, 238, 238, 238, 238,
+ 238, 239, 239, 240, 241, 241, 241, 242, 242, 243,
+ 244, 244, 244, 244, 244, 244, 244, 244, 245, 246,
+ 246, 247, 247, 247, 247, 247, 248, 248, 249, 249,
+ 249, 249, 250, 251, 251, 252, 253, 253, 253, 254,
+ 254, 255, 255, 256, 256, 257, 257, 257, 257, 257,
+ 257, 258, 258, 259, 260, 260, 261, 262, 262, 262,
+ 262, 262, 262, 262, 262, 262, 262, 263, 263, 263,
+ 263, 263, 263, 263, 263, 263, 263, 263, 263, 263,
+ 263, 264, 264, 264, 265, 265, 266, 266, 267, 267,
+ 267, 268, 268, 268, 269, 270, 270, 271, 271, 272,
+ 272, 273, 273, 274, 275, 275, 276, 276, 277, 277,
+ 277, 277, 278, 278, 278, 279, 280, 280, 281, 281,
+ 281, 281, 281, 281, 281, 282, 282, 283, 283, 284,
+ 284, 285, 286, 286, 287, 287, 288, 288, 288, 289,
+ 289, 290, 291, 292, 292, 293, 294, 294, 295, 295,
+ 296, 297, 298, 299, 299, 300, 301, 301, 302, 303,
+ 303, 303, 303, 303
+};
+
+ /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */
+static const yytype_uint8 yyr2[] =
+{
+ 0, 2, 1, 3, 2, 2, 0, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 3, 1, 1, 1, 1, 1, 1, 2, 1, 1,
+ 1, 0, 2, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 2, 2, 1, 1, 1,
+ 1, 1, 1, 2, 1, 2, 1, 1, 1, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 0, 2, 2, 2, 1, 1, 1, 1, 1,
+ 2, 2, 1, 2, 2, 2, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 2, 2, 3, 2,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
+ 2, 2, 2, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 2, 2, 3, 5,
+ 3, 4, 4, 3, 0, 2, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 2, 1, 2, 1, 1, 1, 2, 1, 2,
+ 1, 1, 1, 1, 1, 1, 1, 1, 3, 2,
+ 1, 2, 2, 2, 2, 2, 1, 1, 1, 1,
+ 1, 1, 2, 2, 1, 2, 1, 1, 1, 2,
+ 2, 2, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 2, 2, 1, 2, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 2,
+ 2, 2, 2, 3, 1, 2, 2, 2, 2, 3,
+ 2, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 2, 0, 4, 1, 0, 0, 2, 2,
+ 2, 2, 1, 1, 3, 3, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 2, 2, 1, 1, 1,
+ 1, 1, 1, 1, 1, 2, 1, 2, 1, 1,
+ 1, 5, 2, 1, 2, 1, 1, 1, 1, 1,
+ 1, 5, 1, 3, 2, 3, 1, 1, 2, 1,
+ 5, 4, 3, 2, 1, 6, 3, 2, 3, 1,
+ 1, 1, 1, 1
+};
+
+
+#define yyerrok (yyerrstatus = 0)
+#define yyclearin (yychar = YYEMPTY)
+#define YYEMPTY (-2)
+#define YYEOF 0
+
+#define YYACCEPT goto yyacceptlab
+#define YYABORT goto yyabortlab
+#define YYERROR goto yyerrorlab
+
#define YYRECOVERING() (!!yyerrstatus)
@@ -1577,27 +1441,15 @@ do \
else \
{ \
yyerror (YY_("syntax error: cannot back up")); \
- YYERROR; \
- } \
-while (YYID (0))
+ YYERROR; \
+ } \
+while (0)
/* Error token number */
-#define YYTERROR 1
-#define YYERRCODE 256
-
-
-/* This macro is provided for backward compatibility. */
-#ifndef YY_LOCATION_PRINT
-# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-#endif
+#define YYTERROR 1
+#define YYERRCODE 256
-/* YYLEX -- calling `yylex' with the right arguments. */
-#ifdef YYLEX_PARAM
-# define YYLEX yylex (YYLEX_PARAM)
-#else
-# define YYLEX yylex ()
-#endif
/* Enable debugging if requested. */
#if YYDEBUG
@@ -1607,40 +1459,36 @@ while (YYID (0))
# define YYFPRINTF fprintf
# endif
-# define YYDPRINTF(Args) \
-do { \
- if (yydebug) \
- YYFPRINTF Args; \
-} while (YYID (0))
+# define YYDPRINTF(Args) \
+do { \
+ if (yydebug) \
+ YYFPRINTF Args; \
+} while (0)
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \
-do { \
- if (yydebug) \
- { \
- YYFPRINTF (stderr, "%s ", Title); \
- yy_symbol_print (stderr, \
- Type, Value); \
- YYFPRINTF (stderr, "\n"); \
- } \
-} while (YYID (0))
+/* This macro is provided for backward compatibility. */
+#ifndef YY_LOCATION_PRINT
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+#endif
-/*--------------------------------.
-| Print this symbol on YYOUTPUT. |
-`--------------------------------*/
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \
+do { \
+ if (yydebug) \
+ { \
+ YYFPRINTF (stderr, "%s ", Title); \
+ yy_symbol_print (stderr, \
+ Type, Value); \
+ YYFPRINTF (stderr, "\n"); \
+ } \
+} while (0)
+
+
+/*----------------------------------------.
+| Print this symbol's value on YYOUTPUT. |
+`----------------------------------------*/
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
static void
yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-#else
-static void
-yy_symbol_value_print (yyoutput, yytype, yyvaluep)
- FILE *yyoutput;
- int yytype;
- YYSTYPE const * const yyvaluep;
-#endif
{
FILE *yyo = yyoutput;
YYUSE (yyo);
@@ -1649,8 +1497,6 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep)
# ifdef YYPRINT
if (yytype < YYNTOKENS)
YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# else
- YYUSE (yyoutput);
# endif
YYUSE (yytype);
}
@@ -1660,22 +1506,11 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep)
| Print this symbol on YYOUTPUT. |
`--------------------------------*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
static void
yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-#else
-static void
-yy_symbol_print (yyoutput, yytype, yyvaluep)
- FILE *yyoutput;
- int yytype;
- YYSTYPE const * const yyvaluep;
-#endif
{
- if (yytype < YYNTOKENS)
- YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
- else
- YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+ YYFPRINTF (yyoutput, "%s %s (",
+ yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
yy_symbol_value_print (yyoutput, yytype, yyvaluep);
YYFPRINTF (yyoutput, ")");
@@ -1686,16 +1521,8 @@ yy_symbol_print (yyoutput, yytype, yyvaluep)
| TOP (included). |
`------------------------------------------------------------------*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
static void
yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
-#else
-static void
-yy_stack_print (yybottom, yytop)
- yytype_int16 *yybottom;
- yytype_int16 *yytop;
-#endif
{
YYFPRINTF (stderr, "Stack now");
for (; yybottom <= yytop; yybottom++)
@@ -1706,49 +1533,42 @@ yy_stack_print (yybottom, yytop)
YYFPRINTF (stderr, "\n");
}
-# define YY_STACK_PRINT(Bottom, Top) \
-do { \
- if (yydebug) \
- yy_stack_print ((Bottom), (Top)); \
-} while (YYID (0))
+# define YY_STACK_PRINT(Bottom, Top) \
+do { \
+ if (yydebug) \
+ yy_stack_print ((Bottom), (Top)); \
+} while (0)
/*------------------------------------------------.
| Report that the YYRULE is going to be reduced. |
`------------------------------------------------*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
static void
-yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
-#else
-static void
-yy_reduce_print (yyvsp, yyrule)
- YYSTYPE *yyvsp;
- int yyrule;
-#endif
+yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule)
{
+ unsigned long int yylno = yyrline[yyrule];
int yynrhs = yyr2[yyrule];
int yyi;
- unsigned long int yylno = yyrline[yyrule];
YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
- yyrule - 1, yylno);
+ yyrule - 1, yylno);
/* The symbols being reduced. */
for (yyi = 0; yyi < yynrhs; yyi++)
{
YYFPRINTF (stderr, " $%d = ", yyi + 1);
- yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
- &(yyvsp[(yyi + 1) - (yynrhs)])
- );
+ yy_symbol_print (stderr,
+ yystos[yyssp[yyi + 1 - yynrhs]],
+ &(yyvsp[(yyi + 1) - (yynrhs)])
+ );
YYFPRINTF (stderr, "\n");
}
}
-# define YY_REDUCE_PRINT(Rule) \
-do { \
- if (yydebug) \
- yy_reduce_print (yyvsp, Rule); \
-} while (YYID (0))
+# define YY_REDUCE_PRINT(Rule) \
+do { \
+ if (yydebug) \
+ yy_reduce_print (yyssp, yyvsp, Rule); \
+} while (0)
/* Nonzero means print parse trace. It is left uninitialized so that
multiple parsers can coexist. */
@@ -1762,7 +1582,7 @@ int yydebug;
/* YYINITDEPTH -- initial size of the parser's stacks. */
-#ifndef YYINITDEPTH
+#ifndef YYINITDEPTH
# define YYINITDEPTH 200
#endif
@@ -1785,15 +1605,8 @@ int yydebug;
# define yystrlen strlen
# else
/* Return the length of YYSTR. */
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
static YYSIZE_T
yystrlen (const char *yystr)
-#else
-static YYSIZE_T
-yystrlen (yystr)
- const char *yystr;
-#endif
{
YYSIZE_T yylen;
for (yylen = 0; yystr[yylen]; yylen++)
@@ -1809,16 +1622,8 @@ yystrlen (yystr)
# else
/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
YYDEST. */
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
static char *
yystpcpy (char *yydest, const char *yysrc)
-#else
-static char *
-yystpcpy (yydest, yysrc)
- char *yydest;
- const char *yysrc;
-#endif
{
char *yyd = yydest;
const char *yys = yysrc;
@@ -1848,27 +1653,27 @@ yytnamerr (char *yyres, const char *yystr)
char const *yyp = yystr;
for (;;)
- switch (*++yyp)
- {
- case '\'':
- case ',':
- goto do_not_strip_quotes;
-
- case '\\':
- if (*++yyp != '\\')
- goto do_not_strip_quotes;
- /* Fall through. */
- default:
- if (yyres)
- yyres[yyn] = *yyp;
- yyn++;
- break;
-
- case '"':
- if (yyres)
- yyres[yyn] = '\0';
- return yyn;
- }
+ switch (*++yyp)
+ {
+ case '\'':
+ case ',':
+ goto do_not_strip_quotes;
+
+ case '\\':
+ if (*++yyp != '\\')
+ goto do_not_strip_quotes;
+ /* Fall through. */
+ default:
+ if (yyres)
+ yyres[yyn] = *yyp;
+ yyn++;
+ break;
+
+ case '"':
+ if (yyres)
+ yyres[yyn] = '\0';
+ return yyn;
+ }
do_not_strip_quotes: ;
}
@@ -1891,11 +1696,11 @@ static int
yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
yytype_int16 *yyssp, int yytoken)
{
- YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]);
+ YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
YYSIZE_T yysize = yysize0;
enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
/* Internationalized format string. */
- const char *yyformat = YY_NULL;
+ const char *yyformat = YY_NULLPTR;
/* Arguments of yyformat. */
char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
/* Number of reported tokens (one for the "unexpected", one per
@@ -1903,10 +1708,6 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
int yycount = 0;
/* There are many possibilities here to consider:
- - Assume YYFAIL is not used. It's too flawed to consider. See
- <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
- for details. YYERROR is fine as it does not invoke this
- function.
- If this state is a consistent state with a default action, then
the only way this function was invoked is if the default action
is an error action. In that case, don't check for expected
@@ -1956,7 +1757,7 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
}
yyarg[yycount++] = yytname[yyx];
{
- YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]);
+ YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
if (! (yysize <= yysize1
&& yysize1 <= YYSTACK_ALLOC_MAXIMUM))
return 2;
@@ -2023,26 +1824,17 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
| Release the memory associated to this symbol. |
`-----------------------------------------------*/
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
static void
yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
-#else
-static void
-yydestruct (yymsg, yytype, yyvaluep)
- const char *yymsg;
- int yytype;
- YYSTYPE *yyvaluep;
-#endif
{
YYUSE (yyvaluep);
-
if (!yymsg)
yymsg = "Deleting";
YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+ YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
YYUSE (yytype);
+ YY_IGNORE_MAYBE_UNINITIALIZED_END
}
@@ -2051,18 +1843,8 @@ yydestruct (yymsg, yytype, yyvaluep)
/* The lookahead symbol. */
int yychar;
-
-#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-# define YY_IGNORE_MAYBE_UNINITIALIZED_END
-#endif
-#ifndef YY_INITIAL_VALUE
-# define YY_INITIAL_VALUE(Value) /* Nothing. */
-#endif
-
/* The semantic value of the lookahead symbol. */
-YYSTYPE yylval YY_INITIAL_VALUE(yyval_default);
-
+YYSTYPE yylval;
/* Number of syntax errors so far. */
int yynerrs;
@@ -2071,35 +1853,16 @@ int yynerrs;
| yyparse. |
`----------*/
-#ifdef YYPARSE_PARAM
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-int
-yyparse (void *YYPARSE_PARAM)
-#else
-int
-yyparse (YYPARSE_PARAM)
- void *YYPARSE_PARAM;
-#endif
-#else /* ! YYPARSE_PARAM */
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
int
yyparse (void)
-#else
-int
-yyparse ()
-
-#endif
-#endif
{
int yystate;
/* Number of tokens to shift before error messages enabled. */
int yyerrstatus;
/* The stacks and their tools:
- `yyss': related to states.
- `yyvs': related to semantic values.
+ 'yyss': related to states.
+ 'yyvs': related to semantic values.
Refer to the stacks through separate pointers, to allow yyoverflow
to reallocate them elsewhere. */
@@ -2167,23 +1930,23 @@ yyparse ()
#ifdef yyoverflow
{
- /* Give user a chance to reallocate the stack. Use copies of
- these so that the &'s don't force the real ones into
- memory. */
- YYSTYPE *yyvs1 = yyvs;
- yytype_int16 *yyss1 = yyss;
-
- /* Each stack pointer address is followed by the size of the
- data in use in that stack, in bytes. This used to be a
- conditional around just the two extra args, but that might
- be undefined if yyoverflow is a macro. */
- yyoverflow (YY_("memory exhausted"),
- &yyss1, yysize * sizeof (*yyssp),
- &yyvs1, yysize * sizeof (*yyvsp),
- &yystacksize);
-
- yyss = yyss1;
- yyvs = yyvs1;
+ /* Give user a chance to reallocate the stack. Use copies of
+ these so that the &'s don't force the real ones into
+ memory. */
+ YYSTYPE *yyvs1 = yyvs;
+ yytype_int16 *yyss1 = yyss;
+
+ /* Each stack pointer address is followed by the size of the
+ data in use in that stack, in bytes. This used to be a
+ conditional around just the two extra args, but that might
+ be undefined if yyoverflow is a macro. */
+ yyoverflow (YY_("memory exhausted"),
+ &yyss1, yysize * sizeof (*yyssp),
+ &yyvs1, yysize * sizeof (*yyvsp),
+ &yystacksize);
+
+ yyss = yyss1;
+ yyvs = yyvs1;
}
#else /* no yyoverflow */
# ifndef YYSTACK_RELOCATE
@@ -2191,22 +1954,22 @@ yyparse ()
# else
/* Extend the stack our own way. */
if (YYMAXDEPTH <= yystacksize)
- goto yyexhaustedlab;
+ goto yyexhaustedlab;
yystacksize *= 2;
if (YYMAXDEPTH < yystacksize)
- yystacksize = YYMAXDEPTH;
+ yystacksize = YYMAXDEPTH;
{
- yytype_int16 *yyss1 = yyss;
- union yyalloc *yyptr =
- (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
- if (! yyptr)
- goto yyexhaustedlab;
- YYSTACK_RELOCATE (yyss_alloc, yyss);
- YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+ yytype_int16 *yyss1 = yyss;
+ union yyalloc *yyptr =
+ (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+ if (! yyptr)
+ goto yyexhaustedlab;
+ YYSTACK_RELOCATE (yyss_alloc, yyss);
+ YYSTACK_RELOCATE (yyvs_alloc, yyvs);
# undef YYSTACK_RELOCATE
- if (yyss1 != yyssa)
- YYSTACK_FREE (yyss1);
+ if (yyss1 != yyssa)
+ YYSTACK_FREE (yyss1);
}
# endif
#endif /* no yyoverflow */
@@ -2215,10 +1978,10 @@ yyparse ()
yyvsp = yyvs + yysize - 1;
YYDPRINTF ((stderr, "Stack size increased to %lu\n",
- (unsigned long int) yystacksize));
+ (unsigned long int) yystacksize));
if (yyss + yystacksize - 1 <= yyssp)
- YYABORT;
+ YYABORT;
}
YYDPRINTF ((stderr, "Entering state %d\n", yystate));
@@ -2247,7 +2010,7 @@ yybackup:
if (yychar == YYEMPTY)
{
YYDPRINTF ((stderr, "Reading a token: "));
- yychar = YYLEX;
+ yychar = yylex ();
}
if (yychar <= YYEOF)
@@ -2312,7 +2075,7 @@ yyreduce:
yylen = yyr2[yyn];
/* If YYLEN is nonzero, implement the default value of the action:
- `$$ = $1'.
+ '$$ = $1'.
Otherwise, the following line sets YYVAL to garbage.
This behavior is undocumented and Bison
@@ -2326,8 +2089,7 @@ yyreduce:
switch (yyn)
{
case 5:
-/* Line 1787 of yacc.c */
-#line 373 "../../ntpd/ntp_parser.y"
+#line 373 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
/* I will need to incorporate much more fine grained
* error messages. The following should suffice for
@@ -2340,433 +2102,433 @@ yyreduce:
ip_ctx->errpos.nline,
ip_ctx->errpos.ncol);
}
+#line 2106 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 20:
-/* Line 1787 of yacc.c */
-#line 409 "../../ntpd/ntp_parser.y"
+#line 409 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
peer_node *my_node;
- my_node = create_peer_node((yyvsp[(1) - (3)].Integer), (yyvsp[(2) - (3)].Address_node), (yyvsp[(3) - (3)].Attr_val_fifo));
+ my_node = create_peer_node((yyvsp[-2].Integer), (yyvsp[-1].Address_node), (yyvsp[0].Attr_val_fifo));
APPEND_G_FIFO(cfgt.peers, my_node);
}
+#line 2117 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 27:
-/* Line 1787 of yacc.c */
-#line 428 "../../ntpd/ntp_parser.y"
- { (yyval.Address_node) = create_address_node((yyvsp[(2) - (2)].String), (yyvsp[(1) - (2)].Integer)); }
+#line 428 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { (yyval.Address_node) = create_address_node((yyvsp[0].String), (yyvsp[-1].Integer)); }
+#line 2123 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 28:
-/* Line 1787 of yacc.c */
-#line 433 "../../ntpd/ntp_parser.y"
- { (yyval.Address_node) = create_address_node((yyvsp[(1) - (1)].String), AF_UNSPEC); }
+#line 433 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { (yyval.Address_node) = create_address_node((yyvsp[0].String), AF_UNSPEC); }
+#line 2129 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 29:
-/* Line 1787 of yacc.c */
-#line 438 "../../ntpd/ntp_parser.y"
+#line 438 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{ (yyval.Integer) = AF_INET; }
+#line 2135 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 30:
-/* Line 1787 of yacc.c */
-#line 440 "../../ntpd/ntp_parser.y"
+#line 440 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{ (yyval.Integer) = AF_INET6; }
+#line 2141 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 31:
-/* Line 1787 of yacc.c */
-#line 445 "../../ntpd/ntp_parser.y"
+#line 445 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{ (yyval.Attr_val_fifo) = NULL; }
+#line 2147 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 32:
-/* Line 1787 of yacc.c */
-#line 447 "../../ntpd/ntp_parser.y"
+#line 447 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
- (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo);
- APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (2)].Attr_val));
+ (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo);
+ APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val));
}
+#line 2156 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 36:
-/* Line 1787 of yacc.c */
-#line 461 "../../ntpd/ntp_parser.y"
- { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); }
+#line 461 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[0].Integer)); }
+#line 2162 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 45:
-/* Line 1787 of yacc.c */
-#line 477 "../../ntpd/ntp_parser.y"
- { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); }
+#line 477 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { (yyval.Attr_val) = create_attr_ival((yyvsp[-1].Integer), (yyvsp[0].Integer)); }
+#line 2168 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 46:
-/* Line 1787 of yacc.c */
-#line 479 "../../ntpd/ntp_parser.y"
- { (yyval.Attr_val) = create_attr_uval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); }
+#line 479 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { (yyval.Attr_val) = create_attr_uval((yyvsp[-1].Integer), (yyvsp[0].Integer)); }
+#line 2174 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 53:
-/* Line 1787 of yacc.c */
-#line 493 "../../ntpd/ntp_parser.y"
- { (yyval.Attr_val) = create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String)); }
+#line 493 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { (yyval.Attr_val) = create_attr_sval((yyvsp[-1].Integer), (yyvsp[0].String)); }
+#line 2180 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 55:
-/* Line 1787 of yacc.c */
-#line 507 "../../ntpd/ntp_parser.y"
+#line 507 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
unpeer_node *my_node;
- my_node = create_unpeer_node((yyvsp[(2) - (2)].Address_node));
+ my_node = create_unpeer_node((yyvsp[0].Address_node));
if (my_node)
APPEND_G_FIFO(cfgt.unpeers, my_node);
}
+#line 2192 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 58:
-/* Line 1787 of yacc.c */
-#line 528 "../../ntpd/ntp_parser.y"
+#line 528 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{ cfgt.broadcastclient = 1; }
+#line 2198 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 59:
-/* Line 1787 of yacc.c */
-#line 530 "../../ntpd/ntp_parser.y"
- { CONCAT_G_FIFOS(cfgt.manycastserver, (yyvsp[(2) - (2)].Address_fifo)); }
+#line 530 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { CONCAT_G_FIFOS(cfgt.manycastserver, (yyvsp[0].Address_fifo)); }
+#line 2204 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 60:
-/* Line 1787 of yacc.c */
-#line 532 "../../ntpd/ntp_parser.y"
- { CONCAT_G_FIFOS(cfgt.multicastclient, (yyvsp[(2) - (2)].Address_fifo)); }
+#line 532 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { CONCAT_G_FIFOS(cfgt.multicastclient, (yyvsp[0].Address_fifo)); }
+#line 2210 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 61:
-/* Line 1787 of yacc.c */
-#line 534 "../../ntpd/ntp_parser.y"
- { cfgt.mdnstries = (yyvsp[(2) - (2)].Integer); }
+#line 534 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { cfgt.mdnstries = (yyvsp[0].Integer); }
+#line 2216 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 62:
-/* Line 1787 of yacc.c */
-#line 545 "../../ntpd/ntp_parser.y"
+#line 545 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
attr_val *atrv;
- atrv = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer));
+ atrv = create_attr_ival((yyvsp[-1].Integer), (yyvsp[0].Integer));
APPEND_G_FIFO(cfgt.vars, atrv);
}
+#line 2227 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 63:
-/* Line 1787 of yacc.c */
-#line 552 "../../ntpd/ntp_parser.y"
- { cfgt.auth.control_key = (yyvsp[(2) - (2)].Integer); }
+#line 552 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { cfgt.auth.control_key = (yyvsp[0].Integer); }
+#line 2233 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 64:
-/* Line 1787 of yacc.c */
-#line 554 "../../ntpd/ntp_parser.y"
+#line 554 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
cfgt.auth.cryptosw++;
- CONCAT_G_FIFOS(cfgt.auth.crypto_cmd_list, (yyvsp[(2) - (2)].Attr_val_fifo));
+ CONCAT_G_FIFOS(cfgt.auth.crypto_cmd_list, (yyvsp[0].Attr_val_fifo));
}
+#line 2242 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 65:
-/* Line 1787 of yacc.c */
-#line 559 "../../ntpd/ntp_parser.y"
- { cfgt.auth.keys = (yyvsp[(2) - (2)].String); }
+#line 559 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { cfgt.auth.keys = (yyvsp[0].String); }
+#line 2248 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 66:
-/* Line 1787 of yacc.c */
-#line 561 "../../ntpd/ntp_parser.y"
- { cfgt.auth.keysdir = (yyvsp[(2) - (2)].String); }
+#line 561 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { cfgt.auth.keysdir = (yyvsp[0].String); }
+#line 2254 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 67:
-/* Line 1787 of yacc.c */
-#line 563 "../../ntpd/ntp_parser.y"
- { cfgt.auth.request_key = (yyvsp[(2) - (2)].Integer); }
+#line 563 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { cfgt.auth.request_key = (yyvsp[0].Integer); }
+#line 2260 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 68:
-/* Line 1787 of yacc.c */
-#line 565 "../../ntpd/ntp_parser.y"
- { cfgt.auth.revoke = (yyvsp[(2) - (2)].Integer); }
+#line 565 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { cfgt.auth.revoke = (yyvsp[0].Integer); }
+#line 2266 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 69:
-/* Line 1787 of yacc.c */
-#line 567 "../../ntpd/ntp_parser.y"
+#line 567 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
- cfgt.auth.trusted_key_list = (yyvsp[(2) - (2)].Attr_val_fifo);
+ cfgt.auth.trusted_key_list = (yyvsp[0].Attr_val_fifo);
// if (!cfgt.auth.trusted_key_list)
// cfgt.auth.trusted_key_list = $2;
// else
// LINK_SLIST(cfgt.auth.trusted_key_list, $2, link);
}
+#line 2279 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 70:
-/* Line 1787 of yacc.c */
-#line 576 "../../ntpd/ntp_parser.y"
- { cfgt.auth.ntp_signd_socket = (yyvsp[(2) - (2)].String); }
+#line 576 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { cfgt.auth.ntp_signd_socket = (yyvsp[0].String); }
+#line 2285 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 71:
-/* Line 1787 of yacc.c */
-#line 581 "../../ntpd/ntp_parser.y"
+#line 581 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{ (yyval.Attr_val_fifo) = NULL; }
+#line 2291 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 72:
-/* Line 1787 of yacc.c */
-#line 583 "../../ntpd/ntp_parser.y"
+#line 583 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
- (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo);
- APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (2)].Attr_val));
+ (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo);
+ APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val));
}
+#line 2300 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 73:
-/* Line 1787 of yacc.c */
-#line 591 "../../ntpd/ntp_parser.y"
- { (yyval.Attr_val) = create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String)); }
+#line 591 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { (yyval.Attr_val) = create_attr_sval((yyvsp[-1].Integer), (yyvsp[0].String)); }
+#line 2306 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 74:
-/* Line 1787 of yacc.c */
-#line 593 "../../ntpd/ntp_parser.y"
+#line 593 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
(yyval.Attr_val) = NULL;
- cfgt.auth.revoke = (yyvsp[(2) - (2)].Integer);
+ cfgt.auth.revoke = (yyvsp[0].Integer);
msyslog(LOG_WARNING,
"'crypto revoke %d' is deprecated, "
"please use 'revoke %d' instead.",
cfgt.auth.revoke, cfgt.auth.revoke);
}
+#line 2319 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 80:
-/* Line 1787 of yacc.c */
-#line 618 "../../ntpd/ntp_parser.y"
- { CONCAT_G_FIFOS(cfgt.orphan_cmds, (yyvsp[(2) - (2)].Attr_val_fifo)); }
+#line 618 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { CONCAT_G_FIFOS(cfgt.orphan_cmds, (yyvsp[0].Attr_val_fifo)); }
+#line 2325 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 81:
-/* Line 1787 of yacc.c */
-#line 623 "../../ntpd/ntp_parser.y"
+#line 623 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
- (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo);
- APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (2)].Attr_val));
+ (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo);
+ APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val));
}
+#line 2334 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 82:
-/* Line 1787 of yacc.c */
-#line 628 "../../ntpd/ntp_parser.y"
+#line 628 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
(yyval.Attr_val_fifo) = NULL;
- APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(1) - (1)].Attr_val));
+ APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val));
}
+#line 2343 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 83:
-/* Line 1787 of yacc.c */
-#line 636 "../../ntpd/ntp_parser.y"
- { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (double)(yyvsp[(2) - (2)].Integer)); }
+#line 636 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { (yyval.Attr_val) = create_attr_dval((yyvsp[-1].Integer), (double)(yyvsp[0].Integer)); }
+#line 2349 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 84:
-/* Line 1787 of yacc.c */
-#line 638 "../../ntpd/ntp_parser.y"
- { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); }
+#line 638 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { (yyval.Attr_val) = create_attr_dval((yyvsp[-1].Integer), (yyvsp[0].Double)); }
+#line 2355 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 85:
-/* Line 1787 of yacc.c */
-#line 640 "../../ntpd/ntp_parser.y"
- { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (double)(yyvsp[(2) - (2)].Integer)); }
+#line 640 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { (yyval.Attr_val) = create_attr_dval((yyvsp[-1].Integer), (double)(yyvsp[0].Integer)); }
+#line 2361 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 96:
-/* Line 1787 of yacc.c */
-#line 666 "../../ntpd/ntp_parser.y"
- { CONCAT_G_FIFOS(cfgt.stats_list, (yyvsp[(2) - (2)].Int_fifo)); }
+#line 666 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { CONCAT_G_FIFOS(cfgt.stats_list, (yyvsp[0].Int_fifo)); }
+#line 2367 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 97:
-/* Line 1787 of yacc.c */
-#line 668 "../../ntpd/ntp_parser.y"
+#line 668 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
if (lex_from_file()) {
- cfgt.stats_dir = (yyvsp[(2) - (2)].String);
+ cfgt.stats_dir = (yyvsp[0].String);
} else {
- YYFREE((yyvsp[(2) - (2)].String));
+ YYFREE((yyvsp[0].String));
yyerror("statsdir remote configuration ignored");
}
}
+#line 2380 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 98:
-/* Line 1787 of yacc.c */
-#line 677 "../../ntpd/ntp_parser.y"
+#line 677 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
filegen_node *fgn;
- fgn = create_filegen_node((yyvsp[(2) - (3)].Integer), (yyvsp[(3) - (3)].Attr_val_fifo));
+ fgn = create_filegen_node((yyvsp[-1].Integer), (yyvsp[0].Attr_val_fifo));
APPEND_G_FIFO(cfgt.filegen_opts, fgn);
}
+#line 2391 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 99:
-/* Line 1787 of yacc.c */
-#line 687 "../../ntpd/ntp_parser.y"
+#line 687 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
- (yyval.Int_fifo) = (yyvsp[(1) - (2)].Int_fifo);
- APPEND_G_FIFO((yyval.Int_fifo), create_int_node((yyvsp[(2) - (2)].Integer)));
+ (yyval.Int_fifo) = (yyvsp[-1].Int_fifo);
+ APPEND_G_FIFO((yyval.Int_fifo), create_int_node((yyvsp[0].Integer)));
}
+#line 2400 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 100:
-/* Line 1787 of yacc.c */
-#line 692 "../../ntpd/ntp_parser.y"
+#line 692 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
(yyval.Int_fifo) = NULL;
- APPEND_G_FIFO((yyval.Int_fifo), create_int_node((yyvsp[(1) - (1)].Integer)));
+ APPEND_G_FIFO((yyval.Int_fifo), create_int_node((yyvsp[0].Integer)));
}
+#line 2409 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 109:
-/* Line 1787 of yacc.c */
-#line 711 "../../ntpd/ntp_parser.y"
+#line 711 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{ (yyval.Attr_val_fifo) = NULL; }
+#line 2415 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 110:
-/* Line 1787 of yacc.c */
-#line 713 "../../ntpd/ntp_parser.y"
+#line 713 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
- (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo);
- APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (2)].Attr_val));
+ (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo);
+ APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val));
}
+#line 2424 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 111:
-/* Line 1787 of yacc.c */
-#line 721 "../../ntpd/ntp_parser.y"
+#line 721 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
if (lex_from_file()) {
- (yyval.Attr_val) = create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String));
+ (yyval.Attr_val) = create_attr_sval((yyvsp[-1].Integer), (yyvsp[0].String));
} else {
(yyval.Attr_val) = NULL;
- YYFREE((yyvsp[(2) - (2)].String));
+ YYFREE((yyvsp[0].String));
yyerror("filegen file remote config ignored");
}
}
+#line 2438 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 112:
-/* Line 1787 of yacc.c */
-#line 731 "../../ntpd/ntp_parser.y"
+#line 731 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
if (lex_from_file()) {
- (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer));
+ (yyval.Attr_val) = create_attr_ival((yyvsp[-1].Integer), (yyvsp[0].Integer));
} else {
(yyval.Attr_val) = NULL;
yyerror("filegen type remote config ignored");
}
}
+#line 2451 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 113:
-/* Line 1787 of yacc.c */
-#line 740 "../../ntpd/ntp_parser.y"
+#line 740 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
const char *err;
if (lex_from_file()) {
- (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer));
+ (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[0].Integer));
} else {
(yyval.Attr_val) = NULL;
- if (T_Link == (yyvsp[(1) - (1)].Integer))
+ if (T_Link == (yyvsp[0].Integer))
err = "filegen link remote config ignored";
else
err = "filegen nolink remote config ignored";
yyerror(err);
}
}
+#line 2470 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 114:
-/* Line 1787 of yacc.c */
-#line 755 "../../ntpd/ntp_parser.y"
- { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); }
+#line 755 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[0].Integer)); }
+#line 2476 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 126:
-/* Line 1787 of yacc.c */
-#line 785 "../../ntpd/ntp_parser.y"
+#line 785 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
- CONCAT_G_FIFOS(cfgt.discard_opts, (yyvsp[(2) - (2)].Attr_val_fifo));
+ CONCAT_G_FIFOS(cfgt.discard_opts, (yyvsp[0].Attr_val_fifo));
}
+#line 2484 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 127:
-/* Line 1787 of yacc.c */
-#line 789 "../../ntpd/ntp_parser.y"
+#line 789 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
- CONCAT_G_FIFOS(cfgt.mru_opts, (yyvsp[(2) - (2)].Attr_val_fifo));
+ CONCAT_G_FIFOS(cfgt.mru_opts, (yyvsp[0].Attr_val_fifo));
}
+#line 2492 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 128:
-/* Line 1787 of yacc.c */
-#line 793 "../../ntpd/ntp_parser.y"
+#line 793 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
restrict_node *rn;
- rn = create_restrict_node((yyvsp[(2) - (3)].Address_node), NULL, (yyvsp[(3) - (3)].Int_fifo),
+ rn = create_restrict_node((yyvsp[-1].Address_node), NULL, (yyvsp[0].Int_fifo),
lex_current()->curpos.nline);
APPEND_G_FIFO(cfgt.restrict_opts, rn);
}
+#line 2504 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 129:
-/* Line 1787 of yacc.c */
-#line 801 "../../ntpd/ntp_parser.y"
+#line 801 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
restrict_node *rn;
- rn = create_restrict_node((yyvsp[(2) - (5)].Address_node), (yyvsp[(4) - (5)].Address_node), (yyvsp[(5) - (5)].Int_fifo),
+ rn = create_restrict_node((yyvsp[-3].Address_node), (yyvsp[-1].Address_node), (yyvsp[0].Int_fifo),
lex_current()->curpos.nline);
APPEND_G_FIFO(cfgt.restrict_opts, rn);
}
+#line 2516 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 130:
-/* Line 1787 of yacc.c */
-#line 809 "../../ntpd/ntp_parser.y"
+#line 809 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
restrict_node *rn;
- rn = create_restrict_node(NULL, NULL, (yyvsp[(3) - (3)].Int_fifo),
+ rn = create_restrict_node(NULL, NULL, (yyvsp[0].Int_fifo),
lex_current()->curpos.nline);
APPEND_G_FIFO(cfgt.restrict_opts, rn);
}
+#line 2528 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 131:
-/* Line 1787 of yacc.c */
-#line 817 "../../ntpd/ntp_parser.y"
+#line 817 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
restrict_node *rn;
@@ -2777,15 +2539,15 @@ yyreduce:
create_address_node(
estrdup("0.0.0.0"),
AF_INET),
- (yyvsp[(4) - (4)].Int_fifo),
+ (yyvsp[0].Int_fifo),
lex_current()->curpos.nline);
APPEND_G_FIFO(cfgt.restrict_opts, rn);
}
+#line 2547 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 132:
-/* Line 1787 of yacc.c */
-#line 832 "../../ntpd/ntp_parser.y"
+#line 832 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
restrict_node *rn;
@@ -2796,320 +2558,320 @@ yyreduce:
create_address_node(
estrdup("::"),
AF_INET6),
- (yyvsp[(4) - (4)].Int_fifo),
+ (yyvsp[0].Int_fifo),
lex_current()->curpos.nline);
APPEND_G_FIFO(cfgt.restrict_opts, rn);
}
+#line 2566 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 133:
-/* Line 1787 of yacc.c */
-#line 847 "../../ntpd/ntp_parser.y"
+#line 847 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
restrict_node * rn;
- APPEND_G_FIFO((yyvsp[(3) - (3)].Int_fifo), create_int_node((yyvsp[(2) - (3)].Integer)));
+ APPEND_G_FIFO((yyvsp[0].Int_fifo), create_int_node((yyvsp[-1].Integer)));
rn = create_restrict_node(
- NULL, NULL, (yyvsp[(3) - (3)].Int_fifo), lex_current()->curpos.nline);
+ NULL, NULL, (yyvsp[0].Int_fifo), lex_current()->curpos.nline);
APPEND_G_FIFO(cfgt.restrict_opts, rn);
}
+#line 2579 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 134:
-/* Line 1787 of yacc.c */
-#line 859 "../../ntpd/ntp_parser.y"
+#line 859 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{ (yyval.Int_fifo) = NULL; }
+#line 2585 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 135:
-/* Line 1787 of yacc.c */
-#line 861 "../../ntpd/ntp_parser.y"
+#line 861 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
- (yyval.Int_fifo) = (yyvsp[(1) - (2)].Int_fifo);
- APPEND_G_FIFO((yyval.Int_fifo), create_int_node((yyvsp[(2) - (2)].Integer)));
+ (yyval.Int_fifo) = (yyvsp[-1].Int_fifo);
+ APPEND_G_FIFO((yyval.Int_fifo), create_int_node((yyvsp[0].Integer)));
}
+#line 2594 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 151:
-/* Line 1787 of yacc.c */
-#line 887 "../../ntpd/ntp_parser.y"
+#line 887 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
- (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo);
- APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (2)].Attr_val));
+ (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo);
+ APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val));
}
+#line 2603 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 152:
-/* Line 1787 of yacc.c */
-#line 892 "../../ntpd/ntp_parser.y"
+#line 892 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
(yyval.Attr_val_fifo) = NULL;
- APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(1) - (1)].Attr_val));
+ APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val));
}
+#line 2612 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 153:
-/* Line 1787 of yacc.c */
-#line 900 "../../ntpd/ntp_parser.y"
- { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); }
+#line 900 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { (yyval.Attr_val) = create_attr_ival((yyvsp[-1].Integer), (yyvsp[0].Integer)); }
+#line 2618 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 157:
-/* Line 1787 of yacc.c */
-#line 911 "../../ntpd/ntp_parser.y"
+#line 911 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
- (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo);
- APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (2)].Attr_val));
+ (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo);
+ APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val));
}
+#line 2627 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 158:
-/* Line 1787 of yacc.c */
-#line 916 "../../ntpd/ntp_parser.y"
+#line 916 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
(yyval.Attr_val_fifo) = NULL;
- APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(1) - (1)].Attr_val));
+ APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val));
}
+#line 2636 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 159:
-/* Line 1787 of yacc.c */
-#line 924 "../../ntpd/ntp_parser.y"
- { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); }
+#line 924 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { (yyval.Attr_val) = create_attr_ival((yyvsp[-1].Integer), (yyvsp[0].Integer)); }
+#line 2642 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 168:
-/* Line 1787 of yacc.c */
-#line 944 "../../ntpd/ntp_parser.y"
+#line 944 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
addr_opts_node *aon;
- aon = create_addr_opts_node((yyvsp[(2) - (3)].Address_node), (yyvsp[(3) - (3)].Attr_val_fifo));
+ aon = create_addr_opts_node((yyvsp[-1].Address_node), (yyvsp[0].Attr_val_fifo));
APPEND_G_FIFO(cfgt.fudge, aon);
}
+#line 2653 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 169:
-/* Line 1787 of yacc.c */
-#line 954 "../../ntpd/ntp_parser.y"
+#line 954 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
- (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo);
- APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (2)].Attr_val));
+ (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo);
+ APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val));
}
+#line 2662 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 170:
-/* Line 1787 of yacc.c */
-#line 959 "../../ntpd/ntp_parser.y"
+#line 959 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
(yyval.Attr_val_fifo) = NULL;
- APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(1) - (1)].Attr_val));
+ APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val));
}
+#line 2671 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 171:
-/* Line 1787 of yacc.c */
-#line 967 "../../ntpd/ntp_parser.y"
- { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); }
+#line 967 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { (yyval.Attr_val) = create_attr_dval((yyvsp[-1].Integer), (yyvsp[0].Double)); }
+#line 2677 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 172:
-/* Line 1787 of yacc.c */
-#line 969 "../../ntpd/ntp_parser.y"
- { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); }
+#line 969 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { (yyval.Attr_val) = create_attr_ival((yyvsp[-1].Integer), (yyvsp[0].Integer)); }
+#line 2683 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 173:
-/* Line 1787 of yacc.c */
-#line 971 "../../ntpd/ntp_parser.y"
- { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); }
+#line 971 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { (yyval.Attr_val) = create_attr_ival((yyvsp[-1].Integer), (yyvsp[0].Integer)); }
+#line 2689 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 174:
-/* Line 1787 of yacc.c */
-#line 973 "../../ntpd/ntp_parser.y"
- { (yyval.Attr_val) = create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String)); }
+#line 973 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { (yyval.Attr_val) = create_attr_sval((yyvsp[-1].Integer), (yyvsp[0].String)); }
+#line 2695 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 175:
-/* Line 1787 of yacc.c */
-#line 975 "../../ntpd/ntp_parser.y"
- { (yyval.Attr_val) = create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String)); }
+#line 975 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { (yyval.Attr_val) = create_attr_sval((yyvsp[-1].Integer), (yyvsp[0].String)); }
+#line 2701 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 182:
-/* Line 1787 of yacc.c */
-#line 996 "../../ntpd/ntp_parser.y"
- { CONCAT_G_FIFOS(cfgt.rlimit, (yyvsp[(2) - (2)].Attr_val_fifo)); }
+#line 996 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { CONCAT_G_FIFOS(cfgt.rlimit, (yyvsp[0].Attr_val_fifo)); }
+#line 2707 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 183:
-/* Line 1787 of yacc.c */
-#line 1001 "../../ntpd/ntp_parser.y"
+#line 1001 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
- (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo);
- APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (2)].Attr_val));
+ (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo);
+ APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val));
}
+#line 2716 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 184:
-/* Line 1787 of yacc.c */
-#line 1006 "../../ntpd/ntp_parser.y"
+#line 1006 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
(yyval.Attr_val_fifo) = NULL;
- APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(1) - (1)].Attr_val));
+ APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val));
}
+#line 2725 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 185:
-/* Line 1787 of yacc.c */
-#line 1014 "../../ntpd/ntp_parser.y"
- { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); }
+#line 1014 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { (yyval.Attr_val) = create_attr_ival((yyvsp[-1].Integer), (yyvsp[0].Integer)); }
+#line 2731 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 189:
-/* Line 1787 of yacc.c */
-#line 1030 "../../ntpd/ntp_parser.y"
- { CONCAT_G_FIFOS(cfgt.enable_opts, (yyvsp[(2) - (2)].Attr_val_fifo)); }
+#line 1030 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { CONCAT_G_FIFOS(cfgt.enable_opts, (yyvsp[0].Attr_val_fifo)); }
+#line 2737 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 190:
-/* Line 1787 of yacc.c */
-#line 1032 "../../ntpd/ntp_parser.y"
- { CONCAT_G_FIFOS(cfgt.disable_opts, (yyvsp[(2) - (2)].Attr_val_fifo)); }
+#line 1032 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { CONCAT_G_FIFOS(cfgt.disable_opts, (yyvsp[0].Attr_val_fifo)); }
+#line 2743 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 191:
-/* Line 1787 of yacc.c */
-#line 1037 "../../ntpd/ntp_parser.y"
+#line 1037 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
- (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo);
- APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (2)].Attr_val));
+ (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo);
+ APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val));
}
+#line 2752 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 192:
-/* Line 1787 of yacc.c */
-#line 1042 "../../ntpd/ntp_parser.y"
+#line 1042 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
(yyval.Attr_val_fifo) = NULL;
- APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(1) - (1)].Attr_val));
+ APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val));
}
+#line 2761 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 193:
-/* Line 1787 of yacc.c */
-#line 1050 "../../ntpd/ntp_parser.y"
- { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); }
+#line 1050 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[0].Integer)); }
+#line 2767 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 194:
-/* Line 1787 of yacc.c */
-#line 1052 "../../ntpd/ntp_parser.y"
+#line 1052 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
if (lex_from_file()) {
- (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer));
+ (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[0].Integer));
} else {
char err_str[128];
(yyval.Attr_val) = NULL;
snprintf(err_str, sizeof(err_str),
"enable/disable %s remote configuration ignored",
- keyword((yyvsp[(1) - (1)].Integer)));
+ keyword((yyvsp[0].Integer)));
yyerror(err_str);
}
}
+#line 2785 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 203:
-/* Line 1787 of yacc.c */
-#line 1087 "../../ntpd/ntp_parser.y"
- { CONCAT_G_FIFOS(cfgt.tinker, (yyvsp[(2) - (2)].Attr_val_fifo)); }
+#line 1087 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { CONCAT_G_FIFOS(cfgt.tinker, (yyvsp[0].Attr_val_fifo)); }
+#line 2791 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 204:
-/* Line 1787 of yacc.c */
-#line 1092 "../../ntpd/ntp_parser.y"
+#line 1092 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
- (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo);
- APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (2)].Attr_val));
+ (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo);
+ APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val));
}
+#line 2800 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 205:
-/* Line 1787 of yacc.c */
-#line 1097 "../../ntpd/ntp_parser.y"
+#line 1097 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
(yyval.Attr_val_fifo) = NULL;
- APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(1) - (1)].Attr_val));
+ APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val));
}
+#line 2809 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 206:
-/* Line 1787 of yacc.c */
-#line 1105 "../../ntpd/ntp_parser.y"
- { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); }
+#line 1105 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { (yyval.Attr_val) = create_attr_dval((yyvsp[-1].Integer), (yyvsp[0].Double)); }
+#line 2815 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 219:
-/* Line 1787 of yacc.c */
-#line 1130 "../../ntpd/ntp_parser.y"
+#line 1130 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
attr_val *av;
- av = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double));
+ av = create_attr_dval((yyvsp[-1].Integer), (yyvsp[0].Double));
APPEND_G_FIFO(cfgt.vars, av);
}
+#line 2826 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 220:
-/* Line 1787 of yacc.c */
-#line 1137 "../../ntpd/ntp_parser.y"
+#line 1137 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
attr_val *av;
- av = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer));
+ av = create_attr_ival((yyvsp[-1].Integer), (yyvsp[0].Integer));
APPEND_G_FIFO(cfgt.vars, av);
}
+#line 2837 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 221:
-/* Line 1787 of yacc.c */
-#line 1144 "../../ntpd/ntp_parser.y"
+#line 1144 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
attr_val *av;
- av = create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String));
+ av = create_attr_sval((yyvsp[-1].Integer), (yyvsp[0].String));
APPEND_G_FIFO(cfgt.vars, av);
}
+#line 2848 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 222:
-/* Line 1787 of yacc.c */
-#line 1151 "../../ntpd/ntp_parser.y"
+#line 1151 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
char error_text[64];
attr_val *av;
if (lex_from_file()) {
- av = create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String));
+ av = create_attr_sval((yyvsp[-1].Integer), (yyvsp[0].String));
APPEND_G_FIFO(cfgt.vars, av);
} else {
- YYFREE((yyvsp[(2) - (2)].String));
+ YYFREE((yyvsp[0].String));
snprintf(error_text, sizeof(error_text),
"%s remote config ignored",
- keyword((yyvsp[(1) - (2)].Integer)));
+ keyword((yyvsp[-1].Integer)));
yyerror(error_text);
}
}
+#line 2868 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 223:
-/* Line 1787 of yacc.c */
-#line 1167 "../../ntpd/ntp_parser.y"
+#line 1167 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
if (!lex_from_file()) {
- YYFREE((yyvsp[(2) - (3)].String)); /* avoid leak */
+ YYFREE((yyvsp[-1].String)); /* avoid leak */
yyerror("remote includefile ignored");
break;
}
@@ -3117,486 +2879,497 @@ yyreduce:
fprintf(stderr, "getconfig: Maximum include file level exceeded.\n");
msyslog(LOG_ERR, "getconfig: Maximum include file level exceeded.");
} else {
- const char * path = FindConfig((yyvsp[(2) - (3)].String)); /* might return $2! */
+ const char * path = FindConfig((yyvsp[-1].String)); /* might return $2! */
if (!lex_push_file(path, "r")) {
fprintf(stderr, "getconfig: Couldn't open <%s>\n", path);
msyslog(LOG_ERR, "getconfig: Couldn't open <%s>", path);
}
}
- YYFREE((yyvsp[(2) - (3)].String)); /* avoid leak */
+ YYFREE((yyvsp[-1].String)); /* avoid leak */
}
+#line 2891 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 224:
-/* Line 1787 of yacc.c */
-#line 1186 "../../ntpd/ntp_parser.y"
+#line 1186 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{ lex_flush_stack(); }
+#line 2897 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 225:
-/* Line 1787 of yacc.c */
-#line 1188 "../../ntpd/ntp_parser.y"
+#line 1188 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{ /* see drift_parm below for actions */ }
+#line 2903 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 226:
-/* Line 1787 of yacc.c */
-#line 1190 "../../ntpd/ntp_parser.y"
- { CONCAT_G_FIFOS(cfgt.logconfig, (yyvsp[(2) - (2)].Attr_val_fifo)); }
+#line 1190 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { CONCAT_G_FIFOS(cfgt.logconfig, (yyvsp[0].Attr_val_fifo)); }
+#line 2909 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 227:
-/* Line 1787 of yacc.c */
-#line 1192 "../../ntpd/ntp_parser.y"
- { CONCAT_G_FIFOS(cfgt.phone, (yyvsp[(2) - (2)].String_fifo)); }
+#line 1192 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { CONCAT_G_FIFOS(cfgt.phone, (yyvsp[0].String_fifo)); }
+#line 2915 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 228:
-/* Line 1787 of yacc.c */
-#line 1194 "../../ntpd/ntp_parser.y"
- { APPEND_G_FIFO(cfgt.setvar, (yyvsp[(2) - (2)].Set_var)); }
+#line 1194 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { APPEND_G_FIFO(cfgt.setvar, (yyvsp[0].Set_var)); }
+#line 2921 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 229:
-/* Line 1787 of yacc.c */
-#line 1196 "../../ntpd/ntp_parser.y"
+#line 1196 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
addr_opts_node *aon;
- aon = create_addr_opts_node((yyvsp[(2) - (3)].Address_node), (yyvsp[(3) - (3)].Attr_val_fifo));
+ aon = create_addr_opts_node((yyvsp[-1].Address_node), (yyvsp[0].Attr_val_fifo));
APPEND_G_FIFO(cfgt.trap, aon);
}
+#line 2932 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 230:
-/* Line 1787 of yacc.c */
-#line 1203 "../../ntpd/ntp_parser.y"
- { CONCAT_G_FIFOS(cfgt.ttl, (yyvsp[(2) - (2)].Attr_val_fifo)); }
+#line 1203 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { CONCAT_G_FIFOS(cfgt.ttl, (yyvsp[0].Attr_val_fifo)); }
+#line 2938 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 235:
-/* Line 1787 of yacc.c */
-#line 1218 "../../ntpd/ntp_parser.y"
+#line 1218 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
#ifndef LEAP_SMEAR
yyerror("Built without LEAP_SMEAR support.");
#endif
}
+#line 2948 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 241:
-/* Line 1787 of yacc.c */
-#line 1238 "../../ntpd/ntp_parser.y"
+#line 1238 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
- attr_val *av;
-
- av = create_attr_sval(T_Driftfile, (yyvsp[(1) - (1)].String));
- APPEND_G_FIFO(cfgt.vars, av);
+ if (lex_from_file()) {
+ attr_val *av;
+ av = create_attr_sval(T_Driftfile, (yyvsp[0].String));
+ APPEND_G_FIFO(cfgt.vars, av);
+ } else {
+ YYFREE((yyvsp[0].String));
+ yyerror("driftfile remote configuration ignored");
+ }
}
+#line 2963 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 242:
-/* Line 1787 of yacc.c */
-#line 1245 "../../ntpd/ntp_parser.y"
+#line 1249 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
- attr_val *av;
-
- av = create_attr_sval(T_Driftfile, (yyvsp[(1) - (2)].String));
- APPEND_G_FIFO(cfgt.vars, av);
- av = create_attr_dval(T_WanderThreshold, (yyvsp[(2) - (2)].Double));
- APPEND_G_FIFO(cfgt.vars, av);
+ if (lex_from_file()) {
+ attr_val *av;
+ av = create_attr_sval(T_Driftfile, (yyvsp[-1].String));
+ APPEND_G_FIFO(cfgt.vars, av);
+ av = create_attr_dval(T_WanderThreshold, (yyvsp[0].Double));
+ APPEND_G_FIFO(cfgt.vars, av);
+ } else {
+ YYFREE((yyvsp[-1].String));
+ yyerror("driftfile remote configuration ignored");
+ }
}
+#line 2980 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 243:
-/* Line 1787 of yacc.c */
-#line 1254 "../../ntpd/ntp_parser.y"
+#line 1262 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
- attr_val *av;
-
- av = create_attr_sval(T_Driftfile, "");
- APPEND_G_FIFO(cfgt.vars, av);
+ if (lex_from_file()) {
+ attr_val *av;
+ av = create_attr_sval(T_Driftfile, estrdup(""));
+ APPEND_G_FIFO(cfgt.vars, av);
+ } else {
+ yyerror("driftfile remote configuration ignored");
+ }
}
+#line 2994 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 244:
-/* Line 1787 of yacc.c */
-#line 1264 "../../ntpd/ntp_parser.y"
- { (yyval.Set_var) = create_setvar_node((yyvsp[(1) - (4)].String), (yyvsp[(3) - (4)].String), (yyvsp[(4) - (4)].Integer)); }
+#line 1275 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { (yyval.Set_var) = create_setvar_node((yyvsp[-3].String), (yyvsp[-1].String), (yyvsp[0].Integer)); }
+#line 3000 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 246:
-/* Line 1787 of yacc.c */
-#line 1270 "../../ntpd/ntp_parser.y"
+#line 1281 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{ (yyval.Integer) = 0; }
+#line 3006 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 247:
-/* Line 1787 of yacc.c */
-#line 1275 "../../ntpd/ntp_parser.y"
+#line 1286 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{ (yyval.Attr_val_fifo) = NULL; }
+#line 3012 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 248:
-/* Line 1787 of yacc.c */
-#line 1277 "../../ntpd/ntp_parser.y"
+#line 1288 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
- (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo);
- APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (2)].Attr_val));
+ (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo);
+ APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val));
}
+#line 3021 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 249:
-/* Line 1787 of yacc.c */
-#line 1285 "../../ntpd/ntp_parser.y"
- { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); }
+#line 1296 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { (yyval.Attr_val) = create_attr_ival((yyvsp[-1].Integer), (yyvsp[0].Integer)); }
+#line 3027 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 250:
-/* Line 1787 of yacc.c */
-#line 1287 "../../ntpd/ntp_parser.y"
+#line 1298 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
- (yyval.Attr_val) = create_attr_sval((yyvsp[(1) - (2)].Integer), estrdup((yyvsp[(2) - (2)].Address_node)->address));
- destroy_address_node((yyvsp[(2) - (2)].Address_node));
+ (yyval.Attr_val) = create_attr_sval((yyvsp[-1].Integer), estrdup((yyvsp[0].Address_node)->address));
+ destroy_address_node((yyvsp[0].Address_node));
}
+#line 3036 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 251:
-/* Line 1787 of yacc.c */
-#line 1295 "../../ntpd/ntp_parser.y"
+#line 1306 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
- (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo);
- APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (2)].Attr_val));
+ (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo);
+ APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val));
}
+#line 3045 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 252:
-/* Line 1787 of yacc.c */
-#line 1300 "../../ntpd/ntp_parser.y"
+#line 1311 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
(yyval.Attr_val_fifo) = NULL;
- APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(1) - (1)].Attr_val));
+ APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val));
}
+#line 3054 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 253:
-/* Line 1787 of yacc.c */
-#line 1308 "../../ntpd/ntp_parser.y"
+#line 1319 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
char prefix;
char * type;
- switch ((yyvsp[(1) - (1)].String)[0]) {
+ switch ((yyvsp[0].String)[0]) {
case '+':
case '-':
case '=':
- prefix = (yyvsp[(1) - (1)].String)[0];
- type = (yyvsp[(1) - (1)].String) + 1;
+ prefix = (yyvsp[0].String)[0];
+ type = (yyvsp[0].String) + 1;
break;
default:
prefix = '=';
- type = (yyvsp[(1) - (1)].String);
+ type = (yyvsp[0].String);
}
(yyval.Attr_val) = create_attr_sval(prefix, estrdup(type));
- YYFREE((yyvsp[(1) - (1)].String));
+ YYFREE((yyvsp[0].String));
}
+#line 3080 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 254:
-/* Line 1787 of yacc.c */
-#line 1333 "../../ntpd/ntp_parser.y"
+#line 1344 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
nic_rule_node *nrn;
- nrn = create_nic_rule_node((yyvsp[(3) - (3)].Integer), NULL, (yyvsp[(2) - (3)].Integer));
+ nrn = create_nic_rule_node((yyvsp[0].Integer), NULL, (yyvsp[-1].Integer));
APPEND_G_FIFO(cfgt.nic_rules, nrn);
}
+#line 3091 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 255:
-/* Line 1787 of yacc.c */
-#line 1340 "../../ntpd/ntp_parser.y"
+#line 1351 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
nic_rule_node *nrn;
- nrn = create_nic_rule_node(0, (yyvsp[(3) - (3)].String), (yyvsp[(2) - (3)].Integer));
+ nrn = create_nic_rule_node(0, (yyvsp[0].String), (yyvsp[-1].Integer));
APPEND_G_FIFO(cfgt.nic_rules, nrn);
}
+#line 3102 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 265:
-/* Line 1787 of yacc.c */
-#line 1368 "../../ntpd/ntp_parser.y"
- { CONCAT_G_FIFOS(cfgt.reset_counters, (yyvsp[(2) - (2)].Int_fifo)); }
+#line 1379 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { CONCAT_G_FIFOS(cfgt.reset_counters, (yyvsp[0].Int_fifo)); }
+#line 3108 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 266:
-/* Line 1787 of yacc.c */
-#line 1373 "../../ntpd/ntp_parser.y"
+#line 1384 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
- (yyval.Int_fifo) = (yyvsp[(1) - (2)].Int_fifo);
- APPEND_G_FIFO((yyval.Int_fifo), create_int_node((yyvsp[(2) - (2)].Integer)));
+ (yyval.Int_fifo) = (yyvsp[-1].Int_fifo);
+ APPEND_G_FIFO((yyval.Int_fifo), create_int_node((yyvsp[0].Integer)));
}
+#line 3117 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 267:
-/* Line 1787 of yacc.c */
-#line 1378 "../../ntpd/ntp_parser.y"
+#line 1389 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
(yyval.Int_fifo) = NULL;
- APPEND_G_FIFO((yyval.Int_fifo), create_int_node((yyvsp[(1) - (1)].Integer)));
+ APPEND_G_FIFO((yyval.Int_fifo), create_int_node((yyvsp[0].Integer)));
}
+#line 3126 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 275:
-/* Line 1787 of yacc.c */
-#line 1402 "../../ntpd/ntp_parser.y"
+#line 1413 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
- (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo);
- APPEND_G_FIFO((yyval.Attr_val_fifo), create_int_node((yyvsp[(2) - (2)].Integer)));
+ (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo);
+ APPEND_G_FIFO((yyval.Attr_val_fifo), create_int_node((yyvsp[0].Integer)));
}
+#line 3135 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 276:
-/* Line 1787 of yacc.c */
-#line 1407 "../../ntpd/ntp_parser.y"
+#line 1418 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
(yyval.Attr_val_fifo) = NULL;
- APPEND_G_FIFO((yyval.Attr_val_fifo), create_int_node((yyvsp[(1) - (1)].Integer)));
+ APPEND_G_FIFO((yyval.Attr_val_fifo), create_int_node((yyvsp[0].Integer)));
}
+#line 3144 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 277:
-/* Line 1787 of yacc.c */
-#line 1415 "../../ntpd/ntp_parser.y"
+#line 1426 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
- (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo);
- APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (2)].Attr_val));
+ (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo);
+ APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val));
}
+#line 3153 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 278:
-/* Line 1787 of yacc.c */
-#line 1420 "../../ntpd/ntp_parser.y"
+#line 1431 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
(yyval.Attr_val_fifo) = NULL;
- APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(1) - (1)].Attr_val));
+ APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val));
}
+#line 3162 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 279:
-/* Line 1787 of yacc.c */
-#line 1428 "../../ntpd/ntp_parser.y"
- { (yyval.Attr_val) = create_attr_ival('i', (yyvsp[(1) - (1)].Integer)); }
+#line 1439 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { (yyval.Attr_val) = create_attr_ival('i', (yyvsp[0].Integer)); }
+#line 3168 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 281:
-/* Line 1787 of yacc.c */
-#line 1434 "../../ntpd/ntp_parser.y"
- { (yyval.Attr_val) = create_attr_rangeval('-', (yyvsp[(2) - (5)].Integer), (yyvsp[(4) - (5)].Integer)); }
+#line 1445 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { (yyval.Attr_val) = create_attr_rangeval('-', (yyvsp[-3].Integer), (yyvsp[-1].Integer)); }
+#line 3174 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 282:
-/* Line 1787 of yacc.c */
-#line 1439 "../../ntpd/ntp_parser.y"
+#line 1450 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
- (yyval.String_fifo) = (yyvsp[(1) - (2)].String_fifo);
- APPEND_G_FIFO((yyval.String_fifo), create_string_node((yyvsp[(2) - (2)].String)));
+ (yyval.String_fifo) = (yyvsp[-1].String_fifo);
+ APPEND_G_FIFO((yyval.String_fifo), create_string_node((yyvsp[0].String)));
}
+#line 3183 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 283:
-/* Line 1787 of yacc.c */
-#line 1444 "../../ntpd/ntp_parser.y"
+#line 1455 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
(yyval.String_fifo) = NULL;
- APPEND_G_FIFO((yyval.String_fifo), create_string_node((yyvsp[(1) - (1)].String)));
+ APPEND_G_FIFO((yyval.String_fifo), create_string_node((yyvsp[0].String)));
}
+#line 3192 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 284:
-/* Line 1787 of yacc.c */
-#line 1452 "../../ntpd/ntp_parser.y"
+#line 1463 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
- (yyval.Address_fifo) = (yyvsp[(1) - (2)].Address_fifo);
- APPEND_G_FIFO((yyval.Address_fifo), (yyvsp[(2) - (2)].Address_node));
+ (yyval.Address_fifo) = (yyvsp[-1].Address_fifo);
+ APPEND_G_FIFO((yyval.Address_fifo), (yyvsp[0].Address_node));
}
+#line 3201 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 285:
-/* Line 1787 of yacc.c */
-#line 1457 "../../ntpd/ntp_parser.y"
+#line 1468 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
(yyval.Address_fifo) = NULL;
- APPEND_G_FIFO((yyval.Address_fifo), (yyvsp[(1) - (1)].Address_node));
+ APPEND_G_FIFO((yyval.Address_fifo), (yyvsp[0].Address_node));
}
+#line 3210 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 286:
-/* Line 1787 of yacc.c */
-#line 1465 "../../ntpd/ntp_parser.y"
+#line 1476 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
- if ((yyvsp[(1) - (1)].Integer) != 0 && (yyvsp[(1) - (1)].Integer) != 1) {
+ if ((yyvsp[0].Integer) != 0 && (yyvsp[0].Integer) != 1) {
yyerror("Integer value is not boolean (0 or 1). Assuming 1");
(yyval.Integer) = 1;
} else {
- (yyval.Integer) = (yyvsp[(1) - (1)].Integer);
+ (yyval.Integer) = (yyvsp[0].Integer);
}
}
+#line 3223 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 287:
-/* Line 1787 of yacc.c */
-#line 1473 "../../ntpd/ntp_parser.y"
+#line 1484 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{ (yyval.Integer) = 1; }
+#line 3229 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 288:
-/* Line 1787 of yacc.c */
-#line 1474 "../../ntpd/ntp_parser.y"
+#line 1485 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{ (yyval.Integer) = 0; }
+#line 3235 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 289:
-/* Line 1787 of yacc.c */
-#line 1478 "../../ntpd/ntp_parser.y"
- { (yyval.Double) = (double)(yyvsp[(1) - (1)].Integer); }
+#line 1489 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { (yyval.Double) = (double)(yyvsp[0].Integer); }
+#line 3241 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 291:
-/* Line 1787 of yacc.c */
-#line 1489 "../../ntpd/ntp_parser.y"
+#line 1500 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
sim_node *sn;
- sn = create_sim_node((yyvsp[(3) - (5)].Attr_val_fifo), (yyvsp[(4) - (5)].Sim_server_fifo));
+ sn = create_sim_node((yyvsp[-2].Attr_val_fifo), (yyvsp[-1].Sim_server_fifo));
APPEND_G_FIFO(cfgt.sim_details, sn);
/* Revert from ; to \n for end-of-command */
old_config_style = 1;
}
+#line 3255 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 292:
-/* Line 1787 of yacc.c */
-#line 1506 "../../ntpd/ntp_parser.y"
+#line 1517 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{ old_config_style = 0; }
+#line 3261 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 293:
-/* Line 1787 of yacc.c */
-#line 1511 "../../ntpd/ntp_parser.y"
+#line 1522 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
- (yyval.Attr_val_fifo) = (yyvsp[(1) - (3)].Attr_val_fifo);
- APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (3)].Attr_val));
+ (yyval.Attr_val_fifo) = (yyvsp[-2].Attr_val_fifo);
+ APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[-1].Attr_val));
}
+#line 3270 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 294:
-/* Line 1787 of yacc.c */
-#line 1516 "../../ntpd/ntp_parser.y"
+#line 1527 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
(yyval.Attr_val_fifo) = NULL;
- APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(1) - (2)].Attr_val));
+ APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[-1].Attr_val));
}
+#line 3279 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 295:
-/* Line 1787 of yacc.c */
-#line 1524 "../../ntpd/ntp_parser.y"
- { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (3)].Integer), (yyvsp[(3) - (3)].Double)); }
+#line 1535 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { (yyval.Attr_val) = create_attr_dval((yyvsp[-2].Integer), (yyvsp[0].Double)); }
+#line 3285 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 298:
-/* Line 1787 of yacc.c */
-#line 1534 "../../ntpd/ntp_parser.y"
+#line 1545 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
- (yyval.Sim_server_fifo) = (yyvsp[(1) - (2)].Sim_server_fifo);
- APPEND_G_FIFO((yyval.Sim_server_fifo), (yyvsp[(2) - (2)].Sim_server));
+ (yyval.Sim_server_fifo) = (yyvsp[-1].Sim_server_fifo);
+ APPEND_G_FIFO((yyval.Sim_server_fifo), (yyvsp[0].Sim_server));
}
+#line 3294 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 299:
-/* Line 1787 of yacc.c */
-#line 1539 "../../ntpd/ntp_parser.y"
+#line 1550 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
(yyval.Sim_server_fifo) = NULL;
- APPEND_G_FIFO((yyval.Sim_server_fifo), (yyvsp[(1) - (1)].Sim_server));
+ APPEND_G_FIFO((yyval.Sim_server_fifo), (yyvsp[0].Sim_server));
}
+#line 3303 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 300:
-/* Line 1787 of yacc.c */
-#line 1547 "../../ntpd/ntp_parser.y"
- { (yyval.Sim_server) = ONLY_SIM(create_sim_server((yyvsp[(1) - (5)].Address_node), (yyvsp[(3) - (5)].Double), (yyvsp[(4) - (5)].Sim_script_fifo))); }
+#line 1558 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { (yyval.Sim_server) = ONLY_SIM(create_sim_server((yyvsp[-4].Address_node), (yyvsp[-2].Double), (yyvsp[-1].Sim_script_fifo))); }
+#line 3309 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 301:
-/* Line 1787 of yacc.c */
-#line 1552 "../../ntpd/ntp_parser.y"
- { (yyval.Double) = (yyvsp[(3) - (4)].Double); }
+#line 1563 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { (yyval.Double) = (yyvsp[-1].Double); }
+#line 3315 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 302:
-/* Line 1787 of yacc.c */
-#line 1557 "../../ntpd/ntp_parser.y"
- { (yyval.Address_node) = (yyvsp[(3) - (3)].Address_node); }
+#line 1568 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { (yyval.Address_node) = (yyvsp[0].Address_node); }
+#line 3321 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 303:
-/* Line 1787 of yacc.c */
-#line 1562 "../../ntpd/ntp_parser.y"
+#line 1573 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
- (yyval.Sim_script_fifo) = (yyvsp[(1) - (2)].Sim_script_fifo);
- APPEND_G_FIFO((yyval.Sim_script_fifo), (yyvsp[(2) - (2)].Sim_script));
+ (yyval.Sim_script_fifo) = (yyvsp[-1].Sim_script_fifo);
+ APPEND_G_FIFO((yyval.Sim_script_fifo), (yyvsp[0].Sim_script));
}
+#line 3330 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 304:
-/* Line 1787 of yacc.c */
-#line 1567 "../../ntpd/ntp_parser.y"
+#line 1578 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
(yyval.Sim_script_fifo) = NULL;
- APPEND_G_FIFO((yyval.Sim_script_fifo), (yyvsp[(1) - (1)].Sim_script));
+ APPEND_G_FIFO((yyval.Sim_script_fifo), (yyvsp[0].Sim_script));
}
+#line 3339 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 305:
-/* Line 1787 of yacc.c */
-#line 1575 "../../ntpd/ntp_parser.y"
- { (yyval.Sim_script) = ONLY_SIM(create_sim_script_info((yyvsp[(3) - (6)].Double), (yyvsp[(5) - (6)].Attr_val_fifo))); }
+#line 1586 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { (yyval.Sim_script) = ONLY_SIM(create_sim_script_info((yyvsp[-3].Double), (yyvsp[-1].Attr_val_fifo))); }
+#line 3345 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 306:
-/* Line 1787 of yacc.c */
-#line 1580 "../../ntpd/ntp_parser.y"
+#line 1591 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
- (yyval.Attr_val_fifo) = (yyvsp[(1) - (3)].Attr_val_fifo);
- APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (3)].Attr_val));
+ (yyval.Attr_val_fifo) = (yyvsp[-2].Attr_val_fifo);
+ APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[-1].Attr_val));
}
+#line 3354 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 307:
-/* Line 1787 of yacc.c */
-#line 1585 "../../ntpd/ntp_parser.y"
+#line 1596 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
{
(yyval.Attr_val_fifo) = NULL;
- APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(1) - (2)].Attr_val));
+ APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[-1].Attr_val));
}
+#line 3363 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
case 308:
-/* Line 1787 of yacc.c */
-#line 1593 "../../ntpd/ntp_parser.y"
- { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (3)].Integer), (yyvsp[(3) - (3)].Double)); }
+#line 1604 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */
+ { (yyval.Attr_val) = create_attr_dval((yyvsp[-2].Integer), (yyvsp[0].Double)); }
+#line 3369 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
break;
-/* Line 1787 of yacc.c */
-#line 3600 "ntp_parser.c"
+#line 3373 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */
default: break;
}
/* User semantic actions sometimes alter yychar, and that requires
@@ -3618,7 +3391,7 @@ yyreduce:
*++yyvsp = yyval;
- /* Now `shift' the result of the reduction. Determine what state
+ /* Now 'shift' the result of the reduction. Determine what state
that goes to, based on the state we popped back to and the rule
number reduced by. */
@@ -3633,9 +3406,9 @@ yyreduce:
goto yynewstate;
-/*------------------------------------.
-| yyerrlab -- here on detecting error |
-`------------------------------------*/
+/*--------------------------------------.
+| yyerrlab -- here on detecting error. |
+`--------------------------------------*/
yyerrlab:
/* Make sure we have latest lookahead translation. See comments at
user semantic actions for why this is necessary. */
@@ -3686,20 +3459,20 @@ yyerrlab:
if (yyerrstatus == 3)
{
/* If just tried and failed to reuse lookahead token after an
- error, discard it. */
+ error, discard it. */
if (yychar <= YYEOF)
- {
- /* Return failure if at end of input. */
- if (yychar == YYEOF)
- YYABORT;
- }
+ {
+ /* Return failure if at end of input. */
+ if (yychar == YYEOF)
+ YYABORT;
+ }
else
- {
- yydestruct ("Error: discarding",
- yytoken, &yylval);
- yychar = YYEMPTY;
- }
+ {
+ yydestruct ("Error: discarding",
+ yytoken, &yylval);
+ yychar = YYEMPTY;
+ }
}
/* Else will try to reuse lookahead token after shifting the error
@@ -3718,7 +3491,7 @@ yyerrorlab:
if (/*CONSTCOND*/ 0)
goto yyerrorlab;
- /* Do not reclaim the symbols of the rule which action triggered
+ /* Do not reclaim the symbols of the rule whose action triggered
this YYERROR. */
YYPOPSTACK (yylen);
yylen = 0;
@@ -3731,29 +3504,29 @@ yyerrorlab:
| yyerrlab1 -- common code for both syntax error and YYERROR. |
`-------------------------------------------------------------*/
yyerrlab1:
- yyerrstatus = 3; /* Each real token shifted decrements this. */
+ yyerrstatus = 3; /* Each real token shifted decrements this. */
for (;;)
{
yyn = yypact[yystate];
if (!yypact_value_is_default (yyn))
- {
- yyn += YYTERROR;
- if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
- {
- yyn = yytable[yyn];
- if (0 < yyn)
- break;
- }
- }
+ {
+ yyn += YYTERROR;
+ if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+ {
+ yyn = yytable[yyn];
+ if (0 < yyn)
+ break;
+ }
+ }
/* Pop the current state because it cannot handle the error token. */
if (yyssp == yyss)
- YYABORT;
+ YYABORT;
yydestruct ("Error: popping",
- yystos[yystate], yyvsp);
+ yystos[yystate], yyvsp);
YYPOPSTACK (1);
yystate = *yyssp;
YY_STACK_PRINT (yyss, yyssp);
@@ -3804,14 +3577,14 @@ yyreturn:
yydestruct ("Cleanup: discarding lookahead",
yytoken, &yylval);
}
- /* Do not reclaim the symbols of the rule which action triggered
+ /* Do not reclaim the symbols of the rule whose action triggered
this YYABORT or YYACCEPT. */
YYPOPSTACK (yylen);
YY_STACK_PRINT (yyss, yyssp);
while (yyssp != yyss)
{
yydestruct ("Cleanup: popping",
- yystos[*yyssp], yyvsp);
+ yystos[*yyssp], yyvsp);
YYPOPSTACK (1);
}
#ifndef yyoverflow
@@ -3822,13 +3595,9 @@ yyreturn:
if (yymsg != yymsgbuf)
YYSTACK_FREE (yymsg);
#endif
- /* Make sure YYID is used. */
- return YYID (yyresult);
+ return yyresult;
}
-
-
-/* Line 2050 of yacc.c */
-#line 1604 "../../ntpd/ntp_parser.y"
+#line 1615 "../../ntpd/ntp_parser.y" /* yacc.c:1906 */
void
diff --git a/ntpd/ntp_parser.h b/ntpd/ntp_parser.h
index b474fc24113c..1ec7f8cc69af 100644
--- a/ntpd/ntp_parser.h
+++ b/ntpd/ntp_parser.h
@@ -1,19 +1,19 @@
-/* A Bison parser, made by GNU Bison 2.7.12-4996. */
+/* A Bison parser, made by GNU Bison 3.0.2. */
/* Bison interface for Yacc-like parsers in C
-
- Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
-
+
+ Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
@@ -26,13 +26,13 @@
special exception, which will cause the skeleton and the resulting
Bison output files to be licensed under the GNU General Public
License without this special exception.
-
+
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
-#ifndef YY_YY_NTP_PARSER_H_INCLUDED
-# define YY_YY_NTP_PARSER_H_INCLUDED
-/* Enabling traces. */
+#ifndef YY_YY__NTPD_NTP_PARSER_H_INCLUDED
+# define YY_YY__NTPD_NTP_PARSER_H_INCLUDED
+/* Debug traces. */
#ifndef YYDEBUG
# define YYDEBUG 1
#endif
@@ -40,204 +40,203 @@
extern int yydebug;
#endif
-/* Tokens. */
+/* Token type. */
#ifndef YYTOKENTYPE
# define YYTOKENTYPE
- /* Put the tokens into the symbol table, so that GDB and other debuggers
- know about them. */
- enum yytokentype {
- T_Abbrev = 258,
- T_Age = 259,
- T_All = 260,
- T_Allan = 261,
- T_Allpeers = 262,
- T_Auth = 263,
- T_Autokey = 264,
- T_Automax = 265,
- T_Average = 266,
- T_Bclient = 267,
- T_Beacon = 268,
- T_Broadcast = 269,
- T_Broadcastclient = 270,
- T_Broadcastdelay = 271,
- T_Burst = 272,
- T_Calibrate = 273,
- T_Ceiling = 274,
- T_Clockstats = 275,
- T_Cohort = 276,
- T_ControlKey = 277,
- T_Crypto = 278,
- T_Cryptostats = 279,
- T_Ctl = 280,
- T_Day = 281,
- T_Default = 282,
- T_Digest = 283,
- T_Disable = 284,
- T_Discard = 285,
- T_Dispersion = 286,
- T_Double = 287,
- T_Driftfile = 288,
- T_Drop = 289,
- T_Dscp = 290,
- T_Ellipsis = 291,
- T_Enable = 292,
- T_End = 293,
- T_False = 294,
- T_File = 295,
- T_Filegen = 296,
- T_Filenum = 297,
- T_Flag1 = 298,
- T_Flag2 = 299,
- T_Flag3 = 300,
- T_Flag4 = 301,
- T_Flake = 302,
- T_Floor = 303,
- T_Freq = 304,
- T_Fudge = 305,
- T_Host = 306,
- T_Huffpuff = 307,
- T_Iburst = 308,
- T_Ident = 309,
- T_Ignore = 310,
- T_Incalloc = 311,
- T_Incmem = 312,
- T_Initalloc = 313,
- T_Initmem = 314,
- T_Includefile = 315,
- T_Integer = 316,
- T_Interface = 317,
- T_Intrange = 318,
- T_Io = 319,
- T_Ipv4 = 320,
- T_Ipv4_flag = 321,
- T_Ipv6 = 322,
- T_Ipv6_flag = 323,
- T_Kernel = 324,
- T_Key = 325,
- T_Keys = 326,
- T_Keysdir = 327,
- T_Kod = 328,
- T_Mssntp = 329,
- T_Leapfile = 330,
- T_Leapsmearinterval = 331,
- T_Limited = 332,
- T_Link = 333,
- T_Listen = 334,
- T_Logconfig = 335,
- T_Logfile = 336,
- T_Loopstats = 337,
- T_Lowpriotrap = 338,
- T_Manycastclient = 339,
- T_Manycastserver = 340,
- T_Mask = 341,
- T_Maxage = 342,
- T_Maxclock = 343,
- T_Maxdepth = 344,
- T_Maxdist = 345,
- T_Maxmem = 346,
- T_Maxpoll = 347,
- T_Mdnstries = 348,
- T_Mem = 349,
- T_Memlock = 350,
- T_Minclock = 351,
- T_Mindepth = 352,
- T_Mindist = 353,
- T_Minimum = 354,
- T_Minpoll = 355,
- T_Minsane = 356,
- T_Mode = 357,
- T_Mode7 = 358,
- T_Monitor = 359,
- T_Month = 360,
- T_Mru = 361,
- T_Multicastclient = 362,
- T_Nic = 363,
- T_Nolink = 364,
- T_Nomodify = 365,
- T_Nomrulist = 366,
- T_None = 367,
- T_Nonvolatile = 368,
- T_Nopeer = 369,
- T_Noquery = 370,
- T_Noselect = 371,
- T_Noserve = 372,
- T_Notrap = 373,
- T_Notrust = 374,
- T_Ntp = 375,
- T_Ntpport = 376,
- T_NtpSignDsocket = 377,
- T_Orphan = 378,
- T_Orphanwait = 379,
- T_Panic = 380,
- T_Peer = 381,
- T_Peerstats = 382,
- T_Phone = 383,
- T_Pid = 384,
- T_Pidfile = 385,
- T_Pool = 386,
- T_Port = 387,
- T_Preempt = 388,
- T_Prefer = 389,
- T_Protostats = 390,
- T_Pw = 391,
- T_Randfile = 392,
- T_Rawstats = 393,
- T_Refid = 394,
- T_Requestkey = 395,
- T_Reset = 396,
- T_Restrict = 397,
- T_Revoke = 398,
- T_Rlimit = 399,
- T_Saveconfigdir = 400,
- T_Server = 401,
- T_Setvar = 402,
- T_Source = 403,
- T_Stacksize = 404,
- T_Statistics = 405,
- T_Stats = 406,
- T_Statsdir = 407,
- T_Step = 408,
- T_Stepback = 409,
- T_Stepfwd = 410,
- T_Stepout = 411,
- T_Stratum = 412,
- T_String = 413,
- T_Sys = 414,
- T_Sysstats = 415,
- T_Tick = 416,
- T_Time1 = 417,
- T_Time2 = 418,
- T_Timer = 419,
- T_Timingstats = 420,
- T_Tinker = 421,
- T_Tos = 422,
- T_Trap = 423,
- T_True = 424,
- T_Trustedkey = 425,
- T_Ttl = 426,
- T_Type = 427,
- T_U_int = 428,
- T_Unconfig = 429,
- T_Unpeer = 430,
- T_Version = 431,
- T_WanderThreshold = 432,
- T_Week = 433,
- T_Wildcard = 434,
- T_Xleave = 435,
- T_Year = 436,
- T_Flag = 437,
- T_EOC = 438,
- T_Simulate = 439,
- T_Beep_Delay = 440,
- T_Sim_Duration = 441,
- T_Server_Offset = 442,
- T_Duration = 443,
- T_Freq_Offset = 444,
- T_Wander = 445,
- T_Jitter = 446,
- T_Prop_Delay = 447,
- T_Proc_Delay = 448
- };
+ enum yytokentype
+ {
+ T_Abbrev = 258,
+ T_Age = 259,
+ T_All = 260,
+ T_Allan = 261,
+ T_Allpeers = 262,
+ T_Auth = 263,
+ T_Autokey = 264,
+ T_Automax = 265,
+ T_Average = 266,
+ T_Bclient = 267,
+ T_Beacon = 268,
+ T_Broadcast = 269,
+ T_Broadcastclient = 270,
+ T_Broadcastdelay = 271,
+ T_Burst = 272,
+ T_Calibrate = 273,
+ T_Ceiling = 274,
+ T_Clockstats = 275,
+ T_Cohort = 276,
+ T_ControlKey = 277,
+ T_Crypto = 278,
+ T_Cryptostats = 279,
+ T_Ctl = 280,
+ T_Day = 281,
+ T_Default = 282,
+ T_Digest = 283,
+ T_Disable = 284,
+ T_Discard = 285,
+ T_Dispersion = 286,
+ T_Double = 287,
+ T_Driftfile = 288,
+ T_Drop = 289,
+ T_Dscp = 290,
+ T_Ellipsis = 291,
+ T_Enable = 292,
+ T_End = 293,
+ T_False = 294,
+ T_File = 295,
+ T_Filegen = 296,
+ T_Filenum = 297,
+ T_Flag1 = 298,
+ T_Flag2 = 299,
+ T_Flag3 = 300,
+ T_Flag4 = 301,
+ T_Flake = 302,
+ T_Floor = 303,
+ T_Freq = 304,
+ T_Fudge = 305,
+ T_Host = 306,
+ T_Huffpuff = 307,
+ T_Iburst = 308,
+ T_Ident = 309,
+ T_Ignore = 310,
+ T_Incalloc = 311,
+ T_Incmem = 312,
+ T_Initalloc = 313,
+ T_Initmem = 314,
+ T_Includefile = 315,
+ T_In