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/da05f951d2b8
branches: trunk
changeset: 341184:da05f951d2b8
user: christos <christos%NetBSD.org@localhost>
date: Fri Oct 23 18:06:19 2015 +0000
description:
merge conflicts
diffstat:
external/bsd/ntp/dist/adjtimed/adjtimed.c | 4 +-
external/bsd/ntp/dist/clockstuff/chutest.c | 4 +-
external/bsd/ntp/dist/clockstuff/propdelay.c | 4 +-
external/bsd/ntp/dist/include/ntp_assert.h | 6 +-
external/bsd/ntp/dist/include/ntp_calendar.h | 15 +-
external/bsd/ntp/dist/include/ntp_config.h | 6 +-
external/bsd/ntp/dist/include/ntp_control.h | 4 +-
external/bsd/ntp/dist/include/ntp_lists.h | 8 +-
external/bsd/ntp/dist/include/ntp_stdlib.h | 3 +-
external/bsd/ntp/dist/include/ntp_syslog.h | 3 +-
external/bsd/ntp/dist/include/ntp_types.h | 5 +-
external/bsd/ntp/dist/libntp/atolfp.c | 4 +-
external/bsd/ntp/dist/libntp/audio.c | 15 +-
external/bsd/ntp/dist/libntp/authkeys.c | 14 +-
external/bsd/ntp/dist/libntp/authreadkeys.c | 91 +-
external/bsd/ntp/dist/libntp/caljulian.c | 4 +-
external/bsd/ntp/dist/libntp/caltontp.c | 16 +-
external/bsd/ntp/dist/libntp/decodenetnum.c | 11 +-
external/bsd/ntp/dist/libntp/emalloc.c | 4 +-
external/bsd/ntp/dist/libntp/icom.c | 30 +-
external/bsd/ntp/dist/libntp/machines.c | 8 +-
external/bsd/ntp/dist/libntp/msyslog.c | 26 +-
external/bsd/ntp/dist/libntp/ntp_calendar.c | 776 +++--
external/bsd/ntp/dist/libntp/ntp_intres.c | 26 +-
external/bsd/ntp/dist/libntp/ntp_lineedit.c | 4 +-
external/bsd/ntp/dist/libntp/ntp_rfc2553.c | 4 +-
external/bsd/ntp/dist/libntp/ntp_worker.c | 4 +-
external/bsd/ntp/dist/libntp/prettydate.c | 4 +-
external/bsd/ntp/dist/libntp/recvbuff.c | 4 +-
external/bsd/ntp/dist/libntp/socket.c | 6 +-
external/bsd/ntp/dist/libntp/socktohost.c | 4 +-
external/bsd/ntp/dist/libntp/statestr.c | 4 +-
external/bsd/ntp/dist/ntpd/ntp_config.c | 61 +-
external/bsd/ntp/dist/ntpd/ntp_control.c | 75 +-
external/bsd/ntp/dist/ntpd/ntp_crypto.c | 136 +-
external/bsd/ntp/dist/ntpd/ntp_io.c | 86 +-
external/bsd/ntp/dist/ntpd/ntp_loopfilter.c | 10 +-
external/bsd/ntp/dist/ntpd/ntp_monitor.c | 8 +-
external/bsd/ntp/dist/ntpd/ntp_parser.y | 43 +-
external/bsd/ntp/dist/ntpd/ntp_peer.c | 15 +-
external/bsd/ntp/dist/ntpd/ntp_proto.c | 301 +-
external/bsd/ntp/dist/ntpd/ntp_refclock.c | 4 +-
external/bsd/ntp/dist/ntpd/ntp_request.c | 12 +-
external/bsd/ntp/dist/ntpd/ntp_restrict.c | 30 +-
external/bsd/ntp/dist/ntpd/ntp_timer.c | 8 +-
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 | 108 +-
external/bsd/ntp/dist/ntpd/rc_cmdlength.c | 3 +-
external/bsd/ntp/dist/ntpd/refclock_arc.c | 4 +-
external/bsd/ntp/dist/ntpd/refclock_chu.c | 4 +-
external/bsd/ntp/dist/ntpd/refclock_gpsdjson.c | 20 +-
external/bsd/ntp/dist/ntpd/refclock_local.c | 20 +-
external/bsd/ntp/dist/ntpd/refclock_nmea.c | 9 +-
external/bsd/ntp/dist/ntpd/refclock_palisade.c | 6 +-
external/bsd/ntp/dist/ntpd/refclock_parse.c | 5 +-
external/bsd/ntp/dist/ntpd/refclock_wwv.c | 8 +-
external/bsd/ntp/dist/ntpdate/ntpdate.c | 4 +-
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 | 6 +-
external/bsd/ntp/dist/ntpq/libntpq.h | 4 +-
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 | 18 +-
external/bsd/ntp/dist/ntpq/ntpq.c | 24 +-
external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.c | 16 +-
external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.h | 8 +-
external/bsd/ntp/dist/sntp/libevent/sample/dns-example.c | 250 --
external/bsd/ntp/dist/sntp/libevent/sample/event-read-fifo.c | 164 -
external/bsd/ntp/dist/sntp/libevent/sample/hello-world.c | 143 -
external/bsd/ntp/dist/sntp/libevent/sample/hostcheck.c | 219 -
external/bsd/ntp/dist/sntp/libevent/sample/hostcheck.h | 32 -
external/bsd/ntp/dist/sntp/libevent/sample/http-server.c | 420 ---
external/bsd/ntp/dist/sntp/libevent/sample/https-client.c | 441 ---
external/bsd/ntp/dist/sntp/libevent/sample/include.am | 53 -
external/bsd/ntp/dist/sntp/libevent/sample/le-proxy.c | 290 --
external/bsd/ntp/dist/sntp/libevent/sample/openssl_hostname_validation.c | 174 -
external/bsd/ntp/dist/sntp/libevent/sample/openssl_hostname_validation.h | 58 -
external/bsd/ntp/dist/sntp/libevent/sample/signal-test.c | 77 -
external/bsd/ntp/dist/sntp/libevent/sample/time-test.c | 109 -
external/bsd/ntp/dist/sntp/libevent/test/bench_httpclient.c | 6 +-
external/bsd/ntp/dist/sntp/libevent/test/regress.c | 6 +-
external/bsd/ntp/dist/sntp/libevent/test/regress_dns.c | 7 +-
external/bsd/ntp/dist/sntp/libevent/test/regress_http.c | 6 +-
external/bsd/ntp/dist/sntp/libevent/test/regress_minheap.c | 3 +-
external/bsd/ntp/dist/sntp/libevent/test/test-ratelim.c | 6 +-
external/bsd/ntp/dist/sntp/libevent/test/test-time.c | 3 +-
external/bsd/ntp/dist/sntp/libopts/compat/pathfind.c | 15 +-
external/bsd/ntp/dist/sntp/log.c | 23 +-
external/bsd/ntp/dist/sntp/log.h | 4 +-
external/bsd/ntp/dist/sntp/networking.c | 4 +-
external/bsd/ntp/dist/sntp/sntp-opts.c | 16 +-
external/bsd/ntp/dist/sntp/sntp-opts.h | 8 +-
external/bsd/ntp/dist/sntp/tests/fileHandlingTest.h | 102 -
external/bsd/ntp/dist/sntp/tests/g_fileHandlingTest.h | 66 -
external/bsd/ntp/dist/sntp/tests/g_networking.cpp | 5 -
external/bsd/ntp/dist/sntp/tests/g_packetHandling.cpp | 264 --
external/bsd/ntp/dist/sntp/tests/g_packetProcessing.cpp | 334 --
external/bsd/ntp/dist/sntp/tests/g_sntptest.h | 37 -
external/bsd/ntp/dist/sntp/tests/sntptest.h | 28 +-
external/bsd/ntp/dist/sntp/tests_main.cpp | 29 -
external/bsd/ntp/dist/sntp/tests_main.h | 24 -
external/bsd/ntp/dist/tests/libntp/g_a_md5encrypt.cpp | 89 -
external/bsd/ntp/dist/tests/libntp/g_atoint.cpp | 48 -
external/bsd/ntp/dist/tests/libntp/g_atouint.cpp | 40 -
external/bsd/ntp/dist/tests/libntp/g_authkeys.cpp | 100 -
external/bsd/ntp/dist/tests/libntp/g_buftvtots.cpp | 61 -
external/bsd/ntp/dist/tests/libntp/g_calendar.cpp | 337 --
external/bsd/ntp/dist/tests/libntp/g_caljulian.cpp | 94 -
external/bsd/ntp/dist/tests/libntp/g_caltontp.cpp | 49 -
external/bsd/ntp/dist/tests/libntp/g_calyearstart.cpp | 43 -
external/bsd/ntp/dist/tests/libntp/g_clocktime.cpp | 187 -
external/bsd/ntp/dist/tests/libntp/g_decodenetnum.cpp | 93 -
external/bsd/ntp/dist/tests/libntp/g_hextoint.cpp | 42 -
external/bsd/ntp/dist/tests/libntp/g_hextolfp.cpp | 58 -
external/bsd/ntp/dist/tests/libntp/g_humandate.cpp | 41 -
external/bsd/ntp/dist/tests/libntp/g_lfpfunc.cpp | 547 ----
external/bsd/ntp/dist/tests/libntp/g_lfptest.h | 34 -
external/bsd/ntp/dist/tests/libntp/g_lfptostr.cpp | 103 -
external/bsd/ntp/dist/tests/libntp/g_libntptest.cpp | 27 -
external/bsd/ntp/dist/tests/libntp/g_libntptest.h | 17 -
external/bsd/ntp/dist/tests/libntp/g_modetoa.cpp | 16 -
external/bsd/ntp/dist/tests/libntp/g_msyslog.cpp | 137 -
external/bsd/ntp/dist/tests/libntp/g_netof.cpp | 69 -
external/bsd/ntp/dist/tests/libntp/g_numtoa.cpp | 18 -
external/bsd/ntp/dist/tests/libntp/g_numtohost.cpp | 15 -
external/bsd/ntp/dist/tests/libntp/g_octtoint.cpp | 57 -
external/bsd/ntp/dist/tests/libntp/g_prettydate.cpp | 16 -
external/bsd/ntp/dist/tests/libntp/g_recvbuff.cpp | 38 -
external/bsd/ntp/dist/tests/libntp/g_refnumtoa.cpp | 52 -
external/bsd/ntp/dist/tests/libntp/g_sfptostr.cpp | 71 -
external/bsd/ntp/dist/tests/libntp/g_sockaddrtest.h | 61 -
external/bsd/ntp/dist/tests/libntp/g_socktoa.cpp | 100 -
external/bsd/ntp/dist/tests/libntp/g_ssl_init.cpp | 50 -
external/bsd/ntp/dist/tests/libntp/g_statestr.cpp | 28 -
external/bsd/ntp/dist/tests/libntp/g_strtolfp.cpp | 107 -
external/bsd/ntp/dist/tests/libntp/g_timespecops.cpp | 475 ---
external/bsd/ntp/dist/tests/libntp/g_timestructs.cpp | 156 -
external/bsd/ntp/dist/tests/libntp/g_timestructs.h | 187 -
external/bsd/ntp/dist/tests/libntp/g_timevalops.cpp | 480 ----
external/bsd/ntp/dist/tests/libntp/g_tstotv.cpp | 57 -
external/bsd/ntp/dist/tests/libntp/g_tvtots.cpp | 54 -
external/bsd/ntp/dist/tests/libntp/g_uglydate.cpp | 18 -
external/bsd/ntp/dist/tests/libntp/g_vi64ops.cpp | 64 -
external/bsd/ntp/dist/tests/libntp/g_ymd2yd.cpp | 23 -
external/bsd/ntp/dist/tests/libntp/lfptest.h | 22 +-
external/bsd/ntp/dist/tests/libntp/sockaddrtest.h | 52 +-
external/bsd/ntp/dist/tests/ntpd/leapsec.cpp | 1193 ----------
external/bsd/ntp/dist/tests/ntpd/ntpdtest.cpp | 27 -
external/bsd/ntp/dist/tests/ntpd/ntpdtest.h | 17 -
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/ntp-keygen.c | 8 +-
external/bsd/ntp/dist/util/ntptime.c | 6 +-
external/bsd/ntp/importdate | 2 +-
external/bsd/ntp/include/config.h | 6 +-
157 files changed, 1539 insertions(+), 9852 deletions(-)
diffs (truncated from 15079 to 300 lines):
diff -r 3867f0d1c9cf -r da05f951d2b8 external/bsd/ntp/dist/adjtimed/adjtimed.c
--- a/external/bsd/ntp/dist/adjtimed/adjtimed.c Fri Oct 23 17:47:36 2015 +0000
+++ b/external/bsd/ntp/dist/adjtimed/adjtimed.c Fri Oct 23 18:06:19 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: adjtimed.c,v 1.3 2015/07/10 14:20:28 christos Exp $ */
+/* $NetBSD: adjtimed.c,v 1.4 2015/10/23 18:06:19 christos Exp $ */
/*************************************************************************/
/* (c) Copyright Tai Jin, 1988. All Rights Reserved. */
@@ -60,7 +60,7 @@
/* 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 -r 3867f0d1c9cf -r da05f951d2b8 external/bsd/ntp/dist/clockstuff/chutest.c
--- a/external/bsd/ntp/dist/clockstuff/chutest.c Fri Oct 23 17:47:36 2015 +0000
+++ b/external/bsd/ntp/dist/clockstuff/chutest.c Fri Oct 23 18:06:19 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: chutest.c,v 1.3 2015/07/10 14:20:28 christos Exp $ */
+/* $NetBSD: chutest.c,v 1.4 2015/10/23 18:06:19 christos Exp $ */
/* chutest.c,v 3.1 1993/07/06 01:05:21 jbj Exp
* chutest - test the CHU clock
@@ -58,7 +58,7 @@
#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 -r 3867f0d1c9cf -r da05f951d2b8 external/bsd/ntp/dist/clockstuff/propdelay.c
--- a/external/bsd/ntp/dist/clockstuff/propdelay.c Fri Oct 23 17:47:36 2015 +0000
+++ b/external/bsd/ntp/dist/clockstuff/propdelay.c Fri Oct 23 18:06:19 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: propdelay.c,v 1.3 2015/07/10 14:20:28 christos Exp $ */
+/* $NetBSD: propdelay.c,v 1.4 2015/10/23 18:06:19 christos Exp $ */
/* propdelay.c,v 3.1 1993/07/06 01:05:24 jbj Exp
* propdelay - compute propagation delays
@@ -119,7 +119,7 @@
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 -r 3867f0d1c9cf -r da05f951d2b8 external/bsd/ntp/dist/include/ntp_assert.h
--- a/external/bsd/ntp/dist/include/ntp_assert.h Fri Oct 23 17:47:36 2015 +0000
+++ b/external/bsd/ntp/dist/include/ntp_assert.h Fri Oct 23 18:06:19 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ntp_assert.h,v 1.3 2015/07/10 14:20:29 christos Exp $ */
+/* $NetBSD: ntp_assert.h,v 1.4 2015/10/23 18:06:19 christos Exp $ */
/*
* ntp_assert.h - design by contract stuff
@@ -90,10 +90,6 @@
* 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 -r 3867f0d1c9cf -r da05f951d2b8 external/bsd/ntp/dist/include/ntp_calendar.h
--- a/external/bsd/ntp/dist/include/ntp_calendar.h Fri Oct 23 17:47:36 2015 +0000
+++ b/external/bsd/ntp/dist/include/ntp_calendar.h Fri Oct 23 18:06:19 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ntp_calendar.h,v 1.4 2015/07/10 14:20:29 christos Exp $ */
+/* $NetBSD: ntp_calendar.h,v 1.5 2015/10/23 18:06:19 christos Exp $ */
/*
* ntp_calendar.h - definitions for the calendar time-of-day routine
@@ -159,6 +159,12 @@
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.
*/
@@ -222,6 +228,9 @@
*
* 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 */);
@@ -332,6 +341,10 @@
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 -r 3867f0d1c9cf -r da05f951d2b8 external/bsd/ntp/dist/include/ntp_config.h
--- a/external/bsd/ntp/dist/include/ntp_config.h Fri Oct 23 17:47:36 2015 +0000
+++ b/external/bsd/ntp/dist/include/ntp_config.h Fri Oct 23 18:06:19 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ntp_config.h,v 1.8 2015/07/10 14:20:29 christos Exp $ */
+/* $NetBSD: ntp_config.h,v 1.9 2015/10/23 18:06:19 christos Exp $ */
#ifndef NTP_CONFIG_H
#define NTP_CONFIG_H
@@ -48,8 +48,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 -r 3867f0d1c9cf -r da05f951d2b8 external/bsd/ntp/dist/include/ntp_control.h
--- a/external/bsd/ntp/dist/include/ntp_control.h Fri Oct 23 17:47:36 2015 +0000
+++ b/external/bsd/ntp/dist/include/ntp_control.h Fri Oct 23 18:06:19 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ntp_control.h,v 1.3 2015/07/10 14:20:29 christos Exp $ */
+/* $NetBSD: ntp_control.h,v 1.4 2015/10/23 18:06:19 christos Exp $ */
/*
* ntp_control.h - definitions related to NTP mode 6 control messages
@@ -106,7 +106,7 @@
#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 -r 3867f0d1c9cf -r da05f951d2b8 external/bsd/ntp/dist/include/ntp_lists.h
--- a/external/bsd/ntp/dist/include/ntp_lists.h Fri Oct 23 17:47:36 2015 +0000
+++ b/external/bsd/ntp/dist/include/ntp_lists.h Fri Oct 23 18:06:19 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ntp_lists.h,v 1.3 2015/07/10 14:20:29 christos Exp $ */
+/* $NetBSD: ntp_lists.h,v 1.4 2015/10/23 18:06:19 christos Exp $ */
/*
* ntp_lists.h - linked lists common code
@@ -217,9 +217,9 @@
\
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 -r 3867f0d1c9cf -r da05f951d2b8 external/bsd/ntp/dist/include/ntp_stdlib.h
--- a/external/bsd/ntp/dist/include/ntp_stdlib.h Fri Oct 23 17:47:36 2015 +0000
+++ b/external/bsd/ntp/dist/include/ntp_stdlib.h Fri Oct 23 18:06:19 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ntp_stdlib.h,v 1.10 2015/10/14 15:55:42 christos Exp $ */
+/* $NetBSD: ntp_stdlib.h,v 1.11 2015/10/23 18:06:19 christos Exp $ */
/*
* ntp_stdlib.h - Prototypes for NTP lib.
@@ -35,6 +35,7 @@
extern int msnprintf(char *, size_t, const char *, ...)
NTP_SYSLOG(3, 4);
extern void msyslog(int, const char *, ...) NTP_SYSLOG(2, 3);
+extern void mvsyslog(int, const char *, va_list) NTP_SYSLOG(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 -r 3867f0d1c9cf -r da05f951d2b8 external/bsd/ntp/dist/include/ntp_syslog.h
--- a/external/bsd/ntp/dist/include/ntp_syslog.h Fri Oct 23 17:47:36 2015 +0000
+++ b/external/bsd/ntp/dist/include/ntp_syslog.h Fri Oct 23 18:06:19 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ntp_syslog.h,v 1.3 2015/07/10 14:20:29 christos Exp $ */
+/* $NetBSD: ntp_syslog.h,v 1.4 2015/10/23 18:06:19 christos Exp $ */
/*
* A hack for platforms which require specially built syslog facilities
@@ -11,6 +11,7 @@
#ifdef VMS
extern void msyslog();
+extern void mvsyslog();
#else
# ifndef SYS_VXWORKS
# include <syslog.h>
diff -r 3867f0d1c9cf -r da05f951d2b8 external/bsd/ntp/dist/include/ntp_types.h
--- a/external/bsd/ntp/dist/include/ntp_types.h Fri Oct 23 17:47:36 2015 +0000
+++ b/external/bsd/ntp/dist/include/ntp_types.h Fri Oct 23 18:06:19 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ntp_types.h,v 1.3 2015/07/10 14:20:29 christos Exp $ */
+/* $NetBSD: ntp_types.h,v 1.4 2015/10/23 18:06:19 christos Exp $ */
/*
* ntp_types.h - defines how int32 and u_int32 are treated.
@@ -17,7 +17,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 -r 3867f0d1c9cf -r da05f951d2b8 external/bsd/ntp/dist/libntp/atolfp.c
--- a/external/bsd/ntp/dist/libntp/atolfp.c Fri Oct 23 17:47:36 2015 +0000
+++ b/external/bsd/ntp/dist/libntp/atolfp.c Fri Oct 23 18:06:19 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: atolfp.c,v 1.6 2015/07/10 14:20:32 christos Exp $ */
+/* $NetBSD: atolfp.c,v 1.7 2015/10/23 18:06:19 christos Exp $ */
/*
* atolfp - convert an ascii string to an l_fp number
@@ -42,7 +42,7 @@
int isneg;
static const char *digits = "0123456789";
- NTP_REQUIRE(str != NULL);
+ REQUIRE(str != NULL);
isneg = 0;
dec_i = dec_f = 0;
diff -r 3867f0d1c9cf -r da05f951d2b8 external/bsd/ntp/dist/libntp/audio.c
--- a/external/bsd/ntp/dist/libntp/audio.c Fri Oct 23 17:47:36 2015 +0000
+++ b/external/bsd/ntp/dist/libntp/audio.c Fri Oct 23 18:06:19 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.8 2015/07/10 14:20:32 christos Exp $ */
+/* $NetBSD: audio.c,v 1.9 2015/10/23 18:06:19 christos Exp $ */
/*
* audio.c - audio interface for reference clock audio drivers
@@ -379,7 +379,9 @@
#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
@@ -394,10 +396,11 @@
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 -r 3867f0d1c9cf -r da05f951d2b8 external/bsd/ntp/dist/libntp/authkeys.c
--- a/external/bsd/ntp/dist/libntp/authkeys.c Fri Oct 23 17:47:36 2015 +0000
+++ b/external/bsd/ntp/dist/libntp/authkeys.c Fri Oct 23 18:06:19 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: authkeys.c,v 1.6 2015/07/10 14:20:32 christos Exp $ */
+/* $NetBSD: authkeys.c,v 1.7 2015/10/23 18:06:19 christos Exp $ */
/*
* authkeys.c - routines to manage the storage of authentication keys
@@ -536,6 +536,12 @@
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);
Home |
Main Index |
Thread Index |
Old Index