Merge remote-tracking branch 'origin/stable/10' into devel

14 files changed, 187 insertions, 131 deletions

diff --git a/contrib/ntp/ntpq/invoke-ntpq.texi b/contrib/ntp/ntpq/invoke-ntpq.texi
index fa0f5d7..b01127c 100644
--- a/contrib/ntp/ntpq/invoke-ntpq.texi
+++ b/contrib/ntp/ntpq/invoke-ntpq.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntpq.texi)
 #
-# It has been AutoGen-ed  October 21, 2015 at 12:39:27 PM by AutoGen 5.18.5
+# It has been AutoGen-ed  January  7, 2016 at 11:32:00 PM by AutoGen 5.18.5
 # From the definitions    ntpq-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -847,7 +847,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntpq - standard NTP query program - Ver. 4.2.8p4
+ntpq - standard NTP query program - Ver. 4.2.8p5
 Usage:  ntpq [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
diff --git a/contrib/ntp/ntpq/libntpq.c b/contrib/ntp/ntpq/libntpq.c
index becd956..3070e47 100644
--- a/contrib/ntp/ntpq/libntpq.c
+++ b/contrib/ntp/ntpq/libntpq.c
@@ -132,7 +132,7 @@ ntpq_getvar(
 {
 	char *	name;
 	char *	value;
-	int	idatalen;
+	size_t	idatalen;
 
 	value = NULL;
 	idatalen = (int)datalen;
@@ -181,8 +181,8 @@ int ntpq_queryhost(unsigned short VARSET, unsigned short association, char *resu
 {
 	const char *datap;
 	int res;
-	int dsize;
-	u_short rstatus;
+	size_t	dsize;
+	u_short	rstatus;
 	
 	if ( numhosts > 0 )
 		res = doquery(VARSET,association,0,0, (char *)0, &rstatus, &dsize, &datap);
@@ -417,7 +417,7 @@ ntpq_read_assoc_peervars(
 {
 	const char *	datap;
 	int		res;
-	int		dsize;
+	size_t		dsize;
 	u_short		rstatus;
 
 	res = doquery(CTL_OP_READVAR, associd, 0, 0, NULL, &rstatus,
@@ -474,24 +474,22 @@ ntpq_read_sysvars(
 {
 	const char *	datap;
 	int		res;
-	int		i_dsize;
 	size_t		dsize;
 	u_short		rstatus;
 
 	res = doquery(CTL_OP_READVAR, 0, 0, 0, NULL, &rstatus,
-		      &i_dsize, &datap);
+		      &dsize, &datap);
 
 	if (res != 0)
 		return 0;
 
-	if (i_dsize == 0) {
+	if (dsize == 0) {
 		if (numhosts > 1)
 			fprintf(stderr, "server=%s ", currenthost);
 		fprintf(stderr, "***No sysvar information returned\n");
 
 		return 0;
 	} else {
-		dsize = max(0, i_dsize);
 		dsize = min(dsize, maxsize);
 		memcpy(resultbuf, datap, dsize);
 	}
@@ -661,7 +659,7 @@ ntpq_read_assoc_clockvars(
 {
 	const char *datap;
 	int res;
-	int dsize;
+	size_t dsize;
 	u_short rstatus;
 
 	res = ntpq_doquerylist(ntpq_varlist, CTL_OP_READCLOCK, associd,
diff --git a/contrib/ntp/ntpq/libntpq.h b/contrib/ntp/ntpq/libntpq.h
index 84a622b..74caf27 100644
--- a/contrib/ntp/ntpq/libntpq.h
+++ b/contrib/ntp/ntpq/libntpq.h
@@ -106,4 +106,4 @@ extern int ntpq_read_assoc_clockvars( associd_t associd, char *resultbuf, int ma
 extern int ntpq_dogetassoc(void);
 extern char ntpq_decodeaddrtype(sockaddr_u *sock);
 extern int ntpq_doquerylist(struct ntpq_varlist *, int, associd_t, int,
-			    u_short *, int *, const char **datap);
+			    u_short *, size_t *, const char **datap);
diff --git a/contrib/ntp/ntpq/libntpq_subs.c b/contrib/ntp/ntpq/libntpq_subs.c
index e53b419..b232065 100644
--- a/contrib/ntp/ntpq/libntpq_subs.c
+++ b/contrib/ntp/ntpq/libntpq_subs.c
@@ -42,7 +42,7 @@ ntpq_doquerylist(
 	associd_t associd,
 	int auth,
 	u_short *rstatus,
-	int *dsize,
+	size_t *dsize,
 	const char **datap
 	)
 {
diff --git a/contrib/ntp/ntpq/ntpq-opts.c b/contrib/ntp/ntpq/ntpq-opts.c
index 2232928..69f4881 100644
--- a/contrib/ntp/ntpq/ntpq-opts.c
+++ b/contrib/ntp/ntpq/ntpq-opts.c
@@ -1,7 +1,7 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (ntpq-opts.c)
  *
- *  It has been AutoGen-ed  October 21, 2015 at 12:39:00 PM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  January  7, 2016 at 11:31:32 PM by AutoGen 5.18.5
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -69,7 +69,7 @@ extern FILE * option_usage_fp;
  *  static const strings for ntpq options
  */
 static char const ntpq_opt_strs[1925] =
-/*     0 */ "ntpq 4.2.8p4\n"
+/*     0 */ "ntpq 4.2.8p5\n"
             "Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n"
             "This is free software. It is licensed for use, modification and\n"
             "redistribution under the terms of the NTP License, copies of which\n"
@@ -129,13 +129,13 @@ static char const ntpq_opt_strs[1925] =
 /*  1723 */ "no-load-opts\0"
 /*  1736 */ "no\0"
 /*  1739 */ "NTPQ\0"
-/*  1744 */ "ntpq - standard NTP query program - Ver. 4.2.8p4\n"
+/*  1744 */ "ntpq - standard NTP query program - Ver. 4.2.8p5\n"
             "Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n\0"
 /*  1863 */ "$HOME\0"
 /*  1869 */ ".\0"
 /*  1871 */ ".ntprc\0"
 /*  1878 */ "http://bugs.ntp.org, bugs@ntp.org\0"
-/*  1912 */ "ntpq 4.2.8p4";
+/*  1912 */ "ntpq 4.2.8p5";
 
 /**
  *  ipv4 option description with
@@ -786,7 +786,7 @@ static void bogus_function(void) {
      translate option names.
    */
   /* referenced via ntpqOptions.pzCopyright */
-  puts(_("ntpq 4.2.8p4\n\
+  puts(_("ntpq 4.2.8p5\n\
 Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n\
 This is free software. It is licensed for use, modification and\n\
 redistribution under the terms of the NTP License, copies of which\n\
@@ -852,11 +852,11 @@ implied warranty.\n"));
   puts(_("load options from a config file"));
 
   /* referenced via ntpqOptions.pzUsageTitle */
-  puts(_("ntpq - standard NTP query program - Ver. 4.2.8p4\n\
+  puts(_("ntpq - standard NTP query program - Ver. 4.2.8p5\n\
 Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n"));
 
   /* referenced via ntpqOptions.pzFullVersion */
-  puts(_("ntpq 4.2.8p4"));
+  puts(_("ntpq 4.2.8p5"));
 
   /* referenced via ntpqOptions.pzFullUsage */
   puts(_("<<<NOT-FOUND>>>"));
diff --git a/contrib/ntp/ntpq/ntpq-opts.h b/contrib/ntp/ntpq/ntpq-opts.h
index f82ccae..758817f 100644
--- a/contrib/ntp/ntpq/ntpq-opts.h
+++ b/contrib/ntp/ntpq/ntpq-opts.h
@@ -1,7 +1,7 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (ntpq-opts.h)
  *
- *  It has been AutoGen-ed  October 21, 2015 at 12:39:00 PM by AutoGen 5.18.5
+ *  It has been AutoGen-ed  January  7, 2016 at 11:31:32 PM by AutoGen 5.18.5
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -83,9 +83,9 @@ typedef enum {
 /** count of all options for ntpq */
 #define OPTION_CT    15
 /** ntpq version */
-#define NTPQ_VERSION       "4.2.8p4"
+#define NTPQ_VERSION       "4.2.8p5"
 /** Full ntpq version text */
-#define NTPQ_FULL_VERSION  "ntpq 4.2.8p4"
+#define NTPQ_FULL_VERSION  "ntpq 4.2.8p5"
 
 /**
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/contrib/ntp/ntpq/ntpq-subs.c b/contrib/ntp/ntpq/ntpq-subs.c
index 78143b3..438c7ca 100644
--- a/contrib/ntp/ntpq/ntpq-subs.c
+++ b/contrib/ntp/ntpq/ntpq-subs.c
@@ -22,9 +22,9 @@ static	struct varlist *findlistvar (struct varlist *, char *);
 static	void	doaddvlist	(struct varlist *, const char *);
 static	void	dormvlist	(struct varlist *, const char *);
 static	void	doclearvlist	(struct varlist *);
-static	void	makequerydata	(struct varlist *, int *, char *);
+static	void	makequerydata	(struct varlist *, size_t *, char *);
 static	int	doquerylist	(struct varlist *, int, associd_t, int,
-				 u_short *, int *, const char **);
+				 u_short *, size_t *, const char **);
 static	void	doprintvlist	(struct varlist *, FILE *);
 static	void	addvars 	(struct parse *, FILE *);
 static	void	rmvars		(struct parse *, FILE *);
@@ -56,7 +56,7 @@ static	void	authinfo	(struct parse *, FILE *);
 static	void	pstats	 	(struct parse *, FILE *);
 static	long	when		(l_fp *, l_fp *, l_fp *);
 static	char *	prettyinterval	(char *, size_t, long);
-static	int	doprintpeers	(struct varlist *, int, int, int, const char *, FILE *, int);
+static	int	doprintpeers	(struct varlist *, int, int, size_t, const char *, FILE *, int);
 static	int	dogetpeers	(struct varlist *, associd_t, FILE *, int);
 static	void	dopeers 	(int, FILE *, int);
 static	void	peers		(struct parse *, FILE *);
@@ -343,7 +343,7 @@ typedef struct var_display_collection_tag {
 /*
  * other local function prototypes
  */
-void		mrulist_ctrl_c_hook(void);
+static int	mrulist_ctrl_c_hook(void);
 static mru *	add_mru(mru *);
 static int	collect_mru_list(const char *, l_fp *);
 static int	fetch_nonce(char *, size_t);
@@ -440,7 +440,7 @@ doaddvlist(
 	)
 {
 	struct varlist *vl;
-	int len;
+	size_t len;
 	char *name;
 	char *value;
 
@@ -475,7 +475,7 @@ dormvlist(
 	)
 {
 	struct varlist *vl;
-	int len;
+	size_t len;
 	char *name;
 	char *value;
 
@@ -527,14 +527,14 @@ doclearvlist(
 static void
 makequerydata(
 	struct varlist *vlist,
-	int *datalen,
+	size_t *datalen,
 	char *data
 	)
 {
 	register struct varlist *vl;
 	register char *cp, *cpend;
-	register int namelen, valuelen;
-	register int totallen;
+	register size_t namelen, valuelen;
+	register size_t totallen;
 
 	cp = data;
 	cpend = data + *datalen;
@@ -563,7 +563,7 @@ makequerydata(
 			cp += valuelen;
 		}
 	}
-	*datalen = cp - data;
+	*datalen = (size_t)(cp - data);
 }
 
 
@@ -577,12 +577,12 @@ doquerylist(
 	associd_t associd,
 	int auth,
 	u_short *rstatus,
-	int *dsize,
+	size_t *dsize,
 	const char **datap
 	)
 {
 	char data[CTL_MAX_DATA_LEN];
-	int datalen;
+	size_t datalen;
 
 	datalen = sizeof(data);
 	makequerydata(vlist, &datalen, data);
@@ -686,7 +686,7 @@ dolist(
 {
 	const char *datap;
 	int res;
-	int dsize;
+	size_t dsize;
 	u_short rstatus;
 	int quiet;
 
@@ -766,7 +766,7 @@ writelist(
 	const char *datap;
 	int res;
 	associd_t associd;
-	int dsize;
+	size_t dsize;
 	u_short rstatus;
 
 	if (pcmd->nargs == 0) {
@@ -808,8 +808,8 @@ readvar(
 	)
 {
 	associd_t	associd;
-	u_int		tmpcount;
-	u_int		u;
+	size_t		tmpcount;
+	size_t		u;
 	int		type;
 	struct varlist	tmplist[MAXLIST];
 
@@ -849,7 +849,7 @@ writevar(
 	int res;
 	associd_t associd;
 	int type;
-	int dsize;
+	size_t dsize;
 	u_short rstatus;
 	struct varlist tmplist[MAXLIST];
 
@@ -1071,7 +1071,7 @@ dogetassoc(
 	const char *datap;
 	const u_short *pus;
 	int res;
-	int dsize;
+	size_t dsize;
 	u_short rstatus;
 
 	res = doquery(CTL_OP_READSTAT, 0, 0, 0, (char *)0, &rstatus,
@@ -1091,7 +1091,7 @@ dogetassoc(
 		if (numhosts > 1)
 			fprintf(stderr, "server=%s ", currenthost);
 		fprintf(stderr,
-			"***Server returned %d octets, should be multiple of 4\n",
+			"***Server returned %zu octets, should be multiple of 4\n",
 			dsize);
 		return 0;
 	}
@@ -1379,7 +1379,7 @@ saveconfig(
 {
 	const char *datap;
 	int res;
-	int dsize;
+	size_t dsize;
 	u_short rstatus;
 
 	if (0 == pcmd->nargs)
@@ -1396,7 +1396,7 @@ saveconfig(
 	if (0 == dsize)
 		fprintf(fp, "(no response message, curiously)");
 	else
-		fprintf(fp, "%.*s", dsize, datap);
+		fprintf(fp, "%.*s", (int)dsize, datap); /* cast is wobbly */
 }
 
 
@@ -1593,7 +1593,7 @@ doprintpeers(
 	struct varlist *pvl,
 	int associd,
 	int rstatus,
-	int datalen,
+	size_t datalen,
 	const char *data,
 	FILE *fp,
 	int af
@@ -1602,7 +1602,7 @@ doprintpeers(
 	char *name;
 	char *value = NULL;
 	int c;
-	int len;
+	size_t len;
 	int have_srchost;
 	int have_dstadr;
 	int have_da_rid;
@@ -1881,7 +1881,7 @@ dogetpeers(
 {
 	const char *datap;
 	int res;
-	int dsize;
+	size_t dsize;
 	u_short rstatus;
 
 #ifdef notdef
@@ -2186,7 +2186,7 @@ config (
 {
 	const char *cfgcmd;
 	u_short rstatus;
-	int rsize;
+	size_t rsize;
 	const char *rdata;
 	char *resp;
 	int res;
@@ -2201,7 +2201,8 @@ config (
 			"Keyword = %s\n"
 			"Command = %s\n", pcmd->keyword, cfgcmd);
 
-	res = doquery(CTL_OP_CONFIGURE, 0, 1, strlen(cfgcmd), cfgcmd,
+	res = doquery(CTL_OP_CONFIGURE, 0, 1,
+		      strlen(cfgcmd), cfgcmd,
 		      &rstatus, &rsize, &rdata);
 
 	if (res != 0)
@@ -2251,7 +2252,7 @@ config_from_file (
 	)
 {
 	u_short rstatus;
-	int rsize;
+	size_t rsize;
 	const char *rdata;
 	int res;
 	FILE *config_fd;
@@ -2302,7 +2303,7 @@ config_from_file (
 			rsize--;
 		if (rsize > 0 && '\r' == rdata[rsize - 1])
 			rsize--;
-		printf("Line No: %d %.*s: %s", i, rsize, rdata,
+		printf("Line No: %d %.*s: %s", i, (int)rsize, rdata, /* cast is wobbly */
 		       config_cmd);
 	}
 	printf("Done sending file\n");
@@ -2319,9 +2320,9 @@ fetch_nonce(
 	const char	nonce_eq[] = "nonce=";
 	int		qres;
 	u_short		rstatus;
-	int		rsize;
+	size_t		rsize;
 	const char *	rdata;
-	int		chars;
+	size_t		chars;
 
 	/*
 	 * Retrieve a nonce specific to this client to demonstrate to
@@ -2338,7 +2339,7 @@ fetch_nonce(
 	if ((size_t)rsize <= sizeof(nonce_eq) - 1 ||
 	    strncmp(rdata, nonce_eq, sizeof(nonce_eq) - 1)) {
 		fprintf(stderr, "unexpected nonce response format: %.*s\n",
-			rsize, rdata);
+			(int)rsize, rdata); /* cast is wobbly */
 		return FALSE;
 	}
 	chars = rsize - (sizeof(nonce_eq) - 1);
@@ -2421,10 +2422,11 @@ add_mru(
 	} while (0)
 
 
-void
+int
 mrulist_ctrl_c_hook(void)
 {
 	mrulist_interrupted = TRUE;
+	return TRUE;
 }
 
 
@@ -2449,10 +2451,10 @@ collect_mru_list(
 	char req_buf[CTL_MAX_DATA_LEN];
 	char *req;
 	char *req_end;
-	int chars;
+	size_t chars;
 	int qres;
 	u_short rstatus;
-	int rsize;
+	size_t rsize;
 	const char *rdata;
 	int limit;
 	int frags;
@@ -2495,11 +2497,6 @@ collect_mru_list(
 	mon = emalloc_zero(cb);
 	ZERO(*pnow);
 	ZERO(last_older);
-	mrulist_interrupted = FALSE;
-	set_ctrl_c_hook(&mrulist_ctrl_c_hook);
-	fprintf(stderr,
-		"Ctrl-C will stop MRU retrieval and display partial results.\n");
-	fflush(stderr);
 	next_report = time(NULL) + MRU_REPORT_SECS;
 
 	limit = min(3 * MAXFRAGS, ntpd_row_limit);
@@ -2512,8 +2509,9 @@ collect_mru_list(
 		if (debug)
 			fprintf(stderr, "READ_MRU parms: %s\n", req_buf);
 
-		qres = doqueryex(CTL_OP_READ_MRU, 0, 0, strlen(req_buf),
-			         req_buf, &rstatus, &rsize, &rdata, TRUE);
+		qres = doqueryex(CTL_OP_READ_MRU, 0, 0,
+				 strlen(req_buf), req_buf,
+				 &rstatus, &rsize, &rdata, TRUE);
 
 		if (CERR_UNKNOWNVAR == qres && ri > 0) {
 			/*
@@ -2863,14 +2861,13 @@ collect_mru_list(
 				 ri, sptoa(&recent->addr), ri,
 				 recent->last.l_ui, recent->last.l_uf);
 			chars = strlen(buf);
-			if (REQ_ROOM - chars < 1)
+			if (REQ_ROOM <= chars)
 				break;
 			memcpy(req, buf, chars + 1);
 			req += chars;
 		}
 	}
 
-	set_ctrl_c_hook(NULL);
 	c_mru_l_rc = TRUE;
 	goto retain_hash_table;
 
@@ -3080,6 +3077,12 @@ mrulist(
 	int lstint;
 	size_t i;
 
+	mrulist_interrupted = FALSE;
+	push_ctrl_c_handler(&mrulist_ctrl_c_hook);
+	fprintf(stderr,
+		"Ctrl-C will stop MRU retrieval and display partial results.\n");
+	fflush(stderr);
+
 	order = MRUSORT_DEF;
 	parms_buf[0] = '\0';
 	parms = parms_buf;
@@ -3220,6 +3223,8 @@ cleanup_return:
 	free(hash_table);
 	hash_table = NULL;
 	INIT_DLIST(mru_list, mlink);
+
+	pop_ctrl_c_handler(&mrulist_ctrl_c_hook);
 }
 
 
@@ -3317,7 +3322,7 @@ ifstats(
 	const char	up_fmt[] =	"up.%u";	/* uptime */
 	const char *	datap;
 	int		qres;
-	int		dsize;
+	size_t		dsize;
 	u_short		rstatus;
 	char *		tag;
 	char *		val;
@@ -3533,7 +3538,7 @@ reslist(
 	const int qdata_chars =		COUNTOF(qdata) - 1;
 	const char *	datap;
 	int		qres;
-	int		dsize;
+	size_t		dsize;
 	u_short		rstatus;
 	char *		tag;
 	char *		val;
@@ -3632,7 +3637,7 @@ collect_display_vdc(
 	char tagbuf[32];
 	vdc *pvdc;
 	u_short rstatus;
-	int rsize;
+	size_t rsize;
 	const char *rdata;
 	int qres;
 	char *tag;
diff --git a/contrib/ntp/ntpq/ntpq.1ntpqman b/contrib/ntp/ntpq/ntpq.1ntpqman
index b4e45b2..1c26076 100644
--- a/contrib/ntp/ntpq/ntpq.1ntpqman
+++ b/contrib/ntp/ntpq/ntpq.1ntpqman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntpq 1ntpqman "21 Oct 2015" "4.2.8p4" "User Commands"
+.TH ntpq 1ntpqman "07 Jan 2016" "4.2.8p5" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-joa4fN/ag-voaWeN)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-4VaaKt/ag-eWa4It)
 .\"
-.\" It has been AutoGen-ed October 21, 2015 at 12:39:23 PM by AutoGen 5.18.5
+.\" It has been AutoGen-ed January 7, 2016 at 11:31:55 PM by AutoGen 5.18.5
 .\" From the definitions ntpq-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/contrib/ntp/ntpq/ntpq.1ntpqmdoc b/contrib/ntp/ntpq/ntpq.1ntpqmdoc
index 8239434..bf8d101 100644
--- a/contrib/ntp/ntpq/ntpq.1ntpqmdoc
+++ b/contrib/ntp/ntpq/ntpq.1ntpqmdoc
@@ -1,9 +1,9 @@
-.Dd October 21 2015
+.Dd January 7 2016
 .Dt NTPQ 1ntpqmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  October 21, 2015 at 12:39:29 PM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  January  7, 2016 at 11:32:02 PM by AutoGen 5.18.5
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/contrib/ntp/ntpq/ntpq.c b/contrib/ntp/ntpq/ntpq.c
index c8d5ece..5b3c9cb 100644
--- a/contrib/ntp/ntpq/ntpq.c
+++ b/contrib/ntp/ntpq/ntpq.c
@@ -39,6 +39,7 @@
 
 #include "ntp_libopts.h"
 #include "ntpq-opts.h"
+#include "safecast.h"
 
 #ifdef SYS_VXWORKS		/* vxWorks needs mode flag -casey*/
 # define open(name, flags)   open(name, flags, 0777)
@@ -168,13 +169,13 @@ int		ntpqmain	(int,	char **);
 static	int	openhost	(const char *, int);
 static	void	dump_hex_printable(const void *, size_t);
 static	int	sendpkt		(void *, size_t);
-static	int	getresponse	(int, int, u_short *, int *, const char **, int);
-static	int	sendrequest	(int, associd_t, int, int, const char *);
+static	int	getresponse	(int, int, u_short *, size_t *, const char **, int);
+static	int	sendrequest	(int, associd_t, int, size_t, const char *);
 static	char *	tstflags	(u_long);
 #ifndef BUILD_AS_LIB
 static	void	getcmds		(void);
 #ifndef SYS_WINNT
-static	RETSIGTYPE abortcmd	(int);
+static	int	abortcmd	(void);
 #endif	/* SYS_WINNT */
 static	void	docmd		(const char *);
 static	void	tokenize	(const char *, char **, int *);
@@ -208,13 +209,14 @@ static	void	error		(const char *, ...)
     __attribute__((__format__(__printf__, 1, 2)));
 static	u_long	getkeyid	(const char *);
 static	void	atoascii	(const char *, size_t, char *, size_t);
-static	void	cookedprint	(int, int, const char *, int, int, FILE *);
-static	void	rawprint	(int, int, const char *, int, int, FILE *);
+static	void	cookedprint	(int, size_t, const char *, int, int, FILE *);
+static	void	rawprint	(int, size_t, const char *, int, int, FILE *);
 static	void	startoutput	(void);
 static	void	output		(FILE *, const char *, const char *);
 static	void	endoutput	(FILE *);
 static	void	outputarr	(FILE *, char *, int, l_fp *);
 static	int	assoccmp	(const void *, const void *);
+static	void	on_ctrlc	(void);
 	u_short	varfmt		(const char *);
 
 void	ntpq_custom_opt_handler	(tOptions *, tOptDesc *);
@@ -558,9 +560,10 @@ ntpqmain(
 		interactive = 1;
 	}
 
+	set_ctrl_c_hook(on_ctrlc);
 #ifndef SYS_WINNT /* Under NT cannot handle SIGINT, WIN32 spawns a handler */
 	if (interactive)
-	    (void) signal_no_reset(SIGINT, abortcmd);
+		push_ctrl_c_handler(abortcmd);
 #endif /* SYS_WINNT */
 
 	if (numcmds == 0) {
@@ -739,9 +742,9 @@ openhost(
 		    sizeof(hostaddr)) == -1)
 #else
 	   (connect(sockfd, (struct sockaddr *)ai->ai_addr,
-		    ai->ai_addrlen) == -1)
+		ai->ai_addrlen) == -1)
 #endif /* SYS_VXWORKS */
-	    {
+	{
 		error("connect");
 		freeaddrinfo(ai);
 		return 0;
@@ -802,7 +805,7 @@ sendpkt(
 	if (debug >= 3)
 		printf("Sending %zu octets\n", xdatalen);
 
-	if (send(sockfd, xdata, (size_t)xdatalen, 0) == -1) {
+	if (send(sockfd, xdata, xdatalen, 0) == -1) {
 		warning("write to %s failed", currenthost);
 		return -1;
 	}
@@ -822,7 +825,7 @@ getresponse(
 	int opcode,
 	int associd,
 	u_short *rstatus,
-	int *rsize,
+	size_t *rsize,
 	const char **rdata,
 	int timeo
 	)
@@ -871,8 +874,7 @@ getresponse(
 			tvo = tvsout;
 
 		FD_SET(sockfd, &fds);
-		n = select(sockfd + 1, &fds, NULL, NULL, &tvo);
-
+		n = select(sockfd+1, &fds, NULL, NULL, &tvo);
 		if (n == -1) {
 			warning("select fails");
 			return -1;
@@ -1171,22 +1173,22 @@ sendrequest(
 	int opcode,
 	associd_t associd,
 	int auth,
-	int qsize,
+	size_t qsize,
 	const char *qdata
 	)
 {
 	struct ntp_control qpkt;
-	int	pktsize;
+	size_t	pktsize;
 	u_long	key_id;
 	char *	pass;
-	int	maclen;
+	size_t	maclen;
 
 	/*
 	 * Check to make sure the data will fit in one packet
 	 */
 	if (qsize > CTL_MAX_DATA_LEN) {
 		fprintf(stderr,
-			"***Internal error!  qsize (%d) too large\n",
+			"***Internal error!  qsize (%zu) too large\n",
 			qsize);
 		return 1;
 	}
@@ -1265,7 +1267,7 @@ sendrequest(
 		return 1;
 	} else if ((size_t)maclen != (info_auth_hashlen + sizeof(keyid_t))) {
 		fprintf(stderr,
-			"%d octet MAC, %zu expected with %zu octet digest\n",
+			"%zu octet MAC, %zu expected with %zu octet digest\n",
 			maclen, (info_auth_hashlen + sizeof(keyid_t)),
 			info_auth_hashlen);
 		return 1;
@@ -1355,10 +1357,10 @@ doquery(
 	int opcode,
 	associd_t associd,
 	int auth,
-	int qsize,
+	size_t qsize,
 	const char *qdata,
 	u_short *rstatus,
-	int *rsize,
+	size_t *rsize,
 	const char **rdata
 	)
 {
@@ -1376,10 +1378,10 @@ doqueryex(
 	int opcode,
 	associd_t associd,
 	int auth,
-	int qsize,
+	size_t qsize,
 	const char *qdata,
 	u_short *rstatus,
-	int *rsize,
+	size_t *rsize,
 	const char **rdata,
 	int quiet
 	)
@@ -1460,16 +1462,18 @@ getcmds(void)
 /*
  * abortcmd - catch interrupts and abort the current command
  */
-static RETSIGTYPE
-abortcmd(
-	int sig
-	)
+static int
+abortcmd(void)
 {
 	if (current_output == stdout)
-	    (void) fflush(stdout);
+		(void) fflush(stdout);
 	putc('\n', stderr);
 	(void) fflush(stderr);
-	if (jump) longjmp(interrupt_buf, 1);
+	if (jump) {
+		jump = 0;
+		longjmp(interrupt_buf, 1);
+	}
+	return TRUE;
 }
 #endif	/* !SYS_WINNT && !BUILD_AS_LIB */
 
@@ -1743,7 +1747,7 @@ findcmd(
 	)
 {
 	struct xcmd *cl;
-	int clen;
+	size_t clen;
 	int nmatch;
 	struct xcmd *nearmatch = NULL;
 	struct xcmd *clist;
@@ -2665,7 +2669,7 @@ vwarning(const char *fmt, va_list ap)
 	int serrno = errno;
 	(void) fprintf(stderr, "%s: ", progname);
 	vfprintf(stderr, fmt, ap);
-	(void) fprintf(stderr, ": %s", strerror(serrno));
+	(void) fprintf(stderr, ": %s\n", strerror(serrno));
 }
 
 /*
@@ -2800,7 +2804,7 @@ do {							\
  */
 void
 makeascii(
-	int length,
+	size_t length,
 	const char *data,
 	FILE *fp
 	)
@@ -2916,7 +2920,7 @@ int nextcb = 0;
  */
 int
 nextvar(
-	int *datalen,
+	size_t *datalen,
 	const char **datap,
 	char **vname,
 	char **vvalue
@@ -2963,7 +2967,7 @@ nextvar(
 		if (cp < cpend)
 			cp++;
 		*datap = cp;
-		*datalen = cpend - cp;
+		*datalen = size2int_sat(cpend - cp);
 		*vvalue = NULL;
 		return 1;
 	}
@@ -3003,7 +3007,7 @@ nextvar(
 	if (np < cpend && ',' == *np)
 		np++;
 	*datap = np;
-	*datalen = cpend - np;
+	*datalen = size2int_sat(cpend - np);
 	*vvalue = value;
 	return 1;
 }
@@ -3027,7 +3031,7 @@ varfmt(const char * varname)
  */
 void
 printvars(
-	int length,
+	size_t length,
 	const char *data,
 	int status,
 	int sttype,
@@ -3048,7 +3052,7 @@ printvars(
 static void
 rawprint(
 	int datatype,
-	int length,
+	size_t length,
 	const char *data,
 	int status,
 	int quiet,
@@ -3113,10 +3117,10 @@ output(
 	const char *value
 	)
 {
-	size_t len;
+	int len;
 
 	/* strlen of "name=value" */
-	len = strlen(name) + 1 + strlen(value);
+	len = size2int_sat(strlen(name) + 1 + strlen(value));
 
 	if (out_chars != 0) {
 		out_chars += 2;
@@ -3161,10 +3165,10 @@ outputarr(
 	l_fp *lfp
 	)
 {
-	register char *bp;
-	register char *cp;
-	register int i;
-	register int len;
+	char *bp;
+	char *cp;
+	size_t i;
+	size_t len;
 	char buf[256];
 
 	bp = buf;
@@ -3246,7 +3250,7 @@ tstflags(
 static void
 cookedprint(
 	int datatype,
-	int length,
+	size_t length,
 	const char *data,
 	int status,
 	int quiet,
@@ -3430,7 +3434,7 @@ grow_assoc_cache(void)
 	}
 	assoc_cache = erealloc_zero(assoc_cache, new_sz, prior_sz); 
 	prior_sz = new_sz;
-	assoc_cache_slots = new_sz / sizeof(assoc_cache[0]);
+	assoc_cache_slots = (u_int)(new_sz / sizeof(assoc_cache[0]));
 }
 
 
@@ -3566,3 +3570,48 @@ static char *list_digest_names(void)
 
     return list;
 }
+
+#define CTRLC_STACK_MAX 4
+static volatile size_t		ctrlc_stack_len = 0;
+static volatile Ctrl_C_Handler	ctrlc_stack[CTRLC_STACK_MAX];
+
+
+
+int/*BOOL*/
+push_ctrl_c_handler(
+	Ctrl_C_Handler func
+	)
+{
+	size_t size = ctrlc_stack_len;
+	if (func && (size < CTRLC_STACK_MAX)) {
+		ctrlc_stack[size] = func;
+		ctrlc_stack_len = size + 1;
+		return TRUE;
+	}
+	return FALSE;	
+}
+
+int/*BOOL*/
+pop_ctrl_c_handler(
+	Ctrl_C_Handler func
+	)
+{
+	size_t size = ctrlc_stack_len;
+	if (size) {
+		--size;
+		if (func == NULL || func == ctrlc_stack[size]) {
+			ctrlc_stack_len = size;
+			return TRUE;
+		}
+	}
+	return FALSE;
+}
+
+static void
+on_ctrlc(void)
+{
+	size_t size = ctrlc_stack_len;
+	while (size)
+		if ((*ctrlc_stack[--size])())
+			break;
+}
diff --git a/contrib/ntp/ntpq/ntpq.h b/contrib/ntp/ntpq/ntpq.h
index 2575b88..55ea0fb 100644
--- a/contrib/ntp/ntpq/ntpq.h
+++ b/contrib/ntp/ntpq/ntpq.h
@@ -136,19 +136,23 @@ extern	int	getnetnum	(const char *, sockaddr_u *, char *, int);
 extern	void	sortassoc	(void);
 extern	void	show_error_msg	(int, associd_t);
 extern	int	dogetassoc	(FILE *);
-extern	int	doquery		(int, associd_t, int, int, const char *,
-				 u_short *, int *, const char **);
-extern	int	doqueryex	(int, associd_t, int, int, const char *,
-				 u_short *, int *, const char **, int);
+extern	int	doquery		(int, associd_t, int, size_t, const char *,
+				 u_short *, size_t *, const char **);
+extern	int	doqueryex	(int, associd_t, int, size_t, const char *,
+				 u_short *, size_t *, const char **, int);
 extern	const char * nntohost	(sockaddr_u *);
 extern	const char * nntohost_col (sockaddr_u *, size_t, int);
 extern	const char * nntohostp	(sockaddr_u *);
 extern	int	decodets	(char *, l_fp *);
 extern	int	decodeuint	(char *, u_long *);
-extern	int	nextvar		(int *, const char **, char **, char **);
+extern	int	nextvar		(size_t *, const char **, char **, char **);
 extern	int	decodetime	(char *, l_fp *);
-extern	void	printvars	(int, const char *, int, int, int, FILE *);
+extern	void	printvars	(size_t, const char *, int, int, int, FILE *);
 extern	int	decodeint	(char *, long *);
-extern	void	makeascii	(int, const char *, FILE *);
+extern	void	makeascii	(size_t, const char *, FILE *);
 extern	const char * trunc_left	(const char *, size_t);
 extern	const char * trunc_right(const char *, size_t);
+
+typedef	int/*BOOL*/ (*Ctrl_C_Handler)(void);
+extern	int/*BOOL*/ 	push_ctrl_c_handler(Ctrl_C_Handler);
+extern	int/*BOOL*/ 	pop_ctrl_c_handler(Ctrl_C_Handler);
diff --git a/contrib/ntp/ntpq/ntpq.html b/contrib/ntp/ntpq/ntpq.html
index e2c3740..16f2597 100644
--- a/contrib/ntp/ntpq/ntpq.html
+++ b/contrib/ntp/ntpq/ntpq.html
@@ -44,7 +44,7 @@ monitor the operational status
 and determine the performance of
 <code>ntpd</code>, the NTP daemon.
 
-  <p>This document applies to version 4.2.8p4 of <code>ntpq</code>.
+  <p>This document applies to version 4.2.8p5 of <code>ntpq</code>.
 
 <ul class="menu">
 <li><a accesskey="1" href="#ntpq-Description">ntpq Description</a>
@@ -769,7 +769,7 @@ the usage text by passing it through a pager program.
 used to select the program, defaulting to <span class="file">more</span>.  Both will exit
 with a status code of 0.
 
-<pre class="example">ntpq - standard NTP query program - Ver. 4.2.8p4-sec-RC2
+<pre class="example">ntpq - standard NTP query program - Ver. 4.2.8p4
 Usage:  ntpq [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
diff --git a/contrib/ntp/ntpq/ntpq.man.in b/contrib/ntp/ntpq/ntpq.man.in
index 0c0af5b..17ccb1c 100644
--- a/contrib/ntp/ntpq/ntpq.man.in
+++ b/contrib/ntp/ntpq/ntpq.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntpq @NTPQ_MS@ "21 Oct 2015" "4.2.8p4" "User Commands"
+.TH ntpq @NTPQ_MS@ "07 Jan 2016" "4.2.8p5" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-joa4fN/ag-voaWeN)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-4VaaKt/ag-eWa4It)
 .\"
-.\" It has been AutoGen-ed October 21, 2015 at 12:39:23 PM by AutoGen 5.18.5
+.\" It has been AutoGen-ed January 7, 2016 at 11:31:55 PM by AutoGen 5.18.5
 .\" From the definitions ntpq-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/contrib/ntp/ntpq/ntpq.mdoc.in b/contrib/ntp/ntpq/ntpq.mdoc.in
index 2b20ddc..9214a66 100644
--- a/contrib/ntp/ntpq/ntpq.mdoc.in
+++ b/contrib/ntp/ntpq/ntpq.mdoc.in
@@ -1,9 +1,9 @@
-.Dd October 21 2015
+.Dd January 7 2016
 .Dt NTPQ @NTPQ_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  October 21, 2015 at 12:39:29 PM by AutoGen 5.18.5
+.\"  It has been AutoGen-ed  January  7, 2016 at 11:32:02 PM by AutoGen 5.18.5
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME