Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/ntp merge conflicts
details: https://anonhg.NetBSD.org/src/rev/420db013ea4f
branches: trunk
changeset: 433727:420db013ea4f
user: christos <christos%NetBSD.org@localhost>
date: Sat Sep 29 21:52:30 2018 +0000
description:
merge conflicts
diffstat:
external/bsd/ntp/dist/configure.ac | 15 +
external/bsd/ntp/dist/include/isc/mem.h | 4 +-
external/bsd/ntp/dist/include/ntp.h | 14 +-
external/bsd/ntp/dist/include/ntp_debug.h | 4 +-
external/bsd/ntp/dist/include/ntp_md5.h | 9 +-
external/bsd/ntp/dist/kernel/sys/bsd_audioirig.h | 4 +-
external/bsd/ntp/dist/lib/isc/alpha/include/isc/atomic.h | 4 +-
external/bsd/ntp/dist/lib/isc/app_api.c | 4 +-
external/bsd/ntp/dist/lib/isc/assertions.c | 4 +-
external/bsd/ntp/dist/lib/isc/backtrace-emptytbl.c | 4 +-
external/bsd/ntp/dist/lib/isc/backtrace.c | 4 +-
external/bsd/ntp/dist/lib/isc/base32.c | 4 +-
external/bsd/ntp/dist/lib/isc/base64.c | 4 +-
external/bsd/ntp/dist/lib/isc/bitstring.c | 4 +-
external/bsd/ntp/dist/lib/isc/buffer.c | 4 +-
external/bsd/ntp/dist/lib/isc/bufferlist.c | 4 +-
external/bsd/ntp/dist/lib/isc/commandline.c | 4 +-
external/bsd/ntp/dist/lib/isc/entropy.c | 4 +-
external/bsd/ntp/dist/lib/isc/error.c | 4 +-
external/bsd/ntp/dist/lib/isc/event.c | 4 +-
external/bsd/ntp/dist/lib/isc/fsaccess.c | 4 +-
external/bsd/ntp/dist/lib/isc/hash.c | 4 +-
external/bsd/ntp/dist/lib/isc/hex.c | 4 +-
external/bsd/ntp/dist/lib/isc/hmacmd5.c | 4 +-
external/bsd/ntp/dist/lib/isc/ia64/include/isc/atomic.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/app.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/assertions.h | 6 +-
external/bsd/ntp/dist/lib/isc/include/isc/backtrace.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/base32.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/base64.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/bind9.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/bitstring.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/boolean.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/buffer.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/bufferlist.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/commandline.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/entropy.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/error.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/event.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/eventclass.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/formatcheck.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/fsaccess.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/hash.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/heap.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/hex.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/hmacmd5.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/hmacsha.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/httpd.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/interfaceiter.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/ipv6.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/iterated_hash.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/lang.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/lex.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/lfsr.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/lib.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/log.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/magic.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/md5.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/msgcat.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/msgs.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/mutexblock.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/netaddr.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/netscope.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/ondestroy.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/os.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/parseint.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/platform.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/platform.h.in | 2 +-
external/bsd/ntp/dist/lib/isc/include/isc/portset.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/print.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/quota.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/radix.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/random.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/ratelimiter.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/refcount.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/region.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/resource.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/resultclass.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/rwlock.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/serial.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/sha1.h | 6 +-
external/bsd/ntp/dist/lib/isc/include/isc/sha2.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/sockaddr.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/stdio.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/stdlib.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/string.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/timer.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/version.h | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/xml.h | 4 +-
external/bsd/ntp/dist/lib/isc/inet_aton.c | 4 +-
external/bsd/ntp/dist/lib/isc/inet_ntop.c | 4 +-
external/bsd/ntp/dist/lib/isc/inet_pton.c | 4 +-
external/bsd/ntp/dist/lib/isc/iterated_hash.c | 4 +-
external/bsd/ntp/dist/lib/isc/lex.c | 4 +-
external/bsd/ntp/dist/lib/isc/lfsr.c | 4 +-
external/bsd/ntp/dist/lib/isc/lib.c | 4 +-
external/bsd/ntp/dist/lib/isc/md5.c | 4 +-
external/bsd/ntp/dist/lib/isc/mem_api.c | 4 +-
external/bsd/ntp/dist/lib/isc/mips/include/isc/atomic.h | 4 +-
external/bsd/ntp/dist/lib/isc/netscope.c | 4 +-
external/bsd/ntp/dist/lib/isc/nls/msgcat.c | 4 +-
external/bsd/ntp/dist/lib/isc/noatomic/include/isc/atomic.h | 4 +-
external/bsd/ntp/dist/lib/isc/nothreads/condition.c | 4 +-
external/bsd/ntp/dist/lib/isc/nothreads/include/isc/condition.h | 4 +-
external/bsd/ntp/dist/lib/isc/nothreads/include/isc/mutex.h | 4 +-
external/bsd/ntp/dist/lib/isc/nothreads/include/isc/once.h | 4 +-
external/bsd/ntp/dist/lib/isc/nothreads/include/isc/thread.h | 4 +-
external/bsd/ntp/dist/lib/isc/nothreads/mutex.c | 4 +-
external/bsd/ntp/dist/lib/isc/nothreads/thread.c | 4 +-
external/bsd/ntp/dist/lib/isc/ondestroy.c | 4 +-
external/bsd/ntp/dist/lib/isc/parseint.c | 4 +-
external/bsd/ntp/dist/lib/isc/portset.c | 4 +-
external/bsd/ntp/dist/lib/isc/print.c | 4 +-
external/bsd/ntp/dist/lib/isc/pthreads/condition.c | 4 +-
external/bsd/ntp/dist/lib/isc/pthreads/include/isc/condition.h | 4 +-
external/bsd/ntp/dist/lib/isc/pthreads/include/isc/mutex.h | 4 +-
external/bsd/ntp/dist/lib/isc/pthreads/include/isc/once.h | 4 +-
external/bsd/ntp/dist/lib/isc/pthreads/include/isc/thread.h | 4 +-
external/bsd/ntp/dist/lib/isc/pthreads/mutex.c | 4 +-
external/bsd/ntp/dist/lib/isc/pthreads/thread.c | 4 +-
external/bsd/ntp/dist/lib/isc/quota.c | 4 +-
external/bsd/ntp/dist/lib/isc/random.c | 4 +-
external/bsd/ntp/dist/lib/isc/ratelimiter.c | 4 +-
external/bsd/ntp/dist/lib/isc/refcount.c | 4 +-
external/bsd/ntp/dist/lib/isc/region.c | 4 +-
external/bsd/ntp/dist/lib/isc/serial.c | 4 +-
external/bsd/ntp/dist/lib/isc/sha1.c | 4 +-
external/bsd/ntp/dist/lib/isc/sparc64/include/isc/atomic.h | 4 +-
external/bsd/ntp/dist/lib/isc/strtoul.c | 4 +-
external/bsd/ntp/dist/lib/isc/timer_api.c | 4 +-
external/bsd/ntp/dist/lib/isc/timer_p.h | 4 +-
external/bsd/ntp/dist/lib/isc/tsmemcmp.c | 2 +-
external/bsd/ntp/dist/lib/isc/unix/app.c | 4 +-
external/bsd/ntp/dist/lib/isc/unix/entropy.c | 4 +-
external/bsd/ntp/dist/lib/isc/unix/fsaccess.c | 4 +-
external/bsd/ntp/dist/lib/isc/unix/ifiter_getifaddrs.c | 4 +-
external/bsd/ntp/dist/lib/isc/unix/ifiter_ioctl.c | 4 +-
external/bsd/ntp/dist/lib/isc/unix/ifiter_sysctl.c | 4 +-
external/bsd/ntp/dist/lib/isc/unix/include/isc/dir.h | 4 +-
external/bsd/ntp/dist/lib/isc/unix/include/isc/int.h | 4 +-
external/bsd/ntp/dist/lib/isc/unix/include/isc/keyboard.h | 4 +-
external/bsd/ntp/dist/lib/isc/unix/include/isc/netdb.h | 4 +-
external/bsd/ntp/dist/lib/isc/unix/include/isc/offset.h | 4 +-
external/bsd/ntp/dist/lib/isc/unix/include/isc/stat.h | 4 +-
external/bsd/ntp/dist/lib/isc/unix/include/isc/strerror.h | 4 +-
external/bsd/ntp/dist/lib/isc/unix/include/isc/syslog.h | 4 +-
external/bsd/ntp/dist/lib/isc/unix/include/isc/time.h | 4 +-
external/bsd/ntp/dist/lib/isc/unix/interfaceiter.c | 4 +-
external/bsd/ntp/dist/lib/isc/unix/ipv6.c | 4 +-
external/bsd/ntp/dist/lib/isc/unix/keyboard.c | 4 +-
external/bsd/ntp/dist/lib/isc/unix/os.c | 4 +-
external/bsd/ntp/dist/lib/isc/unix/resource.c | 4 +-
external/bsd/ntp/dist/lib/isc/unix/socket_p.h | 4 +-
external/bsd/ntp/dist/lib/isc/unix/stdtime.c | 4 +-
external/bsd/ntp/dist/lib/isc/unix/strerror.c | 4 +-
external/bsd/ntp/dist/lib/isc/unix/syslog.c | 4 +-
external/bsd/ntp/dist/lib/isc/version.c | 4 +-
external/bsd/ntp/dist/lib/isc/win32/DLLMain.c | 4 +-
external/bsd/ntp/dist/lib/isc/win32/app.c | 4 +-
external/bsd/ntp/dist/lib/isc/win32/condition.c | 4 +-
external/bsd/ntp/dist/lib/isc/win32/entropy.c | 4 +-
external/bsd/ntp/dist/lib/isc/win32/errno2result.c | 4 +-
external/bsd/ntp/dist/lib/isc/win32/errno2result.h | 4 +-
external/bsd/ntp/dist/lib/isc/win32/fsaccess.c | 4 +-
external/bsd/ntp/dist/lib/isc/win32/include/isc/bind_registry.h | 4 +-
external/bsd/ntp/dist/lib/isc/win32/include/isc/bindevt.h | 4 +-
external/bsd/ntp/dist/lib/isc/win32/include/isc/condition.h | 4 +-
external/bsd/ntp/dist/lib/isc/win32/include/isc/dir.h | 4 +-
external/bsd/ntp/dist/lib/isc/win32/include/isc/int.h | 4 +-
external/bsd/ntp/dist/lib/isc/win32/include/isc/keyboard.h | 4 +-
external/bsd/ntp/dist/lib/isc/win32/include/isc/mutex.h | 4 +-
external/bsd/ntp/dist/lib/isc/win32/include/isc/netdb.h | 4 +-
external/bsd/ntp/dist/lib/isc/win32/include/isc/ntgroups.h | 4 +-
external/bsd/ntp/dist/lib/isc/win32/include/isc/ntpaths.h | 4 +-
external/bsd/ntp/dist/lib/isc/win32/include/isc/offset.h | 4 +-
external/bsd/ntp/dist/lib/isc/win32/include/isc/once.h | 4 +-
external/bsd/ntp/dist/lib/isc/win32/include/isc/platform.h | 4 +-
external/bsd/ntp/dist/lib/isc/win32/include/isc/stat.h | 4 +-
external/bsd/ntp/dist/lib/isc/win32/include/isc/strerror.h | 4 +-
external/bsd/ntp/dist/lib/isc/win32/include/isc/syslog.h | 4 +-
external/bsd/ntp/dist/lib/isc/win32/include/isc/thread.h | 4 +-
external/bsd/ntp/dist/lib/isc/win32/include/isc/time.h | 4 +-
external/bsd/ntp/dist/lib/isc/win32/include/isc/win32os.h | 4 +-
external/bsd/ntp/dist/lib/isc/win32/interfaceiter.c | 4 +-
external/bsd/ntp/dist/lib/isc/win32/ipv6.c | 4 +-
external/bsd/ntp/dist/lib/isc/win32/keyboard.c | 4 +-
external/bsd/ntp/dist/lib/isc/win32/libgen.h | 4 +-
external/bsd/ntp/dist/lib/isc/win32/netdb.h | 4 +-
external/bsd/ntp/dist/lib/isc/win32/ntgroups.c | 4 +-
external/bsd/ntp/dist/lib/isc/win32/ntpaths.c | 4 +-
external/bsd/ntp/dist/lib/isc/win32/once.c | 4 +-
external/bsd/ntp/dist/lib/isc/win32/os.c | 4 +-
external/bsd/ntp/dist/lib/isc/win32/resource.c | 4 +-
external/bsd/ntp/dist/lib/isc/win32/stdio.c | 4 +-
external/bsd/ntp/dist/lib/isc/win32/stdtime.c | 4 +-
external/bsd/ntp/dist/lib/isc/win32/strerror.c | 4 +-
external/bsd/ntp/dist/lib/isc/win32/syslog.c | 4 +-
external/bsd/ntp/dist/lib/isc/win32/syslog.h | 4 +-
external/bsd/ntp/dist/lib/isc/win32/thread.c | 4 +-
external/bsd/ntp/dist/lib/isc/win32/time.c | 4 +-
external/bsd/ntp/dist/lib/isc/win32/unistd.h | 4 +-
external/bsd/ntp/dist/lib/isc/win32/version.c | 4 +-
external/bsd/ntp/dist/lib/isc/win32/win32os.c | 4 +-
external/bsd/ntp/dist/lib/isc/x86_32/include/isc/atomic.h | 4 +-
external/bsd/ntp/dist/lib/isc/x86_64/include/isc/atomic.h | 4 +-
external/bsd/ntp/dist/libntp/a_md5encrypt.c | 19 +-
external/bsd/ntp/dist/libntp/prettydate.c | 7 +-
external/bsd/ntp/dist/libntp/snprintf.c | 4 +-
external/bsd/ntp/dist/libntp/ssl_init.c | 29 +-
external/bsd/ntp/dist/libntp/syssignal.c | 9 +-
external/bsd/ntp/dist/libntp/work_fork.c | 6 +-
external/bsd/ntp/dist/libntp/work_thread.c | 19 +-
external/bsd/ntp/dist/ntpd/ntp_config.c | 37 +-
external/bsd/ntp/dist/ntpd/ntp_control.c | 87 +-
external/bsd/ntp/dist/ntpd/ntp_keyword.h | 2 +-
external/bsd/ntp/dist/ntpd/ntp_loopfilter.c | 14 +-
external/bsd/ntp/dist/ntpd/ntp_parser.y | 3 +-
external/bsd/ntp/dist/ntpd/ntp_proto.c | 147 +-
external/bsd/ntp/dist/ntpd/ntp_refclock.c | 4 +-
external/bsd/ntp/dist/ntpd/ntp_request.c | 3 +-
external/bsd/ntp/dist/ntpd/ntpd-opts.c | 16 +-
external/bsd/ntp/dist/ntpd/ntpd-opts.h | 8 +-
external/bsd/ntp/dist/ntpd/ntpd.c | 399 ++-
external/bsd/ntp/dist/ntpd/refclock_ripencc.c | 4 +-
external/bsd/ntp/dist/ntpd/refclock_shm.c | 3 +-
external/bsd/ntp/dist/ntpdate/ntpdate.c | 189 +-
external/bsd/ntp/dist/ntpdc/ntpdc-opts.c | 16 +-
external/bsd/ntp/dist/ntpdc/ntpdc-opts.h | 8 +-
external/bsd/ntp/dist/ntpdc/ntpdc.c | 80 +-
external/bsd/ntp/dist/ntpq/ntpq-opts.c | 16 +-
external/bsd/ntp/dist/ntpq/ntpq-opts.h | 8 +-
external/bsd/ntp/dist/ntpq/ntpq-subs.c | 59 +-
external/bsd/ntp/dist/ntpq/ntpq.c | 914 ++++--
external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.c | 16 +-
external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.h | 8 +-
external/bsd/ntp/dist/scripts/ntpsweep/ntpsweep.in | 2 +-
external/bsd/ntp/dist/scripts/plot_summary.in | 2 +-
external/bsd/ntp/dist/scripts/summary.in | 2 +-
external/bsd/ntp/dist/sntp/crypto.c | 11 +-
external/bsd/ntp/dist/sntp/libevent/compat/sys/queue.h | 4 +-
external/bsd/ntp/dist/sntp/libevent/test/regress.gen.c | 1227 ----------
external/bsd/ntp/dist/sntp/m4/snprintf.m4 | 2 +-
external/bsd/ntp/dist/sntp/main.c | 9 +-
external/bsd/ntp/dist/sntp/sntp-opts.c | 16 +-
external/bsd/ntp/dist/sntp/sntp-opts.h | 8 +-
external/bsd/ntp/dist/sntp/tests/crypto.c | 6 +-
external/bsd/ntp/dist/sntp/tests/packetProcessing.c | 10 +-
external/bsd/ntp/dist/sntp/version.c | 4 +-
external/bsd/ntp/dist/tests/libntp/ssl_init.c | 10 +-
external/bsd/ntp/dist/util/ntp-keygen-opts.c | 16 +-
external/bsd/ntp/dist/util/ntp-keygen-opts.h | 8 +-
external/bsd/ntp/dist/util/sht.c | 10 +-
external/bsd/ntp/dist/util/tg2.c | 73 +-
external/bsd/ntp/importdate | 2 +-
external/bsd/ntp/include/config.h | 31 +-
255 files changed, 1886 insertions(+), 2547 deletions(-)
diffs (truncated from 9565 to 300 lines):
diff -r f8d870fe4d52 -r 420db013ea4f external/bsd/ntp/dist/configure.ac
--- a/external/bsd/ntp/dist/configure.ac Sat Sep 29 21:52:29 2018 +0000
+++ b/external/bsd/ntp/dist/configure.ac Sat Sep 29 21:52:30 2018 +0000
@@ -3014,6 +3014,17 @@
NTP_OPENSSL
+AC_MSG_CHECKING([if we want to enable CMAC support])
+case "$ac_cv_header_openssl_cmac_h" in
+ yes)
+ AC_DEFINE([ENABLE_CMAC], [1], [Enable CMAC support?])
+ ans="yes"
+ ;;
+ *) ans="no"
+ ;;
+esac
+AC_MSG_RESULT([$ans])
+
NTP_CRYPTO_RAND
# if we are using OpenSSL (--with-crypto), by default Autokey is enabled
@@ -4380,6 +4391,10 @@
###
+AC_CHECK_DECLS([sigsetjmp,siglongjmp], [], [], [[#include <setjmp.h>]])
+
+###
+
AC_DEFINE_DIR([NTP_KEYSDIR], [sysconfdir],
[Default location of crypto key info])
diff -r f8d870fe4d52 -r 420db013ea4f external/bsd/ntp/dist/include/isc/mem.h
--- a/external/bsd/ntp/dist/include/isc/mem.h Sat Sep 29 21:52:29 2018 +0000
+++ b/external/bsd/ntp/dist/include/isc/mem.h Sat Sep 29 21:52:30 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mem.h,v 1.4 2016/01/08 21:35:35 christos Exp $ */
+/* $NetBSD: mem.h,v 1.5 2018/09/29 21:52:31 christos Exp $ */
/*
* libntp local override of isc/mem.h to stub it out.
@@ -28,7 +28,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* Id: mem.h,v 1.78.120.3 2009/02/11 03:07:01 jinmei Exp */
+/* Id */
#ifndef ISC_MEM_H
#define ISC_MEM_H 1
diff -r f8d870fe4d52 -r 420db013ea4f external/bsd/ntp/dist/include/ntp.h
--- a/external/bsd/ntp/dist/include/ntp.h Sat Sep 29 21:52:29 2018 +0000
+++ b/external/bsd/ntp/dist/include/ntp.h Sat Sep 29 21:52:30 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ntp.h,v 1.9 2018/04/07 00:19:52 christos Exp $ */
+/* $NetBSD: ntp.h,v 1.10 2018/09/29 21:52:31 christos Exp $ */
/*
* ntp.h - NTP definitions for the masses
@@ -612,6 +612,18 @@
#define STRATUM_TO_PKT(s) ((u_char)(((s) == (STRATUM_UNSPEC)) ?\
(STRATUM_PKT_UNSPEC) : (s)))
+
+/*
+ * A test to determine if the refid should be interpreted as text string.
+ * This is usually the case for a refclock, which has stratum 0 internally,
+ * which results in sys_stratum 1 if the refclock becomes system peer, or
+ * in case of a kiss-of-death (KoD) packet that has STRATUM_PKT_UNSPEC (==0)
+ * in the packet which is converted to STRATUM_UNSPEC when the packet
+ * is evaluated.
+ */
+#define REFID_ISTEXT(s) (((s) <= 1) || ((s) >= STRATUM_UNSPEC))
+
+
/*
* Event codes. Used for reporting errors/events to the control module
*/
diff -r f8d870fe4d52 -r 420db013ea4f external/bsd/ntp/dist/include/ntp_debug.h
--- a/external/bsd/ntp/dist/include/ntp_debug.h Sat Sep 29 21:52:29 2018 +0000
+++ b/external/bsd/ntp/dist/include/ntp_debug.h Sat Sep 29 21:52:30 2018 +0000
@@ -1,9 +1,9 @@
-/* $NetBSD: ntp_debug.h,v 1.4 2016/01/08 21:35:35 christos Exp $ */
+/* $NetBSD: ntp_debug.h,v 1.5 2018/09/29 21:52:31 christos Exp $ */
/*
* Header
*
- * $Created: Sat Aug 20 14:23:01 2005 $
+ * Created
*
* Copyright (C) 2005 by Frank Kardel
*/
diff -r f8d870fe4d52 -r 420db013ea4f external/bsd/ntp/dist/include/ntp_md5.h
--- a/external/bsd/ntp/dist/include/ntp_md5.h Sat Sep 29 21:52:29 2018 +0000
+++ b/external/bsd/ntp/dist/include/ntp_md5.h Sat Sep 29 21:52:30 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ntp_md5.h,v 1.7 2017/04/13 20:17:41 christos Exp $ */
+/* $NetBSD: ntp_md5.h,v 1.8 2018/09/29 21:52:31 christos Exp $ */
/*
* ntp_md5.h: deal with md5.h headers
@@ -9,8 +9,13 @@
#define NTP_MD5_H
#ifdef OPENSSL
-# include "openssl/evp.h"
+# include <openssl/evp.h>
# include "libssl_compat.h"
+# ifdef HAVE_OPENSSL_CMAC_H
+# include <openssl/cmac.h>
+# define CMAC "AES128CMAC"
+# define AES_128_KEY_SIZE 16
+# endif /*HAVE_OPENSSL_CMAC_H*/
#else /* !OPENSSL follows */
/*
* Provide OpenSSL-alike MD5 API if we're not using OpenSSL
diff -r f8d870fe4d52 -r 420db013ea4f external/bsd/ntp/dist/kernel/sys/bsd_audioirig.h
--- a/external/bsd/ntp/dist/kernel/sys/bsd_audioirig.h Sat Sep 29 21:52:29 2018 +0000
+++ b/external/bsd/ntp/dist/kernel/sys/bsd_audioirig.h Sat Sep 29 21:52:30 2018 +0000
@@ -1,7 +1,7 @@
-/* $NetBSD: bsd_audioirig.h,v 1.4 2016/01/08 21:35:36 christos Exp $ */
+/* $NetBSD: bsd_audioirig.h,v 1.5 2018/09/29 21:52:31 christos Exp $ */
/*
- * $Header: bsd_audioirig.h,v 1.0 93/08/02 12:42:00
+ * Header
*/
#ifndef _BSD_AUDIOIRIG_H_
diff -r f8d870fe4d52 -r 420db013ea4f external/bsd/ntp/dist/lib/isc/alpha/include/isc/atomic.h
--- a/external/bsd/ntp/dist/lib/isc/alpha/include/isc/atomic.h Sat Sep 29 21:52:29 2018 +0000
+++ b/external/bsd/ntp/dist/lib/isc/alpha/include/isc/atomic.h Sat Sep 29 21:52:30 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic.h,v 1.4 2016/01/08 21:35:36 christos Exp $ */
+/* $NetBSD: atomic.h,v 1.5 2018/09/29 21:52:31 christos Exp $ */
/*
* Copyright (C) 2005, 2007, 2009 Internet Systems Consortium, Inc. ("ISC")
@@ -16,7 +16,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* Id: atomic.h,v 1.7 2009/04/08 06:48:23 tbox Exp */
+/* Id */
/*
* This code was written based on FreeBSD's kernel source whose copyright
diff -r f8d870fe4d52 -r 420db013ea4f external/bsd/ntp/dist/lib/isc/app_api.c
--- a/external/bsd/ntp/dist/lib/isc/app_api.c Sat Sep 29 21:52:29 2018 +0000
+++ b/external/bsd/ntp/dist/lib/isc/app_api.c Sat Sep 29 21:52:30 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: app_api.c,v 1.4 2016/01/08 21:35:36 christos Exp $ */
+/* $NetBSD: app_api.c,v 1.5 2018/09/29 21:52:31 christos Exp $ */
/*
* Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC")
@@ -16,7 +16,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* Id: app_api.c,v 1.5 2009/09/02 23:48:02 tbox Exp */
+/* Id */
#include <config.h>
diff -r f8d870fe4d52 -r 420db013ea4f external/bsd/ntp/dist/lib/isc/assertions.c
--- a/external/bsd/ntp/dist/lib/isc/assertions.c Sat Sep 29 21:52:29 2018 +0000
+++ b/external/bsd/ntp/dist/lib/isc/assertions.c Sat Sep 29 21:52:30 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: assertions.c,v 1.4 2016/01/08 21:35:36 christos Exp $ */
+/* $NetBSD: assertions.c,v 1.5 2018/09/29 21:52:31 christos Exp $ */
/*
* Copyright (C) 2004, 2005, 2007-2009 Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* Id: assertions.c,v 1.26 2009/09/29 15:06:07 fdupont Exp */
+/* Id */
/*! \file */
diff -r f8d870fe4d52 -r 420db013ea4f external/bsd/ntp/dist/lib/isc/backtrace-emptytbl.c
--- a/external/bsd/ntp/dist/lib/isc/backtrace-emptytbl.c Sat Sep 29 21:52:29 2018 +0000
+++ b/external/bsd/ntp/dist/lib/isc/backtrace-emptytbl.c Sat Sep 29 21:52:30 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: backtrace-emptytbl.c,v 1.4 2016/01/08 21:35:36 christos Exp $ */
+/* $NetBSD: backtrace-emptytbl.c,v 1.5 2018/09/29 21:52:31 christos Exp $ */
/*
* Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC")
@@ -16,7 +16,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* Id: backtrace-emptytbl.c,v 1.3 2009/09/01 20:13:44 each Exp */
+/* Id */
/*! \file */
diff -r f8d870fe4d52 -r 420db013ea4f external/bsd/ntp/dist/lib/isc/backtrace.c
--- a/external/bsd/ntp/dist/lib/isc/backtrace.c Sat Sep 29 21:52:29 2018 +0000
+++ b/external/bsd/ntp/dist/lib/isc/backtrace.c Sat Sep 29 21:52:30 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: backtrace.c,v 1.6 2016/01/08 21:35:36 christos Exp $ */
+/* $NetBSD: backtrace.c,v 1.7 2018/09/29 21:52:31 christos Exp $ */
/*
* Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC")
@@ -16,7 +16,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* Id: backtrace.c,v 1.3 2009/09/02 23:48:02 tbox Exp */
+/* Id */
/*! \file */
diff -r f8d870fe4d52 -r 420db013ea4f external/bsd/ntp/dist/lib/isc/base32.c
--- a/external/bsd/ntp/dist/lib/isc/base32.c Sat Sep 29 21:52:29 2018 +0000
+++ b/external/bsd/ntp/dist/lib/isc/base32.c Sat Sep 29 21:52:30 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: base32.c,v 1.4 2016/01/08 21:35:36 christos Exp $ */
+/* $NetBSD: base32.c,v 1.5 2018/09/29 21:52:31 christos Exp $ */
/*
* Copyright (C) 2008, 2009 Internet Systems Consortium, Inc. ("ISC")
@@ -16,7 +16,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* Id: base32.c,v 1.6 2009/10/21 01:22:29 each Exp */
+/* Id */
/*! \file */
diff -r f8d870fe4d52 -r 420db013ea4f external/bsd/ntp/dist/lib/isc/base64.c
--- a/external/bsd/ntp/dist/lib/isc/base64.c Sat Sep 29 21:52:29 2018 +0000
+++ b/external/bsd/ntp/dist/lib/isc/base64.c Sat Sep 29 21:52:30 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: base64.c,v 1.4 2016/01/08 21:35:36 christos Exp $ */
+/* $NetBSD: base64.c,v 1.5 2018/09/29 21:52:31 christos Exp $ */
/*
* Copyright (C) 2004, 2005, 2007, 2009 Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* Id: base64.c,v 1.34 2009/10/21 23:48:05 tbox Exp */
+/* Id */
/*! \file */
diff -r f8d870fe4d52 -r 420db013ea4f external/bsd/ntp/dist/lib/isc/bitstring.c
--- a/external/bsd/ntp/dist/lib/isc/bitstring.c Sat Sep 29 21:52:29 2018 +0000
+++ b/external/bsd/ntp/dist/lib/isc/bitstring.c Sat Sep 29 21:52:30 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bitstring.c,v 1.4 2016/01/08 21:35:36 christos Exp $ */
+/* $NetBSD: bitstring.c,v 1.5 2018/09/29 21:52:31 christos Exp $ */
/*
* Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* Id: bitstring.c,v 1.17 2007/06/19 23:47:17 tbox Exp */
+/* Id */
/*! \file */
diff -r f8d870fe4d52 -r 420db013ea4f external/bsd/ntp/dist/lib/isc/buffer.c
--- a/external/bsd/ntp/dist/lib/isc/buffer.c Sat Sep 29 21:52:29 2018 +0000
+++ b/external/bsd/ntp/dist/lib/isc/buffer.c Sat Sep 29 21:52:30 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: buffer.c,v 1.4 2016/01/08 21:35:36 christos Exp $ */
+/* $NetBSD: buffer.c,v 1.5 2018/09/29 21:52:31 christos Exp $ */
/*
* Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* Id: buffer.c,v 1.49 2008/09/25 04:02:39 tbox Exp */
+/* Id */
/*! \file */
diff -r f8d870fe4d52 -r 420db013ea4f external/bsd/ntp/dist/lib/isc/bufferlist.c
--- a/external/bsd/ntp/dist/lib/isc/bufferlist.c Sat Sep 29 21:52:29 2018 +0000
+++ b/external/bsd/ntp/dist/lib/isc/bufferlist.c Sat Sep 29 21:52:30 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bufferlist.c,v 1.4 2016/01/08 21:35:36 christos Exp $ */
+/* $NetBSD: bufferlist.c,v 1.5 2018/09/29 21:52:31 christos Exp $ */
/*
Home |
Main Index |
Thread Index |
Old Index