summaryrefslogtreecommitdiffstats
path: root/contrib/ntp/ntpd/ntp_request.c
diff options
context:
space:
mode:
authorglebius <glebius@FreeBSD.org>2016-01-11 01:09:50 +0000
committerglebius <glebius@FreeBSD.org>2016-01-11 01:09:50 +0000
commitc41fbaf9bc76f0b7650e448fbd88d0a9815f47fd (patch)
tree3b45c8e63a37b132f0fe10c570b8302052c547de /contrib/ntp/ntpd/ntp_request.c
parent3066f138bc3bf99f5cf6ec9412903d206c329cc7 (diff)
downloadFreeBSD-src-c41fbaf9bc76f0b7650e448fbd88d0a9815f47fd.zip
FreeBSD-src-c41fbaf9bc76f0b7650e448fbd88d0a9815f47fd.tar.gz
Merge r293423, r293469:
ntp 4.2.8p5 Relnotes: yes
Diffstat (limited to 'contrib/ntp/ntpd/ntp_request.c')
-rw-r--r--contrib/ntp/ntpd/ntp_request.c4
1 files changed, 2 insertions, 2 deletions
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++;
OpenPOWER on IntegriCloud