From c41fbaf9bc76f0b7650e448fbd88d0a9815f47fd Mon Sep 17 00:00:00 2001
From: glebius <glebius@FreeBSD.org>
Date: Mon, 11 Jan 2016 01:09:50 +0000
Subject: Merge r293423, r293469:

  ntp 4.2.8p5

Relnotes:	yes
---
 contrib/ntp/ntpd/ntp_request.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'contrib/ntp/ntpd/ntp_request.c')

diff --git a/contrib/ntp/ntpd/ntp_request.c b/contrib/ntp/ntpd/ntp_request.c
index 6073f99..fa78ce1 100644
--- a/contrib/ntp/ntpd/ntp_request.c
+++ b/contrib/ntp/ntpd/ntp_request.c
@@ -2006,11 +2006,11 @@ do_trustkey(
 	u_long trust
 	)
 {
-	register u_long *kp;
+	register uint32_t *kp;
 	register int items;
 
 	items = INFO_NITEMS(inpkt->err_nitems);
-	kp = (u_long *)&inpkt->u;
+	kp = (uint32_t*)&inpkt->u;
 	while (items-- > 0) {
 		authtrust(*kp, trust);
 		kp++;
-- 
cgit v1.1